Author: ito
Date: Wed Jun 23 14:11:20 2010
New Revision: 957211
URL: http://svn.apache.org/viewvc?rev=957211&view=rev
Log:
removed alpha effect from menu and added highlighting of menu entry
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/org/apache/clerezza/web/resources/jquery/staticweb/jquery.menu.js
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/menu.css
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/org/apache/clerezza/web/resources/jquery/staticweb/jquery.menu.js
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/org/apache/clerezza/web/resources/jquery/staticweb/jquery.menu.js?rev=957211&r1=957210&r2=957211&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/org/apache/clerezza/web/resources/jquery/staticweb/jquery.menu.js
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/org/apache/clerezza/web/resources/jquery/staticweb/jquery.menu.js
Wed Jun 23 14:11:20 2010
@@ -7,7 +7,6 @@ $.fn.menu = function(settings)
timer: 500
};
-
var settings = $.extend(defaults, settings);
settings.linkElements = this.find("> ol > li");
settings.menuItem = 0;
@@ -17,13 +16,21 @@ $.fn.menu = function(settings)
{
menuClearTimer();
menuClose();
- settings.menuItem = wrappedSet.find("ol").show();
+ wrappedSet.addClass("active");
+ settings.menuItem = wrappedSet.find("div").show();
+ settings.menuItem.find("> ol > li").bind("mouseover",function(){
+ $(this).addClass("active");
+ });
+ settings.menuItem.find("> ol > li").bind("mouseout",function(){
+ $(this).removeClass("active");
+ });
}
var menuClose = function()
- {
+ {
if (settings.menuItem)
{
+ settings.linkElements.removeClass("active");
settings.menuItem.hide();
}
}
@@ -44,7 +51,6 @@ $.fn.menu = function(settings)
$(settings.linkElements).bind("mouseover",function(){
menuOpen($(this));
-
});
$(settings.linkElements).bind("mouseout",menuSetTimer);
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp?rev=957211&r1=957210&r2=957211&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp
Wed Jun 23 14:11:20 2010
@@ -42,12 +42,15 @@ resultDocModifier.addScriptReference("/s
}
{
ifx ((menuItem/menu("children")).length > 0) {
- <ol>
- {
- for (childMenuItem <-
menuItem/menu("children")!!) yield
- <li><a
href={childMenuItem/menu("path")*}>{childMenuItem/rdfs("label")*}</a></li>
- }
- </ol>
+ <div>
+ <h4></h4>
+ <ol>
+ {
+ for (childMenuItem <-
menuItem/menu("children")!!) yield
+ <li class="clearfix"><a
href={childMenuItem/menu("path")*}>{childMenuItem/rdfs("label")*}</a><span></span></li>
+ }
+ </ol>
+ </div>
}
}
</li>
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/menu.css
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/menu.css?rev=957211&r1=957210&r2=957211&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/menu.css
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/menu.css
Wed Jun 23 14:11:20 2010
@@ -1,6 +1,6 @@
/* menu */
#tx-menu {
- top: 0.4em;
+ top: 0.0em;
left: 13em;
position: absolute;
z-index: 10000;
@@ -23,7 +23,7 @@
color: #ffffff;
text-decoration: none;
display: block;
- padding: 0 1.6em 0.5em 0.4em;
+ padding: 0.5em 1.6em 0.6em 0.4em;
}
#tx-menu ol li a:visited, #tx-menu li a:link {
@@ -35,50 +35,83 @@
}
#tx-menu ol li.active a:visited, #tx-menu ol li.active a:link {
+ background-color: #ffffff;
+ color: #333333;
+ background-image: url(./images/bg/fade-th-off.png);
+ background-repeat: repeat-x;
}
#tx-menu ol li.active a:active, #tx-menu ol li.active a:hover {
+ background-color: #ffffff;
+ color: #333333;
+ background-image: url(./images/bg/fade-th-off.png);
+ background-repeat: repeat-x;
}
+#tx-menu ol h4 {
+ border-bottom: solid 1px #dddddd;
+ margin: 0;
+ padding:0;
+ font-weight: normal;
+ color: #000000;
+ padding: 1.4em 0 0.4em 0.4em;
+ clear: both;
+}
-#tx-menu ol ol {
- background-color: #eeeeee;
+#tx-menu ol div {
+ background-color: #ffffff;
border-right: solid 3px #cccccc;
border-bottom: solid 3px #cccccc;
- opacity: 0.7;
+ opacity: 0.9;
display: none;
position: absolute;
+ padding: 0.0em 0.4em 0.8em 0.4em;
}
#tx-menu ol li li {
- float: none;
- border-top: 1px dotted #dddddd;
+ border-bottom: 1px solid #dddddd;
padding: 0px;
- min-width: 13em;
+ min: 15em;
}
-#tx-menu ol li li a {
- color: #000000;
- display: block;
- padding: 0.4em 0 0.4em 0.4em;
- min-width: 12.5em;
+#tx-menu ol li .tx-desc li {
+ border-bottom: 1px solid #dddddd;
+ padding: 0px;
+ min-width: 35em;
}
-#tx-menu ol li.active li {
+#tx-menu ol li li span {
+ display: block;
+ width: 20em;
+ float: left;
+ color: #555555;
+ padding: 0.3em 0 0.3em 0em;
}
-#tx-menu ol li li a:visited, #tx-menu ol li li a:link {
- text-decoration: none;
+#tx-menu ol li li a {
+ color: #333333;
+ display: block;
+ padding: 0.3em 0 0.3em 0.5em;
+ width: 13em;
+ font-weight: bold;
+ float: left;
+
}
-#tx-menu ol li li a:active, #tx-menu ol li li a:hover {
- text-decoration: underline;
+#tx-menu ol li.active li.active {
+ background-color: #eef8fa;
}
#tx-menu ol li.active li a:visited, #tx-menu ol li.active li a:link {
+ text-decoration: none;
+ background-image: none;
+ background-color: transparent;
}
#tx-menu ol li.active li a:active, #tx-menu ol li.active li a:hover {
+ text-decoration: underline;
+ background-image: none;
+ background-color: transparent;
}
#tx-menu2 ol ol {
