nav ...

Philippe Vollenweider Thu, 29 Sep 2005 07:00:53 -0700

pvollenweider    2005/09/29 16:00:50 CEST


  Modified files:
    src/jsp/common       top.inc 
    src/jsp/css          actions.css lihover1.htc lihover2.htc 
                         lihover3.htc screen.css 
    src/jsp/img          arrow.gif logo.gif menu_left_tab.gif 
                         menu_right_tab.gif 
    src/jsp/nav          menu.jsp 
  Log:
  Fix css
  
  Revision  Changes    Path
  1.2       +8 -1      corporate_portal_templates_v2/src/jsp/common/top.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates_v2/src/jsp/common/top.inc.diff?r1=1.1&r2=1.2&f=h
  1.5       +3 -1      corporate_portal_templates_v2/src/jsp/css/actions.css
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates_v2/src/jsp/css/actions.css.diff?r1=1.4&r2=1.5&f=h
  1.2       +1 -1      corporate_portal_templates_v2/src/jsp/css/lihover1.htc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates_v2/src/jsp/css/lihover1.htc.diff?r1=1.1&r2=1.2&f=h
  1.2       +1 -1      corporate_portal_templates_v2/src/jsp/css/lihover2.htc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates_v2/src/jsp/css/lihover2.htc.diff?r1=1.1&r2=1.2&f=h
  1.2       +1 -1      corporate_portal_templates_v2/src/jsp/css/lihover3.htc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates_v2/src/jsp/css/lihover3.htc.diff?r1=1.1&r2=1.2&f=h
  1.12      +67 -21    corporate_portal_templates_v2/src/jsp/css/screen.css
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates_v2/src/jsp/css/screen.css.diff?r1=1.11&r2=1.12&f=h
  1.4       +1 -1      corporate_portal_templates_v2/src/jsp/img/arrow.gif
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates_v2/src/jsp/img/arrow.gif.diff?r1=1.3&r2=1.4&f=h
  1.3       +14 -21    corporate_portal_templates_v2/src/jsp/img/logo.gif
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates_v2/src/jsp/img/logo.gif.diff?r1=1.2&r2=1.3&f=h
  1.2       +5 -1      
corporate_portal_templates_v2/src/jsp/img/menu_left_tab.gif
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates_v2/src/jsp/img/menu_left_tab.gif.diff?r1=1.1&r2=1.2&f=h
  1.2       +3 -1      
corporate_portal_templates_v2/src/jsp/img/menu_right_tab.gif
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates_v2/src/jsp/img/menu_right_tab.gif.diff?r1=1.1&r2=1.2&f=h
  1.4       +13 -10    corporate_portal_templates_v2/src/jsp/nav/menu.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates_v2/src/jsp/nav/menu.jsp.diff?r1=1.3&r2=1.4&f=h
  
  
  
  Index: top.inc
  ===================================================================
  RCS file: 
/home/cvs/repository/corporate_portal_templates_v2/src/jsp/common/top.inc,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- top.inc   29 Sep 2005 08:50:00 -0000      1.1
  +++ top.inc   29 Sep 2005 14:00:49 -0000      1.2
  @@ -39,6 +39,12 @@
   #navigation ul ul ul li {
       behavior: url('<%=contextURL%>/css/lihover3.htc');
   }
  +#navigation ul ul ul ul li {
  +    behavior: url('<%=contextURL%>/css/lihover4.htc');
  +}
  +#navigation ul ul ul ul ul li {
  +    behavior: url('<%=contextURL%>/css/lihover5.htc');
  +}
   -->
   </style>
   
  @@ -97,7 +103,8 @@
               <td rowspan="2" valign="top">
                   <div id="logo">
                       <a href="<bean:write name='currentSite' 
property='homePage.url'/>">
  -                        <img src="<content:contextURL/>/img/logo.gif" 
width="294" height="58" alt="logo" border="0"/>
  +                        <img src="<content:contextURL/>/img/logo.gif" 
width="231" height="45" alt="logo" border="0"/>
  +
                       </a>
                   </div>
               </td>
  
  
  
  Index: actions.css
  ===================================================================
  RCS file: 
/home/cvs/repository/corporate_portal_templates_v2/src/jsp/css/actions.css,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- actions.css       1 Sep 2005 16:06:46 -0000       1.4
  +++ actions.css       29 Sep 2005 14:00:49 -0000      1.5
  @@ -7,7 +7,9 @@
     color: #000000;
     white-space: nowrap;
   }
  -
  +#navigation span a {
  +    padding:0 !important;
  +}
   div.menu {
     background-color: #d0d0d0;
     border: 2px solid;
  
  
  
  Index: lihover1.htc
  ===================================================================
  RCS file: 
/home/cvs/repository/corporate_portal_templates_v2/src/jsp/css/lihover1.htc,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- lihover1.htc      29 Sep 2005 08:50:00 -0000      1.1
  +++ lihover1.htc      29 Sep 2005 14:00:49 -0000      1.2
  @@ -8,7 +8,7 @@
   //<![CDATA[
   var savedcolor = this.style.backgroundColor;
   function mouseover() {
  -    this.style.backgroundColor="#dddddd";
  +    this.style.backgroundColor="#dfecef";
   }
   function mouseout() {
       this.style.backgroundColor=savedcolor;
  
  
  
  Index: lihover2.htc
  ===================================================================
  RCS file: 
/home/cvs/repository/corporate_portal_templates_v2/src/jsp/css/lihover2.htc,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- lihover2.htc      29 Sep 2005 08:50:00 -0000      1.1
  +++ lihover2.htc      29 Sep 2005 14:00:49 -0000      1.2
  @@ -8,7 +8,7 @@
   //<![CDATA[
   var savedcolor = this.style.backgroundColor;
   function mouseover() {
  -    this.style.backgroundColor="#e9e9e9";
  +    this.style.backgroundColor="#c0dadf";
   }
   function mouseout() {
       this.style.backgroundColor=savedcolor;
  
  
  
  Index: lihover3.htc
  ===================================================================
  RCS file: 
/home/cvs/repository/corporate_portal_templates_v2/src/jsp/css/lihover3.htc,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- lihover3.htc      29 Sep 2005 08:50:00 -0000      1.1
  +++ lihover3.htc      29 Sep 2005 14:00:49 -0000      1.2
  @@ -8,7 +8,7 @@
   //<![CDATA[
   var savedcolor = this.style.backgroundColor;
   function mouseover() {
  -    this.style.backgroundColor="#ffffcc";
  +    this.style.backgroundColor="#adced5";
   }
   function mouseout() {
       this.style.backgroundColor=savedcolor;
  
  
  
  Index: screen.css
  ===================================================================
  RCS file: 
/home/cvs/repository/corporate_portal_templates_v2/src/jsp/css/screen.css,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- screen.css        29 Sep 2005 08:50:00 -0000      1.11
  +++ screen.css        29 Sep 2005 14:00:49 -0000      1.12
  @@ -18,7 +18,7 @@
   
   a {
       text-decoration: none;
  -    color: #C94E27;
  +    color: #333333;
   }
   a:hover {
       text-decoration: underline;
  @@ -26,14 +26,14 @@
   h1 {
       font-size: 16px;
       font-weight: bold;
  -    color: #C94E27;
  +    color: #333333;
       margin: 10px 0 5px 0;
   }
   h2 {
  -    background: url(../img/arrow.gif) no-repeat 0 0;
  +    background: url(../img/arrow.gif) no-repeat 0 8px;
       font-size: 14px;
       font-weight: bold;
  -    color: #00458c;
  +    color: #6a6a6a;
       padding: 5px 0 10px 20px;
       margin: 0;
   }
  @@ -272,6 +272,7 @@
   }
   #navigation a:hover {
       text-decoration: underline;
  +    color: #000000;
   }
   
   /* level 1 */
  @@ -280,13 +281,21 @@
   }
   #navigation ul li.current,
   #navigation ul li:hover {
  -    background-color: #dddddd;
  +    background-color: #dfecef;
  +}
  +#navigation ul li.current a,
  +#navigation ul li:hover a{
  +    color: #000000;
   }
   
   /* level 2 */
   #navigation ul ul li.current,
   #navigation ul ul li:hover {
  -    background-color: #e9e9e9;
  +    background-color: #c0dadf;
  +}
  +#navigation ul ul li.current a,
  +#navigation ul ul li:hover a{
  +    color: #000000;
   }
   #navigation ul ul li {
       display: block;
  @@ -298,7 +307,12 @@
   /* level 3 */
   #navigation ul ul ul li.current,
   #navigation ul ul ul li:hover {
  -    background-color: #ffffcc;
  +    background-color: #adced5;
  +    color:#ffffff;
  +}
  +#navigation ul ul ul li.current a,
  +#navigation ul ul ul li:hover a{
  +    color:#000000;
   }
   #navigation ul ul ul li {
       display: block;
  @@ -307,6 +321,38 @@
       padding-left: 20px
   }
   
  +/* level 4 */
  +#navigation ul ul ul ul li.current,
  +#navigation ul ul ul ul li:hover {
  +    background-color: #adced5;
  +    color:#ffffff;
  +}
  +#navigation ul ul ul ul li.current a,
  +#navigation ul ul ul ul li:hover a{
  +    color:#000000;
  +}
  +#navigation ul ul ul ul li {
  +    display: block;
  +}
  +#navigation ul ul ul ul a {
  +    padding-left: 30px
  +}
  +/* level 5 */
  +#navigation ul ul ul ul ul li.current,
  +#navigation ul ul ul ul ul li:hover {
  +    background-color: #94bfc9;
  +    color:#ffffff;
  +}
  +#navigation ul ul ul ul ul li.current a,
  +#navigation ul ul ul ul ul li:hover a{
  +    color:#000000;
  +}
  +#navigation ul ul ul ul ul li {
  +    display: block;
  +}
  +#navigation ul ul ul ul ul a {
  +    padding-left: 40px
  +}
   
   #navigation .searchbox2 {
       clear:both;
  @@ -612,7 +658,7 @@
       vertical-align: top;
   }
   table.forms tr.title td {
  -    background: #00458c;
  +    background: #6a6a6a;
       font-weight: bold;
       color: #ffffff;
   }
  @@ -819,8 +865,8 @@
       background:url("../img/arrow.gif") no-repeat 100% 5px;
       border-width:0;
       padding-right:16px;
  -    color:00458c;
  -    border-bottom: 1px 00458c dotted;
  +    color:6a6a6a;
  +    border-bottom: 1px 6a6a6a dotted;
   }
   .blog a.continued:hover {
       background-image:url("../img/arrow_on.gif");
  @@ -923,15 +969,15 @@
       margin-bottom:10px;
   }
   .layout1 h2    {
  -    background: #C94E27;
  +    background: #333333;
       margin:0;
       padding:1px 5px 1px 5px;
       color:#ffffff;
   }
   .layout1 .content    {
  -    border-right: #C94E27 solid 1px;
  -    border-bottom: #C94E27 solid 1px;
  -    border-left: #C94E27 solid 1px;
  +    border-right: #333333 solid 1px;
  +    border-bottom: #333333 solid 1px;
  +    border-left: #333333 solid 1px;
       padding:5px;
   }
   .splash0,
  @@ -959,10 +1005,10 @@
       background-color: white;
   }
   .boxEPbordercolor1 {
  -     border-left: 1px solid #00458c;
  -     border-right: 1px solid #00458c;
  -     border-bottom: 1px solid #00458c;
  -     border-top: 1px solid #00458c;
  +     border-left: 1px solid #6a6a6a;
  +     border-right: 1px solid #6a6a6a;
  +     border-bottom: 1px solid #6a6a6a;
  +     border-top: 1px solid #6a6a6a;
   }
   .boxEPTitlecolor1 {
       color: #FFFFFF;
  @@ -970,7 +1016,7 @@
       font-family: Arial, Helvetica, sans-serif;
       font-size: 11px;
       font-weight: bold;
  -    background-color: #00458c;
  +    background-color: #6a6a6a;
       padding-top: 2px;
       padding-bottom: 2px;
       white-space: nowrap;
  @@ -984,7 +1030,7 @@
       white-space: nowrap;
   }
   .boxEPPaginationPos {
  -    color: #00458c;
  +    color: #6a6a6a;
       text-align: left;
       font-family: Arial, Helvetica, sans-serif;
       font-size: 11px;
  @@ -992,7 +1038,7 @@
       white-space: nowrap;
   }
   .boxEPPaginationNav {
  -    color: #00458c;
  +    color: #6a6a6a;
       text-align: right;
       font-family: Arial, Helvetica, sans-serif;
       font-size: 11px;
  
  
  
  Index: arrow.gif
  ===================================================================
        <<Binary file>>
  
  
  
  Index: logo.gif
  ===================================================================
        <<Binary file>>
  
  
  
  Index: menu_left_tab.gif
  ===================================================================
        <<Binary file>>
  
  
  
  Index: menu_right_tab.gif
  ===================================================================
        <<Binary file>>
  
  
  
  Index: menu.jsp
  ===================================================================
  RCS file: 
/home/cvs/repository/corporate_portal_templates_v2/src/jsp/nav/menu.jsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- menu.jsp  28 Sep 2005 16:10:30 -0000      1.3
  +++ menu.jsp  29 Sep 2005 14:00:50 -0000      1.4
  @@ -4,7 +4,6 @@
   public void getPageSubTree( JahiaData jData,
                               int rootPageId,
                               int currentPageId,
  -                            int currentLevel,
                               PageContext pageContext,
                               org.apache.log4j.Logger logger
                             )
  @@ -24,27 +23,31 @@
                   if (navigationLink != null) {
                       out.print("<li");
                       if (navigationLink.getID() == jData.page().getID() ||
  -                    (jData.gui().isPageInPath(navigationLink.getID()) && 
currentLevel == 1)) {
  -                    out.print(" class='current'");
  -                 }                   
  -                 out.print("><a href='" +
  +                             
jData.gui().isPageInPath(navigationLink.getID()) ) {
  +                         out.print(" class='current'");
  +                     }
  +                         out.print("><a href='" +
                           navigationLink.getUrl(jData.params()) + "'");
                       out.print(">" + navigationLink.getTitle()+"</a>");
  -                    
jData.gui().html().drawBeginActionMenu(navigationContainerBean,
  -                        null, null, false, ".navigationLink", 
"jahiatemplates.Corporate_portal_templates", null, out);
  +                    if (! navigationContainerBean.isActionURIsEmpty()) {
  +                        out.print("<span>");
  +                        
jData.gui().html().drawBeginActionMenu(navigationContainerBean,
  +                            null, null, false, ".navigationLink", 
"jahiatemplates.Corporate_portal_templates", null, out);
  +                        out.println("</span></li>");
  +                    }
                       out.println("</li>");
   
                       // displays sub links
                       if (jData.gui().isPageInPath(navigationLink.getID())) {
                           getPageSubTree(jData , rootPageId, 
navigationLink.getID(),
  -                            currentLevel + 1, pageContext,logger);
  +                            pageContext,logger);
                       }
                   }
               }
               ContainerListBean navigationContainerListBean =
                   new 
ContainerListBean(navigationContainerList,jData.params());
               if (! navigationContainerListBean.isActionURIsEmpty() ) {
  -                out.print("<li><a ");
  +                out.print("<li>");
                   
jData.gui().html().drawBeginActionMenu(navigationContainerListBean,
                       null, null, false, ".navigationLinks", 
"jahiatemplates.Corporate_portal_templates", "add.navigationLinks", out);
                   out.println("</li>");
  @@ -57,6 +60,6 @@
   <%
   if (jData.gui().getLevel() > 1) {
       int startFromPageId = jData.gui().getLevelID(2);
  -    getPageSubTree( jData , startFromPageId, startFromPageId, 1, 
pageContext,logger);
  +    getPageSubTree( jData , startFromPageId, startFromPageId, 
pageContext,logger);
   }
   %>

Reply via email to