Merge branch 'Verze_1.0'

Conflicts: src/main/webapp/WEB-INF/locales/zk-label.properties src/main/webapp/app/mainMenu.zul
2015-01-20 10:35:38 +01:00
parent eed31fe6da ba99079a85
commit 08532dcd02
8 changed files with 42 additions and 4 deletions
@@ -142,5 +142,8 @@
 		  href="/app/search"
 		  visible="${module:isActive('SEARCH') }"
 		  disabled="${not sec:isAllGranted('PERM_SEARCH_SEARCH')}" />
+		<menuitem label="${labels.Help}" target="blank"
+          href="https://drive.google.com/folderview?id=0B2inqAvr2t-TODg4ZWZoSThYbGM&amp;usp=sharing_eid"
+          tooltiptext="${labels.GoogleDriveUrl}" />
 	</menubar>
 </zk>