Bugzilla – Attachment 11462 Details for
Bug 8593
Add unique IDs to pending approval markup on staff client home page
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
edited intranet-main file (box version)
0002-bug-8593-css-file-for-the-box-version-of-suggestions.patch (text/plain), 14.55 KB, created by
Jorgia
on 2012-08-09 04:01:03 UTC
(
hide
)
Description:
edited intranet-main file (box version)
Filename:
MIME Type:
Creator:
Jorgia
Created:
2012-08-09 04:01:03 UTC
Size:
14.55 KB
patch
obsolete
>From c09de6e75753c4e2d0ee79b5d9dc7a2096695e09 Mon Sep 17 00:00:00 2001 >From: Jorgia Kelsey <jorgia_m_kelsey@hotmail.com> >Date: Wed, 8 Aug 2012 21:14:26 +1245 >Subject: [PATCH 2/2] bug 8593: css file for the box version of "suggestions > pending" > >--- > koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css | 19 ++- > koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css~ | 179 ++++++++++++++++++++ > .../prog/en/modules/intranet-main.tt~ | 163 ++++++++++++++++++ > 3 files changed, 355 insertions(+), 6 deletions(-) > create mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css~ > create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt~ > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css b/koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css >index 2c87adb..810fd62 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css >+++ b/koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css >@@ -140,12 +140,19 @@ ul.biglinks-list li a.icon_koha {background-image:url('/intranet-tmpl/prog/img/i > /* ==== PENDING - Start ==== */ > #area-pending { > /* Block containing links to pending tags, comments and suggestions */ >- width: 100%; >- border: solid 1px #b9d8d9; >+ >+} >+#suggestions_pending { >+ /* Block containing links to pending tags, comments and suggestions */ >+ width: 50%; >+ width: 200px; >+ height: 30px; >+ border: solid 2px #b9d8d9; >+ background-color: #F4F8F9; > border-radius: 6px; >- clear: left; >+ clear: right; >+ ; > } >- > .pending-info { > /* For the div containing a "pending" link (useful to preserve width of area-pending box width) */ > margin-top: 2px; >@@ -155,8 +162,8 @@ ul.biglinks-list li a.icon_koha {background-image:url('/intranet-tmpl/prog/img/i > > .pending-number-link { > /* Style for the "pending" links : the number of pending items appear bigger */ >- font-weight: bold; >- font-size: 1.1em; >+ font-weight: italic; >+ font-size: 1.5em; > } > /* ==== PENDING - End ==== */ > >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 >index 0000000..f53c7de >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css~ >@@ -0,0 +1,179 @@ >+/* >+ * 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 >+ * >+ */ >+ >+#doc3 { >+ /* Contains the news + both columns of links + pending box + userblock box */ >+ 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 { >+ border: 1px solid #EEEEEE; >+ border-radius: 6px 6px 6px 6px; >+ margin: 0.2em; >+} >+ >+#area-news h3 { >+ /* Title section for the news block : transparency to let the koha logo appear */ >+ background-color: #EEEEEE; >+ filter:alpha(opacity=70); /* for IE */ >+ -moz-opacity: 0.7; /* for Firefox before 0.9 */ >+ opacity: 0.7; >+ 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; >+ filter:alpha(opacity=75); >+ -moz-opacity: 0.75; >+ opacity: .75; >+ } >+ >+.newsfooter { >+ /* Footer containing the publication date and edition links for an News entry */ >+ font-size: 80%; >+ color: #808080; >+} >+ >+/* ==== NEWS - End ==== */ >+ >+ >+/* ==== MODULE LINKS - Start ==== */ >+ >+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: 83%; >+ max-width : 320px; >+ height: 46px; >+ margin: 0 1em 14px 0; >+ padding-left:57px; >+ 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-position: 5px 3px; >+ background-repeat:no-repeat; >+} >+ >+ul.biglinks-list li a:hover.icon_general { >+ /* Class used for each module link hover state */ >+ background-position:5px -43px; >+ 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 */ >+ >+} >+#suggestions_pending { >+ /* Block containing links to pending tags, comments and suggestions */ >+ >+ ; >+} >+.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: italic; >+ font-size: 1.5em; >+} >+/* ==== 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; >+ >+} >+ >+.user-info { >+ /* For the div containing the information (useful to preserve width of area-userblock box width) */ >+ margin: 8px; >+} >+/* ==== USERBLOCK - End ==== */ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt~ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt~ >new file mode 100644 >index 0000000..e891ae5 >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt~ >@@ -0,0 +1,163 @@ >+[% 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"> </style> >+ >+</head> >+<body id="main_intranet-main" class="main"> >+[% INCLUDE 'header.inc' %] >+[% INCLUDE 'home-search.inc' %] >+ >+<div id="breadcrumbs" >Home</div> >+ >+ >+<div id="doc3" class="yui-t3"> >+ <div id="bd" role="main"> >+ <div id="yui-main"> >+ <div class="yui-b"><div class="yui-g"> >+ <div class="yui-u first"> >+ <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 %] >+ >+ [% IF ( CAN_user_borrowers ) %] >+ <li> >+ <a class="icon_general icon_patrons" href="/cgi-bin/koha/members/members-home.pl">Patrons</a> >+ </li> >+ [% END %] >+ >+ [% IF ( CAN_user_catalogue ) %] >+ <li> >+ <a class="icon_general icon_search" href="/cgi-bin/koha/catalogue/search.pl">Advanced search</a> >+ </li> >+ [% END %] >+ >+ <li> >+ <a class="icon_general icon_lists" href="/cgi-bin/koha/virtualshelves/shelves.pl">Lists</a> >+ </li> >+ >+ [% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items ) %] >+ <li> >+ <a class="icon_general icon_cataloging" href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a> >+ </li> >+ [% END %] >+ >+ [% 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><!-- /yui-u first --> >+ <div class="yui-u"> >+ <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 %] >+ >+ [% 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 --> >+ </div><!-- /yui-u --> >+</div><!-- /yui-g --> >+<div class="yui-g"> >+ [% IF ( ( CAN_user_tools_moderate_comments && pendingcomments ) >+ || ( CAN_user_tools_moderate_tags && pendingtags ) >+ || ( CAN_user_acquisition && pendingsuggestions ) ) %] >+ <div id="area-pending"> >+ [% IF ( CAN_user_acquisition && pendingsuggestions ) %] >+ <div class="pending-info" id="suggestions_pending"> >+ >+ <a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions pending approval</a>: >+ <span class="pending-number-link">[% pendingsuggestions %]</span> >+ </div> >+ [% END %] >+ >+ [% IF ( CAN_user_tools_moderate_comments && pendingcomments ) %] >+ <div class="pending-info"> >+ <a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Comments pending approval</a>: >+ <span class="pending-number-link">[% pendingcomments %]</span> >+ </div> >+ [% END %] >+ >+ [% IF ( CAN_user_tools_moderate_tags && pendingtags ) %] >+ <div class="pending-info"> >+ <a href="/cgi-bin/koha/tags/review.pl">Tags pending approval</a>: >+ <span class="pending-number-link">[% pendingtags %]</span> >+ </div> >+ [% END %] >+ </div> >+ [% END %] >+ >+ >+</div> >+ [% IF ( IntranetmainUserblock ) %] >+ <div class="yui-g" id="area-userblock"> >+ <div class="user-info"> >+ [% IntranetmainUserblock %] >+ </div> >+ </div> >+ [% END %] >+</div> >+ </div> >+ <div class="yui-b"><!-- YOUR NAVIGATION GOES HERE --> >+ [% 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&id=[% koha_new.idnew %]">Edit</a> >+ | <a href="/cgi-bin/koha/tools/koha-news.pl?op=del&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 --> >+ [% END %] >+ </div> >+ </div> >+</div> >+ >+<!-- the main div is closed in intranet-bottom.inc --> >+[% INCLUDE 'intranet-bottom.inc' %] >-- >1.7.9.5 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 8593
:
11436
|
11442
|
11443
|
11462
|
11463
|
11464
|
11466
|
11468
|
11613
|
11616