fixed template JS problems

Evolveum · Sep 26, 2015 · 162fdb7 · 162fdb7
1 parent 5e0add5
commit 162fdb7
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 17 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTemplate.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTemplate.html
@@ -178,6 +178,7 @@
                 <h1 wicket:id="pageTitle">
                     <span wicket:id="pageTitleReal"></span>
                     <small wicket:id="pageSubtitle"></small>
+                    <img id="ajax_busy" src="img/ajax-loader.gif"/>
                 </h1>
                 <ol class="breadcrumb">
                     <li><a href="#"><i class="fa fa-dashboard"></i> Home</a></li>
@@ -193,37 +194,27 @@ <h1 wicket:id="pageTitle">
                 </div>
                 <wicket:child/>
 
-                <!-- todo fix position for these elements -->
-                <img id="ajax_busy" class="pull-right version-info" src="img/ajax-loader.gif"/>
                 <div class="wicket-debug-buttons" wicket:id="debugBar">
                     <a wicket:id="clearCssCache">Clear css cache</a>
                 </div>
                 <div wicket:id="debugPanel" style="z-index: 10000;"/>
             </section>
         </div>
         <footer class="main-footer">
-            <div class="pull-right hidden-xs">
-                <b>Version</b> <wicket:message key="pageBase.midPointVersion"/>
+            <div class="pull-right hidden-xs" wicket:id="version">
+                <b><wicket:message key="PageTemplate.version"/></b> <wicket:message key="pageBase.midPointVersion"/>
             </div>
-            <strong>Copyright &copy; 2010-2015 <a href="https://www.evolveum.com/">Evolveum</a> and partners.</strong> Thank you for using <a href="http://midpoint.evolveum.com">midPoint</a>.
+            <wicket:message key="PageTemplate.copy"/>
         </footer>
     </div>
 
-    <div id="blackWindow"></div>
+     <!-- todo fix results -->
+    <div id="blackWindow"/>
     <div id="xmlExport">
-        <span id="xmlExportContent"></span>
-    </div>
-
-    <div style="display: none;">
-
-    <div wicket:id="version" class="pull-right version-info">
-        <wicket:message key="pageBase.midPointVersion"/>
-    </div>
-
+        <span id="xmlExportContent"/>
     </div>
 
     <wicket:link>
-        <script src="../../../../../webjars/adminlte/2.3.0/plugins/jQuery/jQuery-2.1.4.min.js"/>
         <script src="../../../../../webjars/adminlte/2.3.0/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
         <script src="../../../../../webjars/adminlte/2.3.0/plugins/slimScroll/jquery.slimscroll.min.js" type="text/javascript"></script>
         <script src='../../../../../webjars/adminlte/2.3.0/plugins/fastclick/fastclick.min.js'></script>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
@@ -50,6 +50,7 @@
 import org.apache.wicket.request.IRequestHandler;
 import org.apache.wicket.request.cycle.AbstractRequestCycleListener;
 import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.resource.PackageResourceReference;
 import org.apache.wicket.request.resource.SharedResourceReference;
 import org.apache.wicket.resource.loader.BundleStringResourceLoader;
 import org.apache.wicket.resource.loader.IStringResourceLoader;
@@ -118,6 +119,10 @@ public Class<PageDashboard> getHomePage() {
     public void init() {
         super.init();
 
+        getJavaScriptLibrarySettings().setJQueryReference(
+                new PackageResourceReference(MidPointApplication.class,
+                        "../../../../../webjars/adminlte/2.3.0/plugins/jQuery/jQuery-2.1.4.min.js"));
+
         GuiComponents.init();
 
         getComponentInstantiationListeners().add(new SpringComponentInjector(this));

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties
@@ -1115,7 +1115,7 @@ PageBase.button.search=Search
 PageBase.button.send=Send
 PageBase.button.update=Update
 PageBase.clearCssCache=Clear less/js cache
-pageBase.midPointVersion=Version\: ${pom.version}, ${describe}
+pageBase.midPointVersion=${pom.version}, ${describe}
 pageBase.unknownBuildNumber=unknown
 PageBulkAction.async=Asynchronous
 PageBulkAction.button.start=Start
@@ -2659,3 +2659,5 @@ PageAdmin.menu.mainNavigation=ADMINISTRATION
 PageAdmin.menu.profile=Profile
 PageAdmin.menu.assignments=Assignments
 PageAdmin.menu.credentials=Credentials
+PageTemplate.version=Version:
+PageTemplate.copy=<strong>Copyright &copy; 2010-2015 <a href="https://www.evolveum.com/">Evolveum</a> and partners.</strong> Thank you for using <a href="http://midpoint.evolveum.com">midPoint</a>