Merge branch 'master' of github.com:ceskaexpedice/kramerius

ceskaexpedice · Mar 10, 2015 · 6441f4a · 6441f4a
2 parents 07e7a0b + f510c2b
commit 6441f4a
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/client/src/main/webapp/WEB-INF/header.vm b/client/src/main/webapp/WEB-INF/header.vm
@@ -23,7 +23,7 @@
             <div class="button" onclick="K5.authentication.options()">#translatable('application.login')</div>
         #end
 
-        <div class="button" onclick="link('$conf.getString('k5client.help')')" >#translatable('application.help')</div>
+        <div class="button" onclick="link('$conf.getString('k5client.help')', 'help')" >#translatable('application.help')</div>
 
         #if($logControl.logged)
             <div class="button" onclick="K5.authentication.profileDisplay.toggle()"><span>$logControl.loggedName</span></div>

diff --git a/client/src/main/webapp/WEB-INF/help.vm b/client/src/main/webapp/WEB-INF/help.vm
@@ -0,0 +1,17 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+#parse("html_header.vm")
+<body>
+
+#parse("profile.vm")
+#parse("logingoptions.vm")
+
+#parse("header.vm")
+$texts.help
+
+#parse("footer.vm")
+#parse("small/small.vm")
+
+</body>
+</html>
diff --git a/client/src/main/webapp/js/utils.js b/client/src/main/webapp/js/utils.js
@@ -39,8 +39,12 @@ function lookUpKey(keypath, object) {
  * @param addr target address 
  * @global
  */
-function link(addr) {
+function link(addr, target) {
+    if(target){
+         window.open(addr, target);
+    }else{
         window.location.assign(addr);
+    }
 }
 
 /**