Bug 7979: New design for staff interface + fixes + css call moved
authorAdrien Saurat <adrien.saurat@biblibre.com>
Wed, 18 Apr 2012 12:53:19 +0000 (14:53 +0200)
committerPaul Poulain <paul.poulain@biblibre.com>
Fri, 20 Apr 2012 16:24:38 +0000 (18:24 +0200)
Many modifications, see bugzilla for more informations.
Moved the CSS call to allow override with intranetusercss.

27 files changed:
koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css [new file with mode: 0644]
koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc
koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/ui.tabs.css
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
koha-tmpl/intranet-tmpl/prog/img/background_koha_logo.png [new file with mode: 0644]
koha-tmpl/intranet-tmpl/prog/img/icon_acquisitions.png [new file with mode: 0644]
koha-tmpl/intranet-tmpl/prog/img/icon_administration.png [new file with mode: 0644]
koha-tmpl/intranet-tmpl/prog/img/icon_authorities.png [new file with mode: 0644]
koha-tmpl/intranet-tmpl/prog/img/icon_cataloging.png [new file with mode: 0644]
koha-tmpl/intranet-tmpl/prog/img/icon_circulation.png [new file with mode: 0644]
koha-tmpl/intranet-tmpl/prog/img/icon_koha.png [new file with mode: 0644]
koha-tmpl/intranet-tmpl/prog/img/icon_lists.png [new file with mode: 0644]
koha-tmpl/intranet-tmpl/prog/img/icon_patrons.png [new file with mode: 0644]
koha-tmpl/intranet-tmpl/prog/img/icon_reports.png [new file with mode: 0644]
koha-tmpl/intranet-tmpl/prog/img/icon_search.png [new file with mode: 0644]
koha-tmpl/intranet-tmpl/prog/img/icon_serials.png [new file with mode: 0644]
koha-tmpl/intranet-tmpl/prog/img/icon_tools.png [new file with mode: 0644]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css b/koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css
new file mode 100644 (file)
index 0000000..49567e2
--- /dev/null
@@ -0,0 +1,198 @@
+/*
+ * This file contains CSS styles used only on the front page of Koha
+ *
+ * COLORS
+ * Very light blue  Module links background                 : #f4f8f9
+ * Light blue       Navbar, breadcrumb                      : #e6f0f2
+ * Blue             Module links and breadcrumb border      : #b9d8d9
+ * Dark blue        Links                                   : #004d99
+ * Green            Links:hover                             : #538200
+ * These colors are used in staff-global.css too
+ *
+ */
+
+#area-content {
+    /* Contains the news + both columns of links + pending box + userblock box */
+    float: left;
+    background-image:url('/intranet-tmpl/prog/img/background_koha_logo.png');
+    background-repeat:no-repeat;
+    background-position:left top;
+    padding-top: 12px;
+}
+
+
+/* ==== NEWS - Start ==== */
+#area-news {
+    /* Displayed if news are available */
+    width: 300px;
+    float: left;
+    border: 1px solid #EEEEEE;
+    margin: .2em;
+    border-radius: 6px;
+}
+
+#area-news h3 {
+    /* Title section for the news block : transparency to let the koha logo appear */
+    background-color: #EEEEEE;
+    filter:alpha(opacity=50);   /* for IE */
+    -moz-opacity: 0.5;          /* for Firefox before 0.9 */
+    opacity: 0.5;
+    padding : .3em; margin: 0;
+}
+
+.newsitem {
+    /* Block for one News entry */
+    padding: 3px;
+    margin: .3em;
+    border-bottom: 1px solid #EEE;
+    background-color : #ffffff;
+    border-radius: 6px;
+    }
+
+.newsfooter {
+    /* Footer containing the publication date and edition links for an News entry */
+    font-size: 80%;
+    color: #808080;
+}
+
+#area-nonews {
+    /* Displayed if no news are available, to keep the structure intact */
+    width: 300px;
+    float: left;
+}
+/* ==== NEWS - End ==== */
+
+
+/* ==== MODULE LINKS - Start ==== */
+#area-lists {
+    /* Contains the two links columns */
+    margin-left: 20px;
+    float: left;
+}
+
+#area-list-left {
+    /* Left column for links */
+    width: 352px;
+    float: left;
+}
+#area-list-right {
+    /* Right column for links */
+    margin-left: 20px;
+    float: left;
+    width: 352px;
+}
+
+ul.biglinks-list {
+    /* List containing the module links */
+    padding: 0px;
+}
+
+ul.biglinks-list li {
+    /* Standard attributes for the list elements */
+    list-style-type:none;
+}
+
+ul.biglinks-list li a.icon_general {
+    /* Class used for each module link */
+    display: block;
+    float: left;
+
+    width:295px;
+    height: 46px;
+    margin-bottom: 14px;
+    padding-left:53px;
+    padding-top:5px;
+
+    border: solid 2px #b9d8d9;
+    border-radius: 6px;
+
+    text-decoration: none;
+    font-family: verdana, arial;
+    font-weight: bold;
+    font-size: large;
+    color: #000000;
+
+    background-color:#f4f8f9;
+    background-repeat:no-repeat;
+}
+
+ul.biglinks-list li a:hover.icon_general {
+    /* Class used for each module link hover state */
+    background-position:0 -46px;
+    color: #538200;
+    border-color: #538200;
+}
+
+/* CSS Sprites
+ * Each image contains the normal and the hover state of the icon
+ * The hover part starts at 46px below the top:
+ *
+ *  46px
+ * -------
+ * |     |
+ * |  N  | 46px \
+ * |     |       |
+ * -------        > 92px
+ * |     |       |
+ * |  H  | 46px /
+ * |     |
+ * -------
+ *
+ */
+
+/* Classes used for each individual module link */
+ul.biglinks-list li a.icon_circulation {background-image:url('/intranet-tmpl/prog/img/icon_circulation.png')}
+ul.biglinks-list li a.icon_patrons {background-image:url('/intranet-tmpl/prog/img/icon_patrons.png')}
+ul.biglinks-list li a.icon_search {background-image:url('/intranet-tmpl/prog/img/icon_search.png')}
+ul.biglinks-list li a.icon_lists {background-image:url('/intranet-tmpl/prog/img/icon_lists.png')}
+ul.biglinks-list li a.icon_cataloging {background-image:url('/intranet-tmpl/prog/img/icon_cataloging.png')}
+ul.biglinks-list li a.icon_authorities {background-image:url('/intranet-tmpl/prog/img/icon_authorities.png')}
+
+ul.biglinks-list li a.icon_serials {background-image:url('/intranet-tmpl/prog/img/icon_serials.png')}
+ul.biglinks-list li a.icon_acquisitions {background-image:url('/intranet-tmpl/prog/img/icon_acquisitions.png')}
+ul.biglinks-list li a.icon_reports {background-image:url('/intranet-tmpl/prog/img/icon_reports.png')}
+ul.biglinks-list li a.icon_administration {background-image:url('/intranet-tmpl/prog/img/icon_administration.png')}
+ul.biglinks-list li a.icon_tools {background-image:url('/intranet-tmpl/prog/img/icon_tools.png')}
+ul.biglinks-list li a.icon_koha {background-image:url('/intranet-tmpl/prog/img/icon_koha.png')}
+/* ==== MODULE LINKS - End ==== */
+
+
+/* ==== PENDING - Start ==== */
+#area-pending {
+    /* Block containing links to pending tags, comments and suggestions */
+    width: 100%;
+    border: solid 1px #b9d8d9;
+    border-radius: 6px;
+    clear: left;
+}
+
+.pending-info {
+    /* For the div containing a "pending" link (useful to preserve width of area-pending box width) */
+    margin-top: 2px;
+    margin-bottom: 2px;
+    margin-left: 8px;
+}
+
+.pending-number-link {
+    /* Style for the "pending" links : the number of pending items appear bigger */
+    font-weight: bold;
+    font-size: 1.1em;
+}
+/* ==== PENDING - End ==== */
+
+
+/* ==== USERBLOCK - Start ==== */
+#area-userblock {
+    /* Appears if the "IntranetmainUserblock" system preference is defined */
+    margin-top: 10px;
+    width: 100%;
+    border: solid 1px #b9d8d9;
+    border-radius: 6px;
+    clear: left;
+}
+
+.user-info {
+    /* For the div containing the information (useful to preserve width of area-userblock box width) */
+    margin: 8px;
+}
+/* ==== USERBLOCK - End ==== */
index 4ec5ef2..68523d7 100644 (file)
@@ -1,8 +1,29 @@
 @import url("../lib/yui/reset-fonts-grids.css");
 @import url("../lib/yui/skin.css");
 
-a, a:link, a:visited, a:active {
-       color : #0000CC;
+input:focus, textarea:focus {
+    border-color:#538200;
+    border-style:solid;
+    border-radius: 4px;
+}
+
+radio:focus, checkbox:focus {
+    border-color:#538200;
+    border-style:solid;
+    border-radius: 4px;
+}
+
+::selection      { background:#538200; color:#ffffff; /* Safari and Opera */ }
+::-moz-selection  { background:#538200; color:#ffffff; /* Firefox */ }
+
+a, a:link, a:visited {
+    color : #004d99;
+    text-decoration: none;
+}
+
+a:hover, a:active {
+    color : #538200;
+    text-decoration: none;
 }
 
 .yui-button,.yui-button a:link,.yui-button a:visited {
@@ -13,9 +34,6 @@ a.yuimenuitemlabel {
         color: #000000;
 }
 
-a:hover {
-       color : #669ACC;
-}
 
 a.overdue,
 .overdue,
@@ -164,9 +182,31 @@ ol li {
 }
 
 #header {
-       background-color : #F3F3F3;
-       border-bottom : 1px solid #E8E8E8;
-       line-height : 2em;
+    background-color : #e6f0f2;
+    line-height : 2em;
+}
+
+#header a.toplinks {
+    #color: #ffffff;
+    font-weight: bold;
+}
+
+.gradient {
+    background-image: linear-gradient(top, rgb(230,240,242) 1%, rgb(255,255,255) 99%);
+    background-image: -o-linear-gradient(top, rgb(230,240,242) 1%, rgb(255,255,255) 99%);
+    background-image: -moz-linear-gradient(top, rgb(230,240,242) 1%, rgb(255,255,255) 99%);
+    background-image: -webkit-linear-gradient(top, rgb(230,240,242) 1%, rgb(255,255,255) 99%);
+    background-image: -ms-linear-gradient(top, rgb(230,240,242) 1%, rgb(255,255,255) 99%);
+
+    background-image: -webkit-gradient(
+        linear,
+        left top,
+        left bottom,
+        color-stop(0.1, rgb(212,214,255)),
+        color-stop(0.99, rgb(255,255,255))
+    );
+    display: inline-block;
+    width:100%;
 }
 
 .clearfix:after {
@@ -177,7 +217,9 @@ ol li {
     visibility: hidden;
 }
 
-.clearfix {display: inline-block;}
+.clearfix {
+    display: inline-block;
+}
 
 /* Hides from IE-mac \*/
 * html .clearfix {height: 1%;}
@@ -318,25 +360,29 @@ span.problem {
 }
 
 fieldset {
-       border : 2px solid #EEEEEE;
        margin : 1em 1em 1em 0;
        padding : 1em;
+    background-color:#f4f8f9;
+    border:2px solid #b9d8d9;
+    border-radius:5px;
 }
 
 legend {
        font-size : 123.1%;
        font-weight : bold;
-       margin : 0 0 0 -1em;
-       padding : 0;
+    border:2px solid #b9d8d9;
+    background-color:#ffffff;
+    border-radius:3px;
+    text-align:right;
+    padding: 0.2em 0.5em;
 }
 
 #breadcrumbs {
-       background-color : #F3F3F3;
-       border-bottom : 1px solid #E8E8E8;
-       clear : both;
-       font-size : 90%;
-       padding :.2em .5em .4em 10px;
-       margin : 0;
+    background-color : #e6f0f2;
+    clear : both;
+    font-size : 90%;
+    padding :.2em .5em .4em 10px;
+    margin : 0;
 }
 
 #header+#breadcrumbs {
@@ -375,7 +421,7 @@ div#header_search ul.link-tabs li.off a {
 
 div#header_search div.residentsearch {
        border : 0;
-       border-bottom : 1px solid #FF9900;
+    border-bottom : 1px solid #85ca11;
        padding : 0 0 .2em 0;
 }
 
@@ -458,7 +504,7 @@ div.patroninfo {
 }
 
 div.patroninfo h5 {
-       border-right :  1px solid #000;
+    border-right:1px solid #b9d8d9;
        margin-bottom : 0;
        padding-left : -.5em;
        padding-top : .3em;
@@ -467,7 +513,7 @@ div.patroninfo h5 {
 
 div.patroninfo ul {
        border : 0;
-       border-right : 1px solid #000;
+    border-right:1px solid #b9d8d9;
        border-bottom : 0;
        border-top : 0;
        padding : 0;
@@ -556,7 +602,7 @@ div.yui-b fieldset.brief fieldset legend {
 
 fieldset.rows {  
 border-width : 1px;
-border-bottom : 1px solid #666;
+border:2px solid #b9d8d9;
 float : left;
 font-size : 90%;
 clear : left;
@@ -666,6 +712,7 @@ fieldset.rows label.yesno {
 fieldset.action, div.action {
        clear : both;
        float : none;
+    background-color:#ffffff;
        border : none;
        margin : 0;
        padding : 1em 0 .3em 0;
@@ -740,7 +787,7 @@ fieldset.rows .inputnote {
 }
 
 .ui-tabs-nav a, .ui-tabs-nav a span, .ui-tabs-nav span.a {
-   background : none;
+    background : none;
        display : block;
        padding: .2em .5em .25em .5em;
 }
@@ -750,14 +797,15 @@ fieldset.rows .inputnote {
 }
 
 .ui-tabs-nav .ui-tabs-selected a, .ui-tabs-nav .ui-tabs-selected span.a {
-       background-color : #FFFFCC;
-       border-top: 1px solid #FFFFCC;
-       border-right: 1px solid #FF9900;
-       border-bottom: 1px solid #FF9900;
-       border-left: 1px solid #FFCC66;
+    border-top: 1px solid #e6f0f2;
+    border-right: 1px solid #85ca11;
+    border-bottom: 1px solid #85ca11;
+    border-left: 1px solid #85ca11;
        font-weight : bold;
        text-align : center;
        text-decoration : none;
+    border-radius: 0px 0px 4px 4px;
+    color : #000000;
 
 }
 
@@ -766,11 +814,11 @@ fieldset.rows .inputnote {
 }
 
 .ui-tabs-nav .ui-tabs-selected a:hover {
-       color : #0000CC;
+    color : #000000;
 }
 
 .ui-tabs-nav li.ui-tabs-selected {
-       background-color : #FFFFCC;
+    /* background-color : #FFFFCC; */
 }
 
 .ui-tabs-nav .ui-tabs-selected a, .ui-tabs-nav a:hover, .ui-tabs-nav a:focus, .ui-tabs-nav a:active, .ui-tabs-nav span.a {
@@ -803,12 +851,14 @@ fieldset.rows .inputnote {
        border : 1px solid #E8E8E8;
        text-align : center;
        text-decoration : none;
+    border-radius : 3px;
 }
 
 .toptabs .ui-tabs-nav li.ui-tabs-selected a, .toptabs .ui-tabs-nav li.ui-tabs-selected span.a {
        background-color : #FFF;
        border-bottom : 1px solid #FFF;
        margin-top : 0;
+    border-radius : 3px;
 }
 
 .toptabs .tabs-container {
@@ -1299,7 +1349,7 @@ a:hover .term {
 }
 
 div#menu {
-       border-right: 1px solid #000;
+    border-right:1px solid #b9d8d9;
        margin-right: .5em;
        padding-top: 1em;
        padding-bottom: 2em;
@@ -1324,7 +1374,7 @@ div#menu li a {
        border-top-left-radius: 5px;
        -moz-border-bottom-left-radius: 5px;
        border-bottom-left-radius: 5px;
-       border: 1px solid #000;
+    border:1px solid #b9d8d9;
        font-size: 111%;
        margin: .5em 0;
        padding: .4em .3em;
@@ -1344,7 +1394,7 @@ div#menu li a:hover {
 
 div#menu li.active a:hover {
        background-color: #fff;
-       color :  #0000CC;
+    color :  #538200;
 }
 
 #menu ul li {
@@ -1356,6 +1406,7 @@ div#menu li.active a:hover {
        background-image : none;
        border-right: 0;
        font-weight: bold;
+    color:#000000;
 }
 
 ul.error {
@@ -1672,13 +1723,12 @@ a.yuimenuitemlabel:hover {
 #toplevelnav {
        float : left;
        margin-left : .5em;
-       width : 30em;
 }
 
 ul#toplevelmenu {
        padding : 0;
 }
-               
+
 ul#toplevelmenu li {
        display: inline;
        padding : 0 .6em;
@@ -1871,7 +1921,8 @@ span.permissiondesc {
        border: 0;
        padding: 5;
        font-size: 11pt;
-       color: darkblue;
+    color: #000000;
+    font-style: italic;
 }
 
 .labeledmarc-value {
index 8ee72ec..cc796fa 100644 (file)
@@ -1,4 +1,4 @@
-
+<div class="gradient">
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1><!-- Begin Acquisitions Resident Search Box -->
 <div id="header_search">
 <div id="supplier_search" class="residentsearch">
@@ -27,5 +27,6 @@
             <li><a href="/cgi-bin/koha/acqui/booksellers.pl#supplier_search">Vendor search</a></li>
             <li><a href="/cgi-bin/koha/acqui/histsearch.pl#orders_search">Orders search</a></li>
                        </ul>   
-</div>
+</div><!-- /header_search -->
+</div><!-- /gradient -->
 <!-- End Acquisitions Resident Search Box -->
index 0814922..9a2f9c5 100644 (file)
@@ -1,3 +1,4 @@
+<div class="gradient">
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1>
 <!-- Begin Authorities Resident Search Box -->
 <div id="header_search" class="residentsearch">
@@ -97,5 +98,6 @@
         <li><a href="/cgi-bin/koha/authorities/authorities-home.pl#main_heading">Search main heading</a></li>
         <li><a href="/cgi-bin/koha/authorities/authorities-home.pl#all_headings">Search all headings</a></li>
     </ul>
-</div>
+</div><!-- /header_search -->
+</div><!-- /gradient -->
 <!-- End Authorities Resident Search Box -->
index 7696eff..13a24fe 100644 (file)
@@ -1,4 +1,4 @@
-
+<div class="gradient">
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1><!-- Begin Catalogue Resident Search Box -->
 [% IF ( CAN_user_circulate ) %][% IF ( CircAutocompl ) %]<script type="text/javascript">
 //<![CDATA[
@@ -93,5 +93,6 @@ YAHOO.util.Event.onContentReady("header_search", function() {
     [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/returns.pl#checkin_search">Check in</a></li>[% END %]
             [% IF ( CAN_user_catalogue ) %]<li class="ui-tabs-selected"><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the catalog</a></li>[% END %]
                        </ul>   
-</div>
+</div><!-- /header_search -->
+</div><!-- /gradient -->
 <!-- End Catalogue Resident Search Box -->
index 9f93f3d..aa2fccd 100644 (file)
@@ -2,6 +2,7 @@
        $("input[name=q]:eq(0)").focus();
 });</script>
 
+<div class="gradient">
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1><!-- Begin Cataloging Resident Search Box -->
 <div id="header_search">
 <div id="addbooks_search" class="residentsearch">
@@ -16,5 +17,6 @@
             <li><a href="/cgi-bin/koha/catalogue/search.pl#addbooks_search">Cataloging search</a></li>
             [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check out</a></li>[% END %]
                        </ul>   
-</div>
+</div><!-- /header_search -->
+</div><!-- /gradient -->
 <!-- End Cataloging Resident Search Box -->
index dc99b90..56b24bf 100644 (file)
@@ -1,4 +1,4 @@
-
+<div class="gradient">
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1><!-- Begin Circulation Resident Search Box -->
 
 <div id="header_search">
@@ -26,6 +26,6 @@
     [% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the catalog</a></li>[% END %]
 </ul>   
 
-</div>
-
+</div><!-- /header_search -->
+</div><!-- /gradient -->
 <!-- End Circulation Resident Search Box -->
index 539c466..4783523 100644 (file)
@@ -3,15 +3,15 @@
     <div id="header" class="clearfix">
         <div id="toplevelnav">
             <ul id="toplevelmenu">
-                [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a></li>[% END %]
-                [% IF ( CAN_user_borrowers ) %]<li><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a></li>[% END %]
-                [% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl">Search</a></li>[% END %]
+                [% IF ( CAN_user_circulate ) %]<li><a class="toplinks" href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a></li>[% END %]
+                [% IF ( CAN_user_borrowers ) %]<li><a class="toplinks" href="/cgi-bin/koha/members/members-home.pl">Patrons</a></li>[% END %]
+                [% IF ( CAN_user_catalogue ) %]<li><a class="toplinks" href="/cgi-bin/koha/catalogue/search.pl">Search</a></li>[% END %]
                 [% IF ( intranetbookbag ) %]
-                    <li><a href="#" id="cartmenulink">Cart<span id="basketcount"></span></a></li>
+                    <li><a class="toplinks" href="#" id="cartmenulink">Cart<span id="basketcount"></span></a></li>
                 [% END %]
                 [% IntranetNav %]
                 <li class="more">
-                    <a id="showmore" href="/cgi-bin/koha/mainpage.pl">More</a>
+                    <a class="toplinks" id="showmore" href="/cgi-bin/koha/mainpage.pl">More</a>
                     <div id="moremenu">
                         <div class="bd">
                             <ul>
             </strong>
             [% IF ( IndependantBranches ) %]
                 [% IF ( CAN_user_management || CAN_user_editcatalogue_edit_catalogue ) %]
-                    (<a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a>)
+                    ( <a class="toplinks" href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a> )
                 [% END %]
             [% ELSE %]
-                (<a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a>)
+                ( <a class="toplinks" href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a> )
             [% END %]
         |
         [% END %]
                 [% loggedinusername %]
             </span>
             [% IF ( intranetbookbag ) %]
-            (<a href="/cgi-bin/koha/mainpage.pl?logout.x=1" onclick="clearHoldFor(); delBasket('main', true);">Log out</a>) |
+            ( <a class="toplinks" href="/cgi-bin/koha/mainpage.pl?logout.x=1" onclick="clearHoldFor(); delBasket('main', true);">Log out</a> ) |
             [% ELSE %]
-            (<a href="/cgi-bin/koha/mainpage.pl?logout.x=1" onclick="clearHoldFor();">Log out</a>) |
+            ( <a class="toplinks" href="/cgi-bin/koha/mainpage.pl?logout.x=1" onclick="clearHoldFor();">Log out</a> ) |
             [% END %]
         [% ELSE %]
             You are not logged in |
         [% END %]
-        <a href="/cgi-bin/koha/help.pl" id="helper" onclick="var link=window.open('','Koha_Help','width=600,height=600,toolbar=false,scrollbars=yes'); link.location='/cgi-bin/koha/help.pl'; return false;">[ ? ]</a>
+        <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper" onclick="var link=window.open('','Koha_Help','width=600,height=600,toolbar=false,scrollbars=yes'); link.location='/cgi-bin/koha/help.pl'; return false;">[ ? ]</a>
     </div>
 </div> 
index bf04636..8ea46f4 100644 (file)
@@ -1,4 +1,4 @@
-
+<div class="gradient">
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1><!-- Begin Main page Resident Search Box -->
 
 <div id="header_search">
@@ -35,6 +35,6 @@
     [% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the catalog</a></li>[% END %]
 </ul>
 
-</div>
-
+</div><!-- /header_search -->
+</div><!-- /gradient -->
 <!-- End Main page Resident Search Box -->
index 9f30bfe..8bc7627 100644 (file)
@@ -1,4 +1,4 @@
-
+<div class="gradient">
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1><!-- Begin Patrons Resident Search Box -->
 [% IF ( CAN_user_circulate ) %][% IF ( CircAutocompl ) %]<script type="text/javascript">
 //<![CDATA[
@@ -130,7 +130,8 @@ YAHOO.util.Event.onContentReady("header_search", function() {
     [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/returns.pl#checkin_search">Check in</a></li>[% END %]
             [% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the catalog</a></li>[% END %]
                        </ul>
-</div>
+</div><!-- /header_search -->
+</div><!-- /gradient -->
 <script type="text/javascript">//<![CDATA[
 $(document).ready(function() {
     [% IF ( advsearch ) %]$("#filteraction_on").toggle();
index b71b0ee..546ab56 100644 (file)
@@ -1,4 +1,4 @@
-
+<div class="gradient">
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1><!-- Begin Serials Resident Search Box -->
 <div id="header_search">
        <div id="subscription_search" class="residentsearch">
@@ -21,5 +21,6 @@
             [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check out</a></li>[% END %]
             [% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the catalog</a></li>[% END %]
                        </ul>   
-</div>
+</div><!-- /header_search -->
+</div><!-- /gradient -->
 <!-- End Serials Resident Search Box -->
index 34bd5fb..daf9f86 100644 (file)
@@ -68,7 +68,8 @@
 .ui-tabs-panel {
     border: 1px solid #E8E8E8;
        padding : 1em;
-    background: #fff; /* declare background color for container to avoid distorted fonts in IE while fading */
+    border-radius : 3px;
+    #background: #fff; /* declare background color for container to avoid distorted fonts in IE while fading */
 }
 
 /* Additional IE specific bug fixes... */
@@ -77,4 +78,4 @@
 }
 *:first-child+html .ui-tabs-nav  { /* auto clear @ IE 7 Standards Mode - do not group selectors, otherwise IE 6 will ignore complete rule (because of the unknown + combinator)... */
     display: inline-block;
-}
\ No newline at end of file
+}
index 34ee031..f4f0def 100644 (file)
                   by the Bridge Consortium of Carleton College and St. Olaf College.</li>
               </ul>
 
+            <h2>The Noun Project icons</h2>
+                <ul>
+                    <li>All images come from <a href="http://thenounproject.com/">The Noun Project</a> collection</li>
+                    <li>
+                        Circulation ("fair-trade") symbol by Edward Boatman ; Patrons
+                        ("children's library") symbol by Edward Boatman, Saul Tannenbaum,
+                        Stephen Kennedy, Nikki Snow, Brooke Hamilton ; Search ("magnifying
+                        glass") symbol by Philipp Suess ; Lists ("folder") symbol by Jack
+                        Biesek, Gladys Brenner, Margaret Faye, Healther Merrifield, Kate
+                        Keating, Wendy Olmstead, Todd Pierce, Jamie Cowgill, Jim Bolek ;
+                        Cataloging ("price tag") symbol by the Noun Project ; Authorities
+                        ("link") symbol by Matthew Exton ; Serials ("newspaper") symbol by John
+                        Caserta ; Acquisitions ("present") symbol by David Goodger ; Reports
+                        ("pie chart") symbol by Scott Lewis ; Administration ("gears") symbol by
+                        Jeremy Minnick ; Tools ("wrench") symbol by National Park Service
+                    </li>
+                </ul>
+
             <h2>jQuery Star Rating Plugin</h2>
               <p>jQuery Star Rating Plugin v3.14 by <a href="http://www.fyneworks.com/">Fyneworks.com</a> is licensed under the <a target="_blank" href="http://en.wikipedia.org/wiki/MIT_License">MIT License</a> and the <a target="_blank" href="http://creativecommons.org/licenses/GPL/2.0/">GPL License</a>.</p>
 
index 9ff683e..bcd0f6c 100644 (file)
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha staff client</title>
+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/mainpage.css" />
 [% INCLUDE 'doc-head-close.inc' %]
-<style type="text/css"> #koha-news { border: 1px solid #EEEEEE; margin: .2em;} #koha-news h3 {background-color: #EEEEEE; padding : .3em; margin: 0;} .newsitem {margin: .3em; border-bottom: 1px solid #EEE;} .newsitem:last-child {border-bottom : 0;} .newsfooter {font-size: 80%; color: #CCCCCC;} </style>
+<style type="text/css"> </style>
+
 </head>
 <body id="main_intranet-main" class="main">
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'home-search.inc' %]
 
-<div id="breadcrumbs">Home</div>
+<div id="breadcrumbs" >Home</div>
+<div style="clear: both"></div>
+<div id="area-content">
+    [% IF ( koha_news_count ) %]
+        <div id="area-news">
+            <h3><span="news_title">News</span></h3>
+            [% FOREACH koha_new IN koha_news %]
+                <div class="newsitem" id="news[% koha_new.idnew %]"><h4>[% koha_new.title %]</h4>
+                    <p>[% koha_new.new %]</p>
+                    <p class="newsfooter"> Posted on [% koha_new.newdate %]
+                        [% IF ( CAN_user_tools ) %]
+                            <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&amp;id=[% koha_new.idnew %]">Edit</a>
+                             | <a href="/cgi-bin/koha/tools/koha-news.pl?op=del&amp;ids=[% koha_new.idnew %]">Delete</a>
+                             | <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form">New</a>
+                        [% END %]
+                    </p>
+                </div>
+            [% END %]
+        </div><!-- /koha-news -->
+    [% ELSE %]
+        <div id="area-nonews">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
+    [% END %]
+        <div id="area-lists">
+            <div id="area-list-left">
+                <ul class="biglinks-list">
+                    [% IF ( CAN_user_circulate ) %]
+                    <li>
+                        <a class="icon_general icon_circulation" href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>
+                    </li>
+                    [% END %]
 
-<div id="doc3" class="yui-t3">
-<div id="bd">
-<div id="yui-main"><div class="yui-b"><div class="yui-g">
+                    [% IF ( CAN_user_borrowers ) %]
+                    <li>
+                        <a class="icon_general icon_patrons" href="/cgi-bin/koha/members/members-home.pl">Patrons</a>
+                    </li>
+                    [% END %]
 
-<h1>Welcome to Koha</h1>
+                    [% IF ( CAN_user_catalogue ) %]
+                    <li>
+                        <a class="icon_general icon_search" href="/cgi-bin/koha/catalogue/search.pl">Advanced Search</a>
+                    </li>
+                    [% END %]
 
-    <div class="yui-u first">
-    <!-- START - CIRCULATION -->
-    [% IF ( CAN_user_circulate ) %]
-    <h3><a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a></h3>
-    <ul>
-        <li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li>
-    </ul>
-    [% END %]
-    <!-- END - CIRCULATION -->
+                    <li>
+                        <a class="icon_general icon_lists" href="/cgi-bin/koha/virtualshelves/shelves.pl">Lists</a>
+                    </li>
 
-    <!-- START - PATRONS -->
-    [% IF ( CAN_user_borrowers ) %]
-        <h3><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a></h3>
-    [% END %]
-    <!-- END - PATRONS -->
+                    [% IF ( CAN_user_catalogue || CAN_user_editcatalogue ) %]
+                    <li>
+                        <a class="icon_general icon_cataloging" href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a>
+                    </li>
+                    [% END %]
 
-    <!-- START - ADVANCED SEARCH -->
-    [% IF ( CAN_user_catalogue ) %]
-        <h3><a href="/cgi-bin/koha/catalogue/search.pl">Advanced search</a></h3>
-    [% END %]
-    <!-- END - ADVANCED SEARCH -->
-    
-    <!-- START - LISTS -->
-    <h3><a href="/cgi-bin/koha/virtualshelves/shelves.pl">Lists</a></h3>
-    <!-- END - LISTS -->
-
-    <!-- START - CATALOGING -->
-    [% IF ( CAN_user_catalogue || CAN_user_editcatalogue || CAN_user_editauthorities ) %]
-        <h3><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a></h3>
-        <ul>
-        [% IF ( CAN_user_catalogue || CAN_user_editcatalogue ) %]
-                <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC record</a></li>
-        [% END %]
-        [% IF ( CAN_user_editauthorities ) %]
-                <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
-        [% END %]
-        </ul>
-    [% END %]
-    <!-- END - CATALOGING -->
-    </div>
+                    [% IF ( CAN_user_editauthorities ) %]
+                    <li>
+                        <a class="icon_general icon_authorities" href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a>
+                    </li>
+                    [% END %]
+                </ul>
+            </div><!-- /area-list-left -->
 
-    <div class="yui-u">
-    <!-- START - SERIALS -->
-    [% IF ( CAN_user_serials ) %]
-        <h3><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></h3>
-    [% END %]
-    [% IF ( CAN_user_acquisition ) %]
-        <h3><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a></h3>
-        [% IF ( pendingsuggestions ) %]
-            <ul>
-                <li><a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions pending approval</a>: <span class="holdcount"><a href="/cgi-bin/koha/suggestion/suggestion.pl">[% pendingsuggestions %]</a></span></li>
-            </ul>
-        [% END %]
-    [% END %]
-    <!-- END - SERIALS -->
+            <div id="area-list-right">
+                <ul class="biglinks-list">
+                    [% IF ( CAN_user_serials ) %]
+                    <li>
+                        <a class="icon_general icon_serials" href="/cgi-bin/koha/serials/serials-home.pl">Serials</a>
+                        <span class="biglink"></span>
+                    </li>
+                    [% END %]
 
-    <!-- START - REPORTS -->
-    [% IF ( CAN_user_reports ) %]
-        <h3><a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a></h3>
-    [% END %]
-    <!-- END - REPORTS -->
-
-    <!-- START - ADMINISTRATION -->
-    [% IF ( CAN_user_parameters ) %]
-        <h3><a href="/cgi-bin/koha/admin/admin-home.pl">Koha administration</a></h3>
-        <ul>
-            <li><a href="/cgi-bin/koha/admin/preferences.pl">System preferences</a></li>
-        </ul>
-        [% END %]
-    [% IF ( CAN_user_tools ) %] 
-        <h3><a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a></h3>
-        [% IF ( CAN_user_tools_moderate_comments && pendingcomments ) || ( CAN_user_tools_moderate_tags && pendingtags ) %]
-            <ul>
-                [% IF ( CAN_user_tools_moderate_comments && pendingcomments ) %]
-                    <li><a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Comments pending approval</a>: <span class="holdcount"><a href="/cgi-bin/koha/reviews/reviewswaiting.pl">[% pendingcomments %]</a></span></li>
-                [% END %]
-                [% IF ( CAN_user_tools_moderate_tags && pendingtags ) %]
-                    <li><a href="/cgi-bin/koha/tags/review.pl">Tags pending approval</a>: <span class="holdcount"><a href="/cgi-bin/koha/tags/review.pl">[% pendingtags %]</a></span></li>
-                [% END %]
-            </ul>
-        [% END %]
-    [% END %]
-    <!-- END - ADMINISTRATION -->
-
-    <!-- START - ABOUT -->
-    <h3><a href="/cgi-bin/koha/about.pl">About Koha</a></h3>
-    <!-- END - ABOUT -->
-    </div>
-    </div>
-        [% IF ( IntranetmainUserblock ) %]
-            <div id="mainuserblock" class="yui-g">
-            [% IntranetmainUserblock %]
-            </div>[% ELSE %]&nbsp;
-        [% END %]
-    </div><!-- /yui-bd -->
-    </div><!-- /yui-main -->
-    [% IF ( koha_news_count ) %]
-        <div class="yui-b">
-            <div id="koha-news">
-                <h3>News</h3>
-                [% FOREACH koha_new IN koha_news %]
-                    <div class="newsitem" id="news[% koha_new.idnew %]"><h4>[% koha_new.title %]</h4>
-                        <p>[% koha_new.new %]</p>
-                        <p class="newsfooter"> Posted on [% koha_new.newdate %]
-                            [% IF ( CAN_user_tools ) %]
-                                <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&amp;id=[% koha_new.idnew %]">Edit</a> | <a href="/cgi-bin/koha/tools/koha-news.pl?op=del&amp;ids=[% koha_new.idnew %]">Delete</a> | <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form">New</a>
-                            [% END %]
-                        </p>
+                    [% IF ( CAN_user_acquisition ) %]
+                    <li>
+                        <a class="icon_general icon_acquisitions" href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
+                        <span class="biglink"></span>
+                    </li>
+                    [% END %]
+
+                    [% IF ( CAN_user_reports ) %]
+                    <li>
+                        <a class="icon_general icon_reports" href="/cgi-bin/koha/reports/reports-home.pl">Reports</a>
+                    </li>
+                    [% END %]
+
+                    [% IF ( CAN_user_parameters ) %]
+                    <li>
+                        <a class="icon_general icon_administration" href="/cgi-bin/koha/admin/admin-home.pl">Koha Administration</a>
+                    </li>
+                    [% END %]
+
+                    [% IF ( CAN_user_tools ) %]
+                    <li>
+                        <a class="icon_general icon_tools" href="/cgi-bin/koha/tools/tools-home.pl">Tools</a>
+                    </li>
+                    [% END %]
+
+                    <li>
+                        <a class="icon_general icon_koha" href="/cgi-bin/koha/about.pl">About Koha</a>
+                    </li>
+                </ul>
+            </div><!-- /area-list-right -->
+
+            [% IF ( CAN_user_tools_moderate_comments ) && ( pendingsuggestions || pendingcomments || pendingtags ) %]
+                <div id="area-pending">
+                    [% IF ( pendingsuggestions ) %]
+                    <div class="pending-info">
+                        <a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions pending approval:
+                        <span class="pending-number-link">[% pendingsuggestions %]</span></a>
                     </div>
-                [% END %]
-            </div><!-- /koha-news -->
-        </div>
-    [% END %]
+                    [% END %]
+
+                    [% IF ( pendingcomments ) %]
+                    <div class="pending-info">
+                        <a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Comments pending approval:
+                        <span class="pending-number-link">[% pendingcomments %]</span></a>
+                    </div>
+                    [% END %]
+
+                    [% IF ( pendingtags ) %]
+                    <div class="pending-info">
+                        <a href="/cgi-bin/koha/tags/review.pl">Tags pending approval:
+                        <span class="pending-number-link">[% pendingtags %]</span></a>
+                    </div>
+                    [% END %]
+                </div>
+            [% END %]
 
+            [% IF ( IntranetmainUserblock ) %]
+            <div id="area-userblock">
+                <div class="user-info">
+                    [% IntranetmainUserblock %]
+                </div>
+            </div>
+            [% END %]
 
-</div>
+            <div style="height: 30px">
+                <!-- Without this white space the end of the page can be hidden by the language selector -->
+                &nbsp;
+            </div>
+        </div><!-- /area-lists -->
 
+<!-- the main div is closed in intranet-bottom.inc -->
 [% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/img/background_koha_logo.png b/koha-tmpl/intranet-tmpl/prog/img/background_koha_logo.png
new file mode 100644 (file)
index 0000000..45567ef
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/img/background_koha_logo.png differ
diff --git a/koha-tmpl/intranet-tmpl/prog/img/icon_acquisitions.png b/koha-tmpl/intranet-tmpl/prog/img/icon_acquisitions.png
new file mode 100644 (file)
index 0000000..3f3ac65
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/img/icon_acquisitions.png differ
diff --git a/koha-tmpl/intranet-tmpl/prog/img/icon_administration.png b/koha-tmpl/intranet-tmpl/prog/img/icon_administration.png
new file mode 100644 (file)
index 0000000..197053f
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/img/icon_administration.png differ
diff --git a/koha-tmpl/intranet-tmpl/prog/img/icon_authorities.png b/koha-tmpl/intranet-tmpl/prog/img/icon_authorities.png
new file mode 100644 (file)
index 0000000..91aa6b1
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/img/icon_authorities.png differ
diff --git a/koha-tmpl/intranet-tmpl/prog/img/icon_cataloging.png b/koha-tmpl/intranet-tmpl/prog/img/icon_cataloging.png
new file mode 100644 (file)
index 0000000..8050d04
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/img/icon_cataloging.png differ
diff --git a/koha-tmpl/intranet-tmpl/prog/img/icon_circulation.png b/koha-tmpl/intranet-tmpl/prog/img/icon_circulation.png
new file mode 100644 (file)
index 0000000..ae43935
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/img/icon_circulation.png differ
diff --git a/koha-tmpl/intranet-tmpl/prog/img/icon_koha.png b/koha-tmpl/intranet-tmpl/prog/img/icon_koha.png
new file mode 100644 (file)
index 0000000..9de6467
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/img/icon_koha.png differ
diff --git a/koha-tmpl/intranet-tmpl/prog/img/icon_lists.png b/koha-tmpl/intranet-tmpl/prog/img/icon_lists.png
new file mode 100644 (file)
index 0000000..cb7b762
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/img/icon_lists.png differ
diff --git a/koha-tmpl/intranet-tmpl/prog/img/icon_patrons.png b/koha-tmpl/intranet-tmpl/prog/img/icon_patrons.png
new file mode 100644 (file)
index 0000000..d9f6eef
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/img/icon_patrons.png differ
diff --git a/koha-tmpl/intranet-tmpl/prog/img/icon_reports.png b/koha-tmpl/intranet-tmpl/prog/img/icon_reports.png
new file mode 100644 (file)
index 0000000..4d63ca9
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/img/icon_reports.png differ
diff --git a/koha-tmpl/intranet-tmpl/prog/img/icon_search.png b/koha-tmpl/intranet-tmpl/prog/img/icon_search.png
new file mode 100644 (file)
index 0000000..7caf2d8
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/img/icon_search.png differ
diff --git a/koha-tmpl/intranet-tmpl/prog/img/icon_serials.png b/koha-tmpl/intranet-tmpl/prog/img/icon_serials.png
new file mode 100644 (file)
index 0000000..66620fc
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/img/icon_serials.png differ
diff --git a/koha-tmpl/intranet-tmpl/prog/img/icon_tools.png b/koha-tmpl/intranet-tmpl/prog/img/icon_tools.png
new file mode 100644 (file)
index 0000000..4273cc5
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/img/icon_tools.png differ