Merge branch 'Verze_1.0'

Conflicts: src/main/webapp/WEB-INF/locales/zk-label.properties src/main/webapp/app/mainMenu.zul
2015-02-09 13:31:48 +01:00
parent c04f74c5a2 884bc8267d
commit 277ea0f993
21 changed files with 207 additions and 11 deletions
@@ -135,6 +135,9 @@
 					href="/j_spring_security_logout" />
 			</menupopup>
 		</menu>
+		<menuitem label="${labels.Help}" target="blank"
+          href="https://drive.google.com/folderview?id=0B2inqAvr2t-TODg4ZWZoSThYbGM&amp;usp=sharing_eid"
+          tooltiptext="${labels.GoogleDriveUrl}" />
 		<menuseparator />
 		<menuitem 
 		  image="/img/search.png"