Changeset 2988

Timestamp:

06/05/13 06:40:05 (11 years ago)

Author:

keeloo

Message:

Added css for Clarin-D theme

Location:

vlo/trunk/vlo_web_app/src

Files:

• main/java/eu/clarin/cmdi/vlo/VloWebApplication.java (modified) (1 diff)
• main/java/eu/clarin/cmdi/vlo/pages/ShowResultPage.html (modified) (1 diff)
• main/java/eu/clarin/cmdi/vlo/pages/ShowResultPage.java (modified) (1 diff)
• main/webapp/css/clarin-d.css (copied) (copied from vlo/trunk/vlo_web_app/src/main/webapp/css/main.css) (6 diffs)
• test/java/eu/clarin/cmdi/vlo/pages/ResourceLinkPanelTest.java (modified) (2 diffs)

vlo/trunk/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/VloWebApplication.java

@@ -218 +218 @@
                 topLeftImage = "Images/topleft-clarin-d.png";
                 topRightImage = "Images/topright-clarin-d.png";
-                cssFile = "css/main.css";
+                cssFile = "css/clarin-d.css";
                 partnerLinkMap = getClarinDPartnerLinkMap();
                 name = "CLARIN-D";

vlo/trunk/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/ShowResultPage.html

@@ -16 +16 @@
     <wicket:extend>
         <div class="endgame"><br>
-            <div><a wicket:id="backLink" href="#"><wicket:message key="backToResult">[back]</wicket:message></a>&nbsp;|&nbsp;<a wicket:id="openBrowserLink"></a>
-            <div align="right" style="float:right">
-                <a wicket:id="feedbackLink"href="#"><img wicket:id="feedbackImage" height="32" width="32"/></a>
-                <span wicket:id="feedbackLabel"></span></div>
-                <p />
+            <div><a wicket:id="backLink" href="#"><wicket:message key="backToResult">[back]</wicket:message></a>&nbsp;|&nbsp;<a wicket:id="openBrowserLink"></a>&nbsp;|&nbsp;<a wicket:id="feedbackLink"></a>
             </div>
             <br>

vlo/trunk/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/ShowResultPage.java

@@ -395 +395 @@
         }
         
-        Image resourceImg = new Image("feedbackImage", FEEDBACK_IMAGE.getResource());
-        String title = "Report an error";
-        resourceImg.add(new SimpleAttributeModifier("title", title));
-        resourceImg.add(new SimpleAttributeModifier("alt", title));
+        // Image resourceImg = new Image("feedbackImage", FEEDBACK_IMAGE.getResource());
+        // String title = "Report an error";
+        // resourceImg.add(new SimpleAttributeModifier("title", title));
+        // resourceImg.add(new SimpleAttributeModifier("alt", title));
         String href = getHref(feedbackfromURL+thisURL);
         String name = feedbackfromURL+thisURL;
-        ExternalLink link = new ExternalLink("feedbackLink", href);
-        link.add(resourceImg);
-        add(new Label("feedbackLabel", "Found an error?"));
+        ExternalLink link = new ExternalLink("feedbackLink", href, "found an error?");
+        // link.add(resourceImg);
+        // add(new Label("feedbackLabel", "Found an error?"));
         add(link);
     }

vlo/trunk/vlo_web_app/src/main/webapp/css/clarin-d.css

@@ -12 +12 @@
     display: block;
 }
+
+/* banner definitions */
+
+/* picture on the left */
+#topleft{
+    position: absolute;
+    left:0px;
+}
+
+/* picture on the right */
+#topright{
+    position: absolute;
+    left:497px;
+}
+
+/* extend the banner to the right, take color from the right side of the png */
 .top{
-    background-color: #d4deef;
+    background-color: #88a1b9;
     width: 100%;
     height: 176px;
     border: none;
 }
-#topleft{
-    position: absolute;
-    left:0px;
-}
-#topright{
-    position: absolute;
-    left:497px;
-}
+
+/* end banner definitions */
+
+/* facet matrix related definitions */
+
 .opening .matrix{
     border:0px;
-    width: 66%;
-}
-
-.opening .resulttable{
-    width: 33%;
-    margin-left: 11px;
-}
-.opening .resulttable .headers{
-    background-color: #6b824a;
-}
-
-.resulttable tbody{
-    background-color:#BCCEE8;
+    width: 54%;
 }
 
@@ -55 +56 @@
     padding: 0;
 }
+
+/* end facet matrix related definitions */
+
+/* definitions for result table on search page */
+
+.opening .resulttable{
+    width: 45%; /* the facet matrix will take 54 % */
+
+}
+/* for the table header, use the red from the banner */
+.opening .resulttable .headers{
+    background-color: #801418;
+    text-align: center;
+    opacity:0.8;
+    color:#FFFFFF;
+}
+
+.resulttable tbody tr.even {
+    background-color: #e7ebf0; /* color of background in odd table position */
+}
+
+.resulttable tbody tr.odd {
+    background-color: #ffffff; /* color of background in odd table position */
+    color: #000000;
+    opacity: 1.0
+}
+
+/* for the table header, take the red from the banner */
+.headers{
+    background-color: #801418;
+    opacity:0.8;
+    text-align: left; /* changed this myself */
+}
+/* end definitions for result table on search page */
+
+/* facet box related definitions */
 .facetbox {
     font-size: 14px;
     padding: 2px 5px;
 }
+
+/* end facet box related definitions */
+
+/* search box related definitions */
+
+/* take color from the right side of the banner */
 .middlegame .search {
-    background-color: #BCCEE8;
+    background-color: #88a1b9;
     padding-top: 11px;
     padding-bottom: 11px;
-}
-
+    opacity: 0.9
+}
 .middlegame .searchmodule {
     margin-left:20%;
     display:inline
 }
-
 .middlegame .homeLink {
     margin-left: 11px;
     display:inline
 }
-
+/* end search box related definitions */
+
+/* facet box header, continue the banner and search box color */
 .facet_facetOrigin .facetbox {
-    background-color: #2E6B99;
+    background-color: #88a1b9;
     color:#FFFFFF;
     padding: 3px 5px;
+    opacity: 0.9
 }
 .facet {
@@ -86 +131 @@
 }
 .facet_facetOrigin .valuebox {
-    background-color: #BCCEE8;
+    background-color: #e7ebf0; /* facet box background */
     padding: 5px;
 }
 .value {
-    color: #4040ff;
+    color: #4040ff; 
 }
 .value.sel {
-    color: #FFFFFF;
+    color: #e7ebf0;
 }
 .barlink{
-    color: #BCCEE8;
-}
-.headers{
-    background-color: #2E6B99;
-    color:#FFFFFF;
-}
+    color: #801418; /* when the value in the bar turns into a link was BCCEE8 */
+}
+
+/* definitions for result table on results page */
 
 .endgame div{
@@ -108 +151 @@
     padding: 0;
 }
+.endgame .headers{
+    text-align: left;
+    color:#FFFFFF;
+}
+
+.endgame .headers .attribute{
+    background-color: #801418;    
+    opacity: 1.0;
+}
+
+.endgame .headers .attributeValue{
+    background-color: #801418;    
+}
+
 .endgame .resultAttributes{
     margin: 0px;
     padding-left: 5px;
-    border: none;
-}
-
-.endgame .headers{
-    text-align: left;
-}
+    border: none;}
+
 .endgame .attribute {
     font-weight: bold;
-    background-color: #BCCEE8;
+    background-color: #88a1b9;
+    opacity: 0.7;
     text-align: right;
     padding-right: 8px;
@@ -125 +179 @@
 
 .endgame .attributeValue{
+    background-color: #e7ebf0;
     padding-left: 8px;
 }
 
-.endgame .headers .attribute{
-    background-color: #2E6B99;    
-}
+/* end definitions for result table on results page */
+
+
+/* not sure what this is for */
 .endgame .attributesTbody {
     vertical-align: top;
     background-color:#d4deef;
 }
+
+/* not sure where this is for*/
 .anchorpanel{
     padding:5px;
     margin-top: 20px;
-    background-color: #2E6B99;
+    background-color: #801418;
     color: #FFFFFF;
+    opacity: 0.9
 }
 .alphaNavigation{
@@ -190 +249 @@
 }
 
-.resulttable tbody tr.odd {
-    background-color: #CEDCEF;
-}
 
 div.wicket-aa {background-color:white;

vlo/trunk/vlo_web_app/src/test/java/eu/clarin/cmdi/vlo/pages/ResourceLinkPanelTest.java

@@ -5 +5 @@
 import eu.clarin.cmdi.vlo.config.VloConfig;
 import org.apache.wicket.util.tester.WicketTester;
+import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Assert;
 import org.junit.Test;
 
@@ -33 +33 @@
         ResourceLinkPanel totest = new ResourceLinkPanel("a", FacetConstants.RESOURCE_TYPE_AUDIO, "a");
         String uit = totest.getNameFromLink(_SAME_STRING);
-        // Assert.assertTrue("Returns the same string if it does not start with the handle-prefix",uit.equals(_SAME_STRING));
+        Assert.assertTrue("Returns the same string if it does not start with the handle-prefix",uit.equals(_SAME_STRING));
 
         uit = totest.getNameFromLink(_RESOLVE_STRING);
+        // from at least 29.05.2013 this was not working
         // Assert.assertTrue("Returns the resolved url of the handle pid", uit.equals(_RESOLVE_OUT));
     }