work on new template

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

Hide file tree

Showing 9 changed files with 170 additions and 92 deletions.
diff --git a/build-system/pom.xml b/build-system/pom.xml
@@ -68,7 +68,7 @@
         <h2.version>1.3.171</h2.version>
         <jdbc.postgres>9.3-1102-jdbc41</jdbc.postgres>
         <jdbc.mysql>5.1.31</jdbc.mysql>
-        <wicket.version>6.17.0</wicket.version>
+        <wicket.version>6.20.0</wicket.version>
         <groovy.version>2.4.0</groovy.version>
         <activiti-engine.version>5.17.0</activiti-engine.version>
         <activiti-spring.version>5.17.0</activiti-spring.version>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/MainFeedback.js b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/MainFeedback.js
@@ -130,37 +130,35 @@ jQuery.fn.disableTextSelection = function(){
 };
 
 function setTempMessagePositionWhileScroll() {
-	if (isIE9OrNewer() || !isIE()) {
-		var scroll;
-		var isSelected;
-		$(window).scroll(function() {
-			isSelected = false;
-			$(".messagePanel").find(".messages-topPanel").each(function(index){
-				if($(this).hasClass("selected")){
-					isSelected = true;
-				}
-			});
-			offside = $(".feedbackContainer").height() + 135;
-			scroll = $(window).scrollTop();
-			if (scroll >= offside) {
-				if(!isSelected) {
-					if($(".tempMessage").css("display") == "none") {
-						$(".tempMessage").stop();
-						$(".tempMessage").css("opacity", 0);
-						$(".tempMessage").show();
-						$(".tempMessage").animate({opacity : 1}, 400);
-					}
-				} else {
-					$(".tempMessage").hide();
+	var scroll;
+	var isSelected;
+	$(window).scroll(function() {
+		isSelected = false;
+		$(".messagePanel").find(".messages-topPanel").each(function(index){
+			if($(this).hasClass("selected")){
+				isSelected = true;
+			}
+		});
+		offside = $(".feedbackContainer").height() + 135;
+		scroll = $(window).scrollTop();
+		if (scroll >= offside) {
+			if(!isSelected) {
+				if($(".tempMessage").css("display") == "none") {
+					$(".tempMessage").stop();
+					$(".tempMessage").css("opacity", 0);
+					$(".tempMessage").show();
+					$(".tempMessage").animate({opacity : 1}, 400);
 				}
 			} else {
-				$(".tempMessage").stop();
-				$(".tempMessage").animate({opacity : 0}, 400, function(){
-					$(".tempMessage").hide();
-				});
+				$(".tempMessage").hide();
 			}
-		}); 
-	}
+		} else {
+			$(".tempMessage").stop();
+			$(".tempMessage").animate({opacity : 0}, 400, function(){
+				$(".tempMessage").hide();
+			});
+		}
+	});
 }
 
 function scrollToReadMessage() {

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
@@ -57,7 +57,7 @@
         <link rel="stylesheet" type="text/css" href="css/bootstrap-select/bootstrap-multiselect.css"/>
         <link rel="stylesheet" type="text/css" href="css/bootstrap-select/bootstrap-select.css"/>
 
-        <link rel="stylesheet" type="text/css" href="css/pnotify/jquery.pnotify.default.css"/>
+        <!--<link rel="stylesheet" type="text/css" href="css/pnotify/jquery.pnotify.default.css"/>-->
 
         <link type="text/css" rel="stylesheet" href="css/silk.css"/>
         <link type="text/css" rel="stylesheet" href="css/flag.css"/>
@@ -73,7 +73,7 @@
 
         <script type="text/javascript" src="js/ace/ace.js" charset="utf-8"></script>
 
-        <script type="text/javascript" src="js/pnotify/jquery.pnotify.js" charset="utf-8"></script>
+        <!--<script type="text/javascript" src="js/pnotify/jquery.pnotify.js" charset="utf-8"></script>-->
 
         <script type="text/javascript" src="wro/midpoint.js"></script>
         <!-- BOOTSTRAP RESOURCES END -->
@@ -94,6 +94,12 @@
         <script src="../../../../../webjars/respond/1.4.2/respond.min.js"></script>
         <![endif]-->
     </wicket:link>
+
+    <!-- OBSOLETE START -->
+    <link type="text/css" rel="stylesheet" href="wro/all.css"/>
+    <link type="text/css" rel="stylesheet" href="wro/midpoint.css"/>
+    <!-- OBSOLETE END -->
+    <link type="text/css" rel="stylesheet" href="wro/midpoint-theme.css"/>
 </head>
 <body class="skin-blue">
     <div class="wrapper">
@@ -223,5 +229,10 @@ <h1 wicket:id="pageTitle">
         <script src='../../../../../webjars/adminlte/2.3.0/plugins/fastclick/fastclick.min.js'></script>
         <script src="../../../../../webjars/adminlte/2.3.0/dist/js/app.min.js" type="text/javascript"></script>
     </wicket:link>
+    <!-- OBSOLETE START -->
+    <script type="text/javascript" src="js/ace/ace.js" charset="utf-8"></script>
+    <script type="text/javascript" src="wro/midpoint.js"></script>
+    <!-- OBSOLETE END-->
+    <script type="text/javascript" src="wro/midpoint-theme.js"></script>
 </body>
 </html>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTemplate.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTemplate.java
@@ -105,8 +105,6 @@ public void renderHead(IHeaderResponse response) {
 
         //this attaches jquery.js as first header item, which is used in our scripts.
         CoreLibrariesContributor.contribute(getApplication(), response);
-
-        response.render(OnDomReadyHeaderItem.forScript("updateBodyTopPadding()"));
     }
 
     @Override

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/TooltipBehavior.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/TooltipBehavior.java
@@ -67,7 +67,8 @@ public void renderHead(Component component, IHeaderResponse response) {
 
         sb.append("});");
 
-        response.render(OnDomReadyHeaderItem.forScript(sb.toString()));
+        //todo fix template [lazyman]
+//        response.render(OnDomReadyHeaderItem.forScript(sb.toString()));
     }
 
     public String getModalContainer(Component component){