Attachment 29856 Details for Bug 12597 – Bug 12597 - Give better visual indication of currently-selected language in the staff client

[patch] Bug 12597 - Give better visual indication of currently-selected language in the staff client

Bug-12597---Give-better-visual-indication-of-curre.patch (text/plain), 58.23 KB, created by Owen Leonard on 2014-07-18 15:22:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2014-07-18 15:22:58 UTC

Size: 58.23 KB

patch

obsolete

>From f24cd65523ec0bb9129c77676b6e0ba76770be54 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Thu, 17 Jul 2014 13:04:08 -0400
>Subject: [PATCH] Bug 12597 - Give better visual indication of
> currently-selected language in the staff client
>Content-Type: text/plain; charset="utf-8"
>
>There is currently no visual feedback to the user reflecting which of
>multiple installed translations is currently selected. I think some
>necessary styling didn't make it into the conversion to Bootstrap menus.
>This patch attempts to improve things.
>
>Most of the changes are to bring back the previous style of highlighting
>the currently selected language. A new change is the addition of the
>sub-language code to the display of the menu label if one of that menu
>item's sub-languages is selected.
>
>This patch also removes some obsolete CSS which referred to the old menu
>system.
>
>To test, apply the patch and install or update multiple languages,
>including at least two sub-languages. In my test I used en, en-GB and
>de-DE. Clear your browser cache if necessary. Enable all these languages
>and test the functionality of the language selection menu in the footer.
>
>- Non-enabled languages should appear as non-bold links.
>- When a single language (with no sub-languages) is enabled it should
> appear as bold text.
>- When one of multiple sub-languages is enabled that selection in the
> pop-up menu should appear as bold text. The menu label should show in
> bold the language code of the selected sub-language.
>---
> .../intranet-tmpl/prog/en/css/staff-global.css | 1361 +++++++++-----------
> .../prog/en/includes/intranet-bottom.inc | 31 +-
> 2 files changed, 661 insertions(+), 731 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
>index f7678f0..5c5689e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
>+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
>@@ -29,7 +29,7 @@ a:hover, a:active {
> }
> 
> .yui-button,.yui-button a:link,.yui-button a:visited {
>-	color : #000;
>+ color : #000;
> }
> 
> a.yuimenuitemlabel {
>@@ -38,88 +38,88 @@ a.yuimenuitemlabel {
> 
> .overdue,
> .debit {
>-	color : #cc0000;
>+ color : #cc0000;
> }
> 
> a.popup {
>-	background : transparent url("../../img/pop-up-link.png") center right no-repeat;
>-	padding-right : 15px;
>+ background : transparent url("../../img/pop-up-link.png") center right no-repeat;
>+ padding-right : 15px;
> }
> 
> body {
>-	text-align : left;
>+ text-align : left;
> padding:0 0 4em 0;
> font-family: arial, verdana, helvetica, sans-serif;
> }
> 
> br.clear {
>-	clear : both;
>-	line-height : 1px;
>+ clear : both;
>+ line-height : 1px;
> }
> 
> form {
>-	display : inline;
>+ display : inline;
> }
> 
> form.confirm {
>-	display : block;
>-	text-align : center;
>+ display : block;
>+ text-align : center;
> }
> 
> h1 {
>-	font-size : 161.6%;
>-	font-weight : bold;
>+ font-size : 161.6%;
>+ font-weight : bold;
> }
> 
> h2 {
>-	font-size : 146.5%;
>-	font-weight : bold;
>+ font-size : 146.5%;
>+ font-weight : bold;
> }
> 
> h3 {
>-	font-size : 131%;
>-	font-weight : bold;
>+ font-size : 131%;
>+ font-weight : bold;
> }
> 
> h4 {
>-	font-size : 116%;	
>-	font-weight : bold;
>+ font-size : 116%;
>+ font-weight : bold;
> }
> 
> h5 {
>-	font-size : 100%;	
>-	font-weight : bold;
>+ font-size : 100%;
>+ font-weight : bold;
> }
> 
> h6 {
>-	font-size : 93%;
>-	font-weight : bold;
>+ font-size : 93%;
>+ font-weight : bold;
> }
> 
> h1,h2,h3,h4,h5,h6 {
>-	margin : .3em 0;
>+ margin : .3em 0;
> }
> 
> p {
>-	margin: .5em 0 .5em 0;
>+ margin: .5em 0 .5em 0;
> }
> 
> strong {
>-	font-weight : bold;
>+ font-weight : bold;
> }
> 
> strong em {
>-	font-weight : bold;
>-	font-style : italic;
>+ font-weight : bold;
>+ font-style : italic;
> }
> 
> em, cite {
>-	font-style : italic;
>+ font-style : italic;
> }
> 
> em strong {
>-	font-weight : bold;
>-	font-style : italic;
>+ font-weight : bold;
>+ font-style : italic;
> }
> 
> .subfield-label {
>@@ -131,43 +131,43 @@ em strong {
> }
> 
> #navmenulist li {
>-	padding : .2em 0;
>-	list-style-image : url("../../img/arrow-bullet.gif");
>-	border-bottom : 1px solid #EEE;
>+ padding : .2em 0;
>+ list-style-image : url("../../img/arrow-bullet.gif");
>+ border-bottom : 1px solid #EEE;
> }
> 
> #navmenulist li a {
>-	text-decoration : none;
>+ text-decoration : none;
> }
> 
> #doc, #doc1, #doc2, #doc3 {
>-	padding-top : 1em;
>+ padding-top : 1em;
> }
> 
>-#login_controls	 {
>-	position : absolute;
>-	right : .5em;
>+#login_controls {
>+ position : absolute;
>+ right : .5em;
> padding: .4em .5em;
> }
> 
> ul {
>-	padding-left : 1.1em;
>+ padding-left : 1.1em;
> }
> 
> ul li {
>-	list-style-type : disc;
>+ list-style-type : disc;
> }
> 
> ul li li {
>-	list-style-type : circle;
>+ list-style-type : circle;
> }
> 
> ol {
>-	padding-left : 1.5em;
>+ padding-left : 1.5em;
> }
> 
> ol li {
>-	list-style : decimal;
>+ list-style : decimal;
> }
> 
> .gradient {
>@@ -206,27 +206,27 @@ ol li {
> /* End hide from IE-mac */
> 
> table {
>-	border-collapse : collapse;
>-	border-top : 1px solid #BCBCBC;
>-	border-right : 1px solid #BCBCBC;
>+ border-collapse : collapse;
>+ border-top : 1px solid #BCBCBC;
>+ border-right : 1px solid #BCBCBC;
> }
> 
> table.invis,
> table.invis tr,
> table.invis td,
> tr.highlight table.invis td {
>-	border : none;
>+ border : none;
> }
> 
> td, th {
>-	border-bottom : 1px solid #BCBCBC;
>-	border-left : 1px solid #BCBCBC;
>-	padding : .2em .3em;
>+ border-bottom : 1px solid #BCBCBC;
>+ border-left : 1px solid #BCBCBC;
>+ padding : .2em .3em;
> }
> 
> td {
>-	background-color : White;
>-	vertical-align : top;
>+ background-color : White;
>+ vertical-align : top;
> }
> 
> table.indexes td {
>@@ -240,22 +240,22 @@ td.borderless {
> 
> td.data,
> th.data {
>-	font-family : "Courier New", Courier, monospace;
>-	text-align : right;
>+ font-family : "Courier New", Courier, monospace;
>+ text-align : right;
> }
> 
> th {
>-	background-color : #E8E8E8;
>-	font-weight : bold;
>-	text-align : center;
>+ background-color : #E8E8E8;
>+ font-weight : bold;
>+ text-align : center;
> }
> 
> table+table {
>-	margin-top : 1em;
>+ margin-top : 1em;
> }
> 
> #editions table, #editions td {
>-	border : 0;
>+ border : 0;
> }
> 
> .highlighted-row { background-color: orange !important }
>@@ -264,66 +264,66 @@ tr.highlight td,
> tr.highlight th,
> tr.odd td,
> tr.odd.highlight td {
>-	background-color : #F3F3F3;
>+ background-color : #F3F3F3;
> border : 1px solid #BCBCBC;
> border-right : 1px solid #BCBCBC;
> }
> 
> tr.even td, tr.even.highlight td {
>-	background-color: #FFF;
>+ background-color: #FFF;
> border-right : 1px solid #BCBCBC;
> }
> 
> .overdue td.od {
>-	color : #cc0000;
>-	font-weight : bold;
>+ color : #cc0000;
>+ font-weight : bold;
> }
> 
> tr.warn td {
>-	background-color: #FF9090;
>+ background-color: #FF9090;
> }
> 
> tr.onissue td {
>-	background-color: #FFFFCC;
>+ background-color: #FFFFCC;
> }
> 
> tr.odd.onissue td {
>-	background-color: #FFFFE1;
>+ background-color: #FFFFE1;
> }
> 
> tfoot td {
>-	background-color : #f3f3f3;
>-	font-weight : bold;
>+ background-color : #f3f3f3;
>+ font-weight : bold;
> }
> 
> td.total {
>-	text-align : right;
>+ text-align : right;
> }
> 
> caption {
>-	font-size : 133.9%;
>-	font-weight : bold;
>-	margin : .3em 0;
>+ font-size : 133.9%;
>+ font-weight : bold;
>+ margin : .3em 0;
> }
> 
> span.problem {
>-	background-color : #FFFFCC;
>-	color : #990000;
>-	font-weight : bold;
>-	line-height : 1.7em;
>+ background-color : #FFFFCC;
>+ color : #990000;
>+ font-weight : bold;
>+ line-height : 1.7em;
> }
> 
> fieldset {
>-	margin : 1em 1em 1em 0;
>-	padding : 1em;
>+ 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;
>+ font-size : 123.1%;
>+ font-weight : bold;
> border:2px solid #b9d8d9;
> background-color:#ffffff;
> border-radius:3px;
>@@ -339,7 +339,7 @@ legend {
> }
> 
> #header+#breadcrumbs {
>-	margin-top : 1em;
>+ margin-top : 1em;
> }
> 
> div.justify {
>@@ -347,56 +347,56 @@ div.justify {
> }
> 
> div#header_search {
>-	background-position : .5em .5em;
>-	background-repeat : no-repeat;
>-	float: left;
>-	margin: .3em 0 .5em 0;
>+ background-position : .5em .5em;
>+ background-repeat : no-repeat;
>+ float: left;
>+ margin: .3em 0 .5em 0;
> }
> 
> div#header_search input {
>-	font-size : 1.3em;
>+ font-size : 1.3em;
> }
> 
> div#header_search div.residentsearch {
>-	border : 0;
>+ border : 0;
> border-bottom : 1px solid #85ca11;
>-	padding : 0 0 .2em 0;
>+ padding : 0 0 .2em 0;
> }
> 
> div#reserves,div#checkouts {
> border : 1px solid #B9D8D9;
>-	padding : 1em;
>+ padding : 1em;
> }
> 
> .tip {
>-	font-size: 93%;
>-	color : Gray;
>+ font-size: 93%;
>+ color : Gray;
> }
> 
> .single-line {
>-	white-space: nowrap;
>+ white-space: nowrap;
> }
> 
> .ex {
>-	font-family : "Courier New", Courier, fixed-width;
>-	font-weight : bold;
>+ font-family : "Courier New", Courier, fixed-width;
>+ font-weight : bold;
> }
> 
> 
> div.yui-b h5 {
>-	font-size : 100%;
>-	margin : .5em 0;
>+ font-size : 100%;
>+ margin : .5em 0;
> }
> 
> dt {
>-	font-weight : bold;
>+ font-weight : bold;
> }
> 
> dd {
>-	padding : .2em;
>-	font-size : 90%;
>-	text-indent : 2.5em;
>-	font-weight : normal;
>+ padding : .2em;
>+ font-size : 90%;
>+ text-indent : 2.5em;
>+ font-weight : normal;
> }
> 
> div#toolbar {
>@@ -407,46 +407,46 @@ div#toolbar {
> }
> 
> ul.toolbar {
>-	padding-left : 0;
>+ padding-left : 0;
> }
> 
> ul.toolbar button {
>-	padding-bottom : 2px;
>-	font-family: arial, verdana, helvetica, sans-serif;
>+ padding-bottom : 2px;
>+ font-family: arial, verdana, helvetica, sans-serif;
> }
> 
> a.yuimenuitemlabel-disabled, #disabled a {
>-	color: #999;
>+ color: #999;
> }
> a.yuimenuitemlabel-disabled, #disabled2 a {
> color: #999;
> }
> a.yuimenuitemlabel-disabled:hover, #disabled a:hover {
>-	color : #999;
>+ color : #999;
> }
> a.highlight_toggle {
> display : none;
> }
> 
> ul.toolbar li {
>-	display : inline;
>-	list-style : none;
>+ display : inline;
>+ list-style : none;
> }
> 
> div.patroninfo {
>-	margin-top : -.5em;
>+ margin-top : -.5em;
> }
> 
> *html div.patroninfo {
>-	margin-right : .5em;
>+ margin-right : .5em;
> }
> 
> div.patroninfo h5 {
> border-right:1px solid #b9d8d9;
>-	margin-bottom : 0;
>-	padding-left : -.5em;
>-	padding-top : .3em;
>-	padding-bottom : .5em;
>+ margin-bottom : 0;
>+ padding-left : -.5em;
>+ padding-top : .3em;
>+ padding-bottom : .5em;
> }
> 
> div.patroninfo h5:empty {
>@@ -454,32 +454,32 @@ div.patroninfo h5:empty {
> }
> 
> div.patroninfo ul {
>-	border : 0;
>+ border : 0;
> border-right:1px solid #b9d8d9;
>-	border-bottom : 0;
>-	border-top : 0;
>-	padding : 0;
>-	margin : 0;
>+ border-bottom : 0;
>+ border-top : 0;
>+ padding : 0;
>+ margin : 0;
> }
> 
> div.patroninfo ul li {
>-	margin : 0;
>+ margin : 0;
> }
> 
> div.patroninfo ul li {
>-	list-style-type : none;
>+ list-style-type : none;
> }
> 
> div.patronviews {
>-	border-right : 1px solid #000;
>-	border-top : 1px solid #000;
>-	margin-bottom : .5em;
>-	padding : .5em 0 .5em 0;
>+ border-right : 1px solid #000;
>+ border-top : 1px solid #000;
>+ margin-bottom : .5em;
>+ padding : .5em 0 .5em 0;
> }
> }
> 
> .column-tool {
>-	font-size: 80%;
>+ font-size: 80%;
> }
> 
> fieldset.brief {
>@@ -488,59 +488,59 @@ fieldset.brief {
> 
> fieldset.brief label,
> fieldset.brief span.label {
>-	display : block;
>-	font-weight : bold;
>-	padding : .3em 0;
>+ display : block;
>+ font-weight : bold;
>+ padding : .3em 0;
> }
> 
> fieldset.brief ol, fieldset.brief li {
>-	list-style-type : none;
>+ list-style-type : none;
> }
> 
> .hint {
>-	color : #999999;
>-	font-size : 95%;
>+ color : #999999;
>+ font-size : 95%;
> }
> 
> fieldset.brief div.hint, fieldset.rows div.hint, div.yui-u div.hint {
>-	font-size : 95%;
>-	margin-bottom : .4em;
>+ font-size : 95%;
>+ margin-bottom : .4em;
> }
> 
> div.yui-b fieldset.brief {
>-	padding : .4em .7em;
>+ padding : .4em .7em;
> }
> 
> div.yui-b fieldset.brief ol {
>-	font-size : 85%;
>-	margin : 0;
>-	padding : 0;
>+ font-size : 85%;
>+ margin : 0;
>+ padding : 0;
> }
> 
> div.yui-b fieldset.brief select {
>-	width: 12em;
>+ width: 12em;
> }
> div.yui-b fieldset.brief li.radio {
>-	padding : .7em 0;
>+ padding : .7em 0;
> }
> div.yui-b fieldset.brief li.radio label,
> div.yui-b fieldset.brief li.dateinsert label,
> div.yui-b fieldset.brief li.dateinsert span.label,
> div.yui-b fieldset.brief li.radio span.label {
>-	display : inline;
>+ display : inline;
> }
> 
> div.yui-b fieldset.brief li.radio input {
>-	padding:0.3em 0;
>+ padding:0.3em 0;
> }
> 
> div.yui-b fieldset.brief fieldset {
>-	margin : 0 .3em;
>-	padding : .5em;
>+ margin : 0 .3em;
>+ padding : .5em;
> }
> 
> div.yui-b fieldset.brief fieldset legend {
>-	font-size : 85%;
>+ font-size : 85%;
> }
> 
> fieldset.rows { 
>@@ -561,45 +561,45 @@ fieldset.rows.unselected {
> }
> 
> fieldset.rows legend { 
>-	margin-left: 1em;
>-	font-weight: bold;
>-	font-size : 110%;
>+ margin-left: 1em;
>+ font-weight: bold;
>+ font-size : 110%;
> }
> 
> fieldset.rows label, fieldset.rows span.label { 
>-	float: left; 
>-	font-weight : bold;
>-	width: 6em; 
>-	margin-right: 1em; 
>-	text-align: right;
>+ float: left;
>+ font-weight : bold;
>+ width: 6em;
>+ margin-right: 1em;
>+ text-align: right;
> }
> 
> fieldset.rows fieldset {
> background-color: transparent;
>-	border-width : 1px;
>+ border-width : 1px;
> margin : 1em;
>-	padding : .3em;
>+ padding : .3em;
> }
> 
> .yui-b fieldset.rows label, .yui-b fieldset.rows span.label { 
>-	width: 9em; 
>+ width: 9em;
> }
> 
> .yui-b fieldset.rows div.hint {
>-	margin-left : 10.5em;
>+ margin-left : 10.5em;
> }
> 
> .yui-u fieldset.rows label, .yui-u fieldset.rows span.label { 
>-	width: 10em; 
>+ width: 10em;
> }
> 
> .yui-u fieldset.rows div.hint {
>-	margin-left : 7.5em;
>+ margin-left : 7.5em;
> }
> 
> fieldset.rows.left label, fieldset.rows.left span.label {
>-	width : 8em;
>-	text-align : left;	
>+ width : 8em;
>+ text-align : left;
> }
> 
> fieldset.rows ol { 
>@@ -616,30 +616,30 @@ width: 100%;
> }
> 
> fieldset.rows.left li {
>-	padding-bottom : .4em;
>+ padding-bottom : .4em;
> }
> 
> fieldset.rows li.radio {
>-	padding-left: 9em;
>-	width : auto;
>+ padding-left: 9em;
>+ width : auto;
> }
> 
> fieldset.rows li.radio label {
>-	float : none;
>-	width : auto;
>-	margin : 0 0 0 1em;
>+ float : none;
>+ width : auto;
>+ margin : 0 0 0 1em;
> }
> 
> fieldset.rows ol.radio label {
>-	width : auto;
>-	float : none;
>-	margin-right : 0;
>+ width : auto;
>+ float : none;
>+ margin-right : 0;
> }
> 
> fieldset.rows ol.radio label.radio {
>-	float : left;
>-	width : 12em;
>-	margin-right : 1em;
>+ float : left;
>+ width : 12em;
>+ margin-right : 1em;
> }
> 
> fieldset.rows caption {
>@@ -651,32 +651,32 @@ fieldset.rows p {
> }
> 
> fieldset.rows table {
>-	font-size : 105%;
>-	clear : both;
>-	margin : 1em 0 1em 1em;
>+ font-size : 105%;
>+ clear : both;
>+ margin : 1em 0 1em 1em;
> }
> 
> fieldset.rows td label {
>-	float : none;
>-	font-weight : normal;
>-	width : auto;
>+ float : none;
>+ font-weight : normal;
>+ width : auto;
> }
> 
> fieldset.rows label.yesno {
>-	float : none;
>-	width : auto;
>+ float : none;
>+ width : auto;
> }
> 
> fieldset.rows label.error {
>-	float: none;
>-	margin-left: 1em;
>-	width: auto;
>+ float: none;
>+ margin-left: 1em;
>+ width: auto;
> }
> 
> fieldset.action, div.action {
> background-color: transparent;
>-	clear : both;
>-	float : none;
>+ clear : both;
>+ float : none;
> border : 0px;
> margin: 0;
> padding: .4em .4em .4em .1em;
>@@ -697,11 +697,11 @@ width: 100%;
> 
> 
> div.rows span.label { 
>-	float: left; 
>-	font-weight : bold;
>-	width: 9em; 
>-	margin-right: 1em; 
>-	text-align: left;
>+ float: left;
>+ font-weight : bold;
>+ width: 9em;
>+ margin-right: 1em;
>+ text-align: left;
> }
> 
> div.rows ol { 
>@@ -710,7 +710,7 @@ list-style-type: none;
> }
> 
> div.rows ol li li {
>-	border-bottom: 0;
>+ border-bottom: 0;
> }
> 
> div.rows li {
>@@ -724,33 +724,33 @@ width: 100%;
> }
> 
> a.cancel {
>-	padding-left : 1em;
>+ padding-left : 1em;
> }
> 
> fieldset.rows fieldset.action {
>-	padding : 1em;
>+ padding : 1em;
> }
> 
> fieldset.rows label.inline {
>-	display : inline;
>-	float : none;
>-	margin-left : 1em;
>-	width : auto;
>+ display : inline;
>+ float : none;
>+ margin-left : 1em;
>+ width : auto;
> }
> 
> fieldset.rows .inputnote {
>-	clear : left;
>-	float : left;
>-	margin : .5em 0 0 11em;
>+ clear : left;
>+ float : left;
>+ margin : .5em 0 0 11em;
> }
> 
> .checkedout {
>-	color : #999999;
>-	font-style : italic;
>+ color : #999999;
>+ font-style : italic;
> }
> 
> .subfield_not_filled {
>-	background-color : #FFFF99;
>+ background-color : #FFFF99;
> }
> .content_hidden {
> visibility:hidden; /* you propably don't need to change this one */
>@@ -763,32 +763,32 @@ fieldset.rows .inputnote {
> display:block;
> }
> #new_course a, #newbiblio a, #addchild a, #newentry a, #newshelf a, #newmenuc .first-child, #newsupplier .first-child, #newlabel a, #newtemplate a, #newlabelbatch a, #newpatroncardbatch a, #newprofile a, #newsubscription a, #newdictionary a, #newbasket a, #newrootbudget-button, #budgets_menuc .first-child {
>-	padding-left : 34px;
>-	background-image: url("../../img/toolbar-new.gif");
>-	background-position : center left;
>-	background-repeat : no-repeat;
>+ padding-left : 34px;
>+ background-image: url("../../img/toolbar-new.gif");
>+ background-position : center left;
>+ background-repeat : no-repeat;
> }
> 
> #changepassword a {
>-	padding-left : 34px;
>-	background-image: url("../../img/toolbar-password.gif");
>-	background-position : center left;
>-	background-repeat : no-repeat;
>+ padding-left : 34px;
>+ background-image: url("../../img/toolbar-password.gif");
>+ background-position : center left;
>+ background-repeat : no-repeat;
> }
> 
> #manageorders a {
>-	padding-left : 34px;
>-	background-image: url("../../img/toolbar-orders.gif");
>-	background-position : center left;
>-	background-repeat : no-repeat;
>+ padding-left : 34px;
>+ background-image: url("../../img/toolbar-orders.gif");
>+ background-position : center left;
>+ background-repeat : no-repeat;
> }
> 
> 
> #savemenuc .first-child, #addbiblio .first-child {
>-	padding-left : 34px;
>-	background-image: url("../../img/toolbar-save.gif");
>-	background-position : center left;
>-	background-repeat : no-repeat;
>+ padding-left : 34px;
>+ background-image: url("../../img/toolbar-save.gif");
>+ background-position : center left;
>+ background-repeat : no-repeat;
> }
> 
> #editpatron a,
>@@ -802,72 +802,72 @@ fieldset.rows .inputnote {
> #managelabelbatch a,
> #manageprofile a,
> #periods_menuc .first-child {
>-	padding-left : 34px;
>-	background-image: url("../../img/toolbar-edit.gif");
>-	background-position : center left;
>-	background-repeat : no-repeat;
>+ padding-left : 34px;
>+ background-image: url("../../img/toolbar-edit.gif");
>+ background-position : center left;
>+ background-repeat : no-repeat;
> }
> 
> #duplicate a {
>-	padding-left : 34px;
>-	background-image: url("../../img/toolbar-duplicate.gif");
>-	background-position : center left;
>-	background-repeat : no-repeat;
>+ padding-left : 34px;
>+ background-image: url("../../img/toolbar-duplicate.gif");
>+ background-position : center left;
>+ background-repeat : no-repeat;
> }
> 
> #receive a {
>-	padding-left : 34px;
>-	background-image: url("../../img/toolbar-receive.gif");
>-	background-position : center left;
>-	background-repeat : no-repeat;
>+ padding-left : 34px;
>+ background-image: url("../../img/toolbar-receive.gif");
>+ background-position : center left;
>+ background-repeat : no-repeat;
> }
> 
> #renew a {
>-	padding-left : 34px;
>-	background-image: url("../../img/toolbar-renew.gif");
>-	background-position : center left;
>-	background-repeat : no-repeat;
>+ padding-left : 34px;
>+ background-image: url("../../img/toolbar-renew.gif");
>+ background-position : center left;
>+ background-repeat : no-repeat;
> }
> 
> #deletebiblio button, #deletebiblio a, #deletepatron a, #deleteshelf .first-child, #delete a {
>-	padding-left : 34px;
>-	background-image: url("../../img/toolbar-delete.gif");
>-	background-position : center left;
>-	background-repeat : no-repeat;
>+ padding-left : 34px;
>+ background-image: url("../../img/toolbar-delete.gif");
>+ background-position : center left;
>+ background-repeat : no-repeat;
> }
> 
> #z3950search .first-child {
>-	padding-left : 34px;
>-	background-image: url("../../img/toolbar-search.gif");
>-	background-position : center left;
>-	background-repeat : no-repeat;
>+ padding-left : 34px;
>+ background-image: url("../../img/toolbar-search.gif");
>+ background-position : center left;
>+ background-repeat : no-repeat;
> }
> #z3950searcht table {
>-	/* doesn't have desired effect in catalogue/results.tmpl - I'll leave this here for now but there do seem to be casscading CSS errors in this and other CSS fiels - RICKW 20081118 */
>-	padding: 20px;
>-	border: none;
>+ /* doesn't have desired effect in catalogue/results.tmpl - I'll leave this here for now but there do seem to be casscading CSS errors in this and other CSS fiels - RICKW 20081118 */
>+ padding: 20px;
>+ border: none;
> }
> #printbiblio button, #printbiblio a, #printmenuc .first-child {
>-	padding-left : 34px;
>-	background-image: url("../../img/toolbar-print.gif");
>-	background-position : center left;
>-	background-repeat : no-repeat;
>+ padding-left : 34px;
>+ background-image: url("../../img/toolbar-print.gif");
>+ background-position : center left;
>+ background-repeat : no-repeat;
> }
> 
> #addtoshelf button, #addtoshelf a {
>-	padding-left : 34px;
>-	background-image: url("../../img/toolbar-add-to-shelf.gif");
>-	background-position : center left;
>-	background-repeat : no-repeat;
>+ padding-left : 34px;
>+ background-image: url("../../img/toolbar-add-to-shelf.gif");
>+ background-position : center left;
>+ background-repeat : no-repeat;
> }
> 
> #placehold a,
> #placehold button,
> #holdfor .first-child {
>-	padding-left : 34px;
>-	background-image: url("../../img/toolbar-hold.gif");
>-	background-position : center left;
>-	background-repeat : no-repeat;
>+ padding-left : 34px;
>+ background-image: url("../../img/toolbar-hold.gif");
>+ background-position : center left;
>+ background-repeat : no-repeat;
> }
> 
> #placeholdc #yui-gen13 { border-top : 1px solid #CCCCCC; margin-top : .3em; }
>@@ -875,7 +875,7 @@ fieldset.rows .inputnote {
> #holdfor .first-child { padding-left : 17px; }
> 
> #editmenuc .first-child, #deleteshelf .first-child,#newmenuc .first-child, #addbiblio .first-child, #z3950search .first-child, #printmenuc .first-child, #newsupplier .first-child, #savemenuc .first-child, #budgets_menuc .first-child, #periods_menuc .first-child {
>-	padding-left : 15px;
>+ padding-left : 15px;
> }
> 
> .error,
>@@ -886,85 +886,85 @@ fieldset.rows .inputnote {
> }
> 
> div.error {
>-	border : 2px dashed #990000;
>-	background-color : #FFFF99;
>-	padding : .5em;
>-	margin : 1em;
>+ border : 2px dashed #990000;
>+ background-color : #FFFF99;
>+ padding : .5em;
>+ margin : 1em;
> }
> 
> input.alert {
>-	background-color : #FFFF99;
>-	border-color: #900;
>+ background-color : #FFFF99;
>+ border-color: #900;
> }
> 
> ol.bibliodetails {
>-	float: left;
>-	margin : 0 0 1em 1em;
>+ float: left;
>+ margin : 0 0 1em 1em;
> }
> 
> ol.bibliodetails li {
>-	border-bottom: 1px solid #E8E8E8;
>-	list-style-type : none;
>-	padding : .1em;
>+ border-bottom: 1px solid #E8E8E8;
>+ list-style-type : none;
>+ padding : .1em;
> }
> 
> ol.bibliodetails span.label {
>-	border-right : 1px solid #E8E8E8;
>-	float : left;
>-	font-weight: bold;
>-	width: 12em; 
>-	margin-right: 1em; 
>+ border-right : 1px solid #E8E8E8;
>+ float : left;
>+ font-weight: bold;
>+ width: 12em;
>+ margin-right: 1em;
> }
> 
> div.listgroup {
>-	clear : left;
>+ clear : left;
> }
> 
> div.listgroup h4 {
>-	font-style: italic;
>+ font-style: italic;
> }
> 
> div.listgroup h4 a {
>-	font-size : 80%;
>+ font-size : 80%;
> }
> 
> div.listgroup input {
>-	font-size: 80%;
>+ font-size: 80%;
> }
> 
> div.sysprefs h3 {
>-	margin : .2em 0 .2em .4em;
>+ margin : .2em 0 .2em .4em;
> }
> 
> div.sysprefs dl {
>-	margin-left : 1.5em;
>+ margin-left : 1.5em;
> }
> 
> div.sysprefs div.hint {
>-	width : 25%;
>-	float : right;
>-	padding : .5em;
>-	margin : .7em;
>+ width : 25%;
>+ float : right;
>+ padding : .5em;
>+ margin : .7em;
> }
> 
> tr.highlight td {
>-	background-color : #F6F6F6;
>-	border-color : #BCBCBC;
>+ background-color : #F6F6F6;
>+ border-color : #BCBCBC;
> }
> 
> tr.highlight th[scope=row] {
>-	background-color : #DDDDDD;
>-	border-color : #BCBCBC;
>+ background-color : #DDDDDD;
>+ border-color : #BCBCBC;
> }
> 
> #circ_circulation_issue label {
>-	font-size: 105%;
>-	font-weight : bold;
>+ font-size: 105%;
>+ font-weight : bold;
> }
> 
> #circ_circulation_issue div.hint {
>-	color : #666666;
>-	margin: .2em 0;
>+ color : #666666;
>+ margin: .2em 0;
> }
> 
> .date-select {
>@@ -983,153 +983,153 @@ tr.highlight th[scope=row] {
> }
> 
> tr.expired td {
>-	color : #999999;
>+ color : #999999;
> }
> 
> span.expired {
>-	color : #990000;
>-	font-style : italic;
>+ color : #990000;
>+ font-style : italic;
> }
> 
> div.help {
>-	margin: .9em 0 0 0; 
>+ margin: .9em 0 0 0;
> }
> 
> .blocker {
>-	color : #990000;
>+ color : #990000;
> }
> 
> .circmessage li {
>-	list-style : url(../../img/arrow-bullet.gif);
>-	margin-bottom : .2em;
>+ list-style : url(../../img/arrow-bullet.gif);
>+ margin-bottom : .2em;
> }
> 
> div.circmessage:first-child {
>-	margin-top : 1em;
>+ margin-top : 1em;
> }
> 
> div.circmessage {
>-	padding: 0 .4em .4em .4em;
>-	margin-bottom : .3em;
>+ padding: 0 .4em .4em .4em;
>+ margin-bottom : .3em;
> }
> 
> span.circ-hlt {
>-	color : #cc0000;
>-	font-weight : bold;
>+ color : #cc0000;
>+ font-weight : bold;
> }
> 
> div.first fieldset {
>-	margin-right : 0;
>+ margin-right : 0;
> }
> 
> #circ_needsconfirmation {
>-	margin : auto;
>+ margin : auto;
> }
> 
> .dialog {
>-	-moz-border-radius : 2px;
>-	border-radius : 2px;
>-	padding : .5em;
>-	margin : 1em auto;
>-	text-align : center;
>-	width: 65%;
>+ -moz-border-radius : 2px;
>+ border-radius : 2px;
>+ padding : .5em;
>+ margin : 1em auto;
>+ text-align : center;
>+ width: 65%;
> }
> 
> .dialog table {
>-	margin : .5em auto;
>+ margin : .5em auto;
> }
> 
> .dialog table th {
>-	text-align : right;
>+ text-align : right;
> }
> 
> .dialog table td {
>-	text-align : left;
>+ text-align : left;
> }
> 
> .dialog h2, .dialog h3, .dialog h4 {
>- 	margin : auto;
>-	text-align : center;
>+ margin : auto;
>+ text-align : center;
> }
> 
> .dialog input {
>- 	background-color : #FFF;
>- 	border : 1px solid #bcbcbc;
>-	margin : .4em;
>-	padding : .4em .4em .4em 25px;
>+ background-color : #FFF;
>+ border : 1px solid #bcbcbc;
>+ margin : .4em;
>+ padding : .4em .4em .4em 25px;
> }
> 
> .dialog input[type="submit"] {
>-	background : #FFF none;
>+ background : #FFF none;
> }
> 
> .dialog input.approve, td input.approve {
>- 	background : #FFF url(../../img/approve.gif) no-repeat 4px center;
>-	padding : .4em .4em .4em 25px;	
>+ background : #FFF url(../../img/approve.gif) no-repeat 4px center;
>+ padding : .4em .4em .4em 25px;
> }
> 
> td input.approve {
>-	background-color : #FFC;
>+ background-color : #FFC;
> }
> 
> .dialog input.deny {
>- 	background : #FFF url(../../img/deny.gif) no-repeat 4px center;
>-	padding : .4em .4em .4em 25px;
>+ background : #FFF url(../../img/deny.gif) no-repeat 4px center;
>+ padding : .4em .4em .4em 25px;
> }
> 
> .dialog input.save {
>-	background: #fff url(../../img/toolbar-save.gif) no-repeat 4px center;
>-	color:black;
>-	padding: .4em .4em .4em 34px;
>+ background: #fff url(../../img/toolbar-save.gif) no-repeat 4px center;
>+ color:black;
>+ padding: .4em .4em .4em 34px;
> }
> 
> .dialog input.edit {
>-	background: #fff url(../../img/toolbar-edit.gif) no-repeat 4px center;
>-	color:black;
>-	max-width : 13em;
>-	padding: .4em .4em .4em 34px;
>-	white-space: normal;
>+ background: #fff url(../../img/toolbar-edit.gif) no-repeat 4px center;
>+ color:black;
>+ max-width : 13em;
>+ padding: .4em .4em .4em 34px;
>+ white-space: normal;
> }
> 
> .dialog input.new {
>-	background: #fff url(../../img/toolbar-new.gif) no-repeat 4px center;
>-	color:black;
>-	max-width : 13em;
>-	padding: .4em .4em .4em 34px;
>-	white-space: normal;
>+ background: #fff url(../../img/toolbar-new.gif) no-repeat 4px center;
>+ color:black;
>+ max-width : 13em;
>+ padding: .4em .4em .4em 34px;
>+ white-space: normal;
> }
> 
> .dialog input.print {
>- 	background : #FFF url(../../img/print-confirm.gif) no-repeat 4px center;
>-	padding : .4em .4em .4em 25px;	
>+ background : #FFF url(../../img/print-confirm.gif) no-repeat 4px center;
>+ padding : .4em .4em .4em 25px;
> }
> 
> .dialog input:hover {
>- 	background-color : #ffc;
>+ background-color : #ffc;
> }
> 
> div.dialog {
>-	border: 1px solid #bcbcbc;
>+ border: 1px solid #bcbcbc;
> text-align : center;
> }
> 
> div.alert {
>-	background: #fef8d3; /* Old browsers */
>-	background: -moz-linear-gradient(top, #fef8d3 0%, #ffec91 9%, #ffed87 89%, #f9dc00 100%); /* FF3.6+ */
>-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#fef8d3), color-stop(9%,#ffec91), color-stop(89%,#ffed87), color-stop(100%,#f9dc00)); /* Chrome,Safari4+ */
>-	background: -webkit-linear-gradient(top, #fef8d3 0%,#ffec91 9%,#ffed87 89%,#f9dc00 100%); /* Chrome10+,Safari5.1+ */
>-	background: -o-linear-gradient(top, #fef8d3 0%,#ffec91 9%,#ffed87 89%,#f9dc00 100%); /* Opera11.10+ */
>-	background: -ms-linear-gradient(top, #fef8d3 0%,#ffec91 9%,#ffed87 89%,#f9dc00 100%); /* IE10+ */
>-	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fef8d3', endColorstr='#f9dc00',GradientType=0 ); /* IE6-9 */
>-	background: linear-gradient(top, #fef8d3 0%,#ffec91 9%,#ffed87 89%,#f9dc00 100%); /* W3C */
>-	 text-align : center;
>-	border: 1px solid #E0C726;
>+ background: #fef8d3; /* Old browsers */
>+ background: -moz-linear-gradient(top, #fef8d3 0%, #ffec91 9%, #ffed87 89%, #f9dc00 100%); /* FF3.6+ */
>+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#fef8d3), color-stop(9%,#ffec91), color-stop(89%,#ffed87), color-stop(100%,#f9dc00)); /* Chrome,Safari4+ */
>+ background: -webkit-linear-gradient(top, #fef8d3 0%,#ffec91 9%,#ffed87 89%,#f9dc00 100%); /* Chrome10+,Safari5.1+ */
>+ background: -o-linear-gradient(top, #fef8d3 0%,#ffec91 9%,#ffed87 89%,#f9dc00 100%); /* Opera11.10+ */
>+ background: -ms-linear-gradient(top, #fef8d3 0%,#ffec91 9%,#ffed87 89%,#f9dc00 100%); /* IE10+ */
>+ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fef8d3', endColorstr='#f9dc00',GradientType=0 ); /* IE6-9 */
>+ background: linear-gradient(top, #fef8d3 0%,#ffec91 9%,#ffed87 89%,#f9dc00 100%); /* W3C */
>+ text-align : center;
>+ border: 1px solid #E0C726;
> color : inherit;
> text-shadow : none;
> }
> 
> div.alert strong {
>-	color : #900;
>+ color : #900;
> }
> 
> .dialog li {
>@@ -1147,70 +1147,70 @@ a.clone-field {
> }
> 
> a.document {
>-	background-position : left middle;
>-	background-repeat : no-repeat;
>-	padding-left : 20px;
>+ background-position : left middle;
>+ background-repeat : no-repeat;
>+ padding-left : 20px;
> }
> 
> a.pdf {
>-	background-image : url("../../img/famfamfam/silk/page_white_acrobat.png");
>+ background-image : url("../../img/famfamfam/silk/page_white_acrobat.png");
> }
> 
> a.csv {
>-	background-image : url("../../img/famfamfam/silk/page_white_excel.png");
>+ background-image : url("../../img/famfamfam/silk/page_white_excel.png");
> }
> 
> a.xml {
>-	background-image : url("../../img/famfamfam/silk/page_white_code.png");
>+ background-image : url("../../img/famfamfam/silk/page_white_code.png");
> }
> 
> div.message {
>-	background: #ffffff; /* Old browsers */
>-	background: -moz-linear-gradient(top, #ffffff 0%, #f4f6fa 2%, #eaeef5 23%, #e8edf6 94%, #cddbf2 100%); /* FF3.6+ */
>-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(2%,#f4f6fa), color-stop(23%,#eaeef5), color-stop(94%,#e8edf6), color-stop(100%,#cddbf2)); /* Chrome,Safari4+ */
>-	background: -webkit-linear-gradient(top, #ffffff 0%,#f4f6fa 2%,#eaeef5 23%,#e8edf6 94%,#cddbf2 100%); /* Chrome10+,Safari5.1+ */
>-	background: -o-linear-gradient(top, #ffffff 0%,#f4f6fa 2%,#eaeef5 23%,#e8edf6 94%,#cddbf2 100%); /* Opera11.10+ */
>-	background: -ms-linear-gradient(top, #ffffff 0%,#f4f6fa 2%,#eaeef5 23%,#e8edf6 94%,#cddbf2 100%); /* IE10+ */
>+ background: #ffffff; /* Old browsers */
>+ background: -moz-linear-gradient(top, #ffffff 0%, #f4f6fa 2%, #eaeef5 23%, #e8edf6 94%, #cddbf2 100%); /* FF3.6+ */
>+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(2%,#f4f6fa), color-stop(23%,#eaeef5), color-stop(94%,#e8edf6), color-stop(100%,#cddbf2)); /* Chrome,Safari4+ */
>+ background: -webkit-linear-gradient(top, #ffffff 0%,#f4f6fa 2%,#eaeef5 23%,#e8edf6 94%,#cddbf2 100%); /* Chrome10+,Safari5.1+ */
>+ background: -o-linear-gradient(top, #ffffff 0%,#f4f6fa 2%,#eaeef5 23%,#e8edf6 94%,#cddbf2 100%); /* Opera11.10+ */
>+ background: -ms-linear-gradient(top, #ffffff 0%,#f4f6fa 2%,#eaeef5 23%,#e8edf6 94%,#cddbf2 100%); /* IE10+ */
> filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eaeef5', endColorstr='#cddbf2',GradientType=0 ); /* IE6-9 */
>-	background: linear-gradient(top, #ffffff 0%,#f4f6fa 2%,#eaeef5 23%,#e8edf6 94%,#cddbf2 100%); /* W3C */
>- 	border : 1px solid #bcbcbc;
>- 	text-align: center;
>-	width : 55%;
>+ background: linear-gradient(top, #ffffff 0%,#f4f6fa 2%,#eaeef5 23%,#e8edf6 94%,#cddbf2 100%); /* W3C */
>+ border : 1px solid #bcbcbc;
>+ text-align: center;
>+ width : 55%;
> }
> 
> div.message ul,
> div.message h5 {
>-	padding-left : 25%;
>-	text-align : left;
>+ padding-left : 25%;
>+ text-align : left;
> }
> 
> div.message ul+h4 {
>-	margin-top : .7em;
>+ margin-top : .7em;
> }
> 
> div.note {
>-	background: #f4f6fa;
>-	background-repeat : no-repeat;
>-	background-position : left center;
>-	background-image : url("../../img/note.png");
>-	background-image: url("../../img/note.png"), -moz-linear-gradient(top, #f4f6fa 0%, #e8edf6 100%); /* FF3.6+ */
>-	background-image: url("../../img/note.png"), -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f4f6fa), color-stop(100%,#e8edf6)); /* Chrome,Safari4+ */
>-	background-image: url("../../img/note.png"), -webkit-linear-gradient(top, #f4f6fa 0%,#e8edf6 100%); /* Chrome10+,Safari5.1+ */
>-	background-image: url("../../img/note.png"), -o-linear-gradient(top, #f4f6fa 0%,#e8edf6 100%); /* Opera11.10+ */
>-	background-image: url("../../img/note.png"), -ms-linear-gradient(top, #f4f6fa 0%,#e8edf6 100%); /* IE10+ */
>-	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f4f6fa', endColorstr='#e8edf6',GradientType=0 ); /* IE6-9 */
>-	background-image: url("../../img/note.png"), linear-gradient(top, #f4f6fa 0%,#e8edf6 100%); /* W3C */
>-	border : 1px solid #BCBCBC;
>-	padding : .5em .5em .5em 20px;
>-	margin : .5em 0;
>+ background: #f4f6fa;
>+ background-repeat : no-repeat;
>+ background-position : left center;
>+ background-image : url("../../img/note.png");
>+ background-image: url("../../img/note.png"), -moz-linear-gradient(top, #f4f6fa 0%, #e8edf6 100%); /* FF3.6+ */
>+ background-image: url("../../img/note.png"), -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f4f6fa), color-stop(100%,#e8edf6)); /* Chrome,Safari4+ */
>+ background-image: url("../../img/note.png"), -webkit-linear-gradient(top, #f4f6fa 0%,#e8edf6 100%); /* Chrome10+,Safari5.1+ */
>+ background-image: url("../../img/note.png"), -o-linear-gradient(top, #f4f6fa 0%,#e8edf6 100%); /* Opera11.10+ */
>+ background-image: url("../../img/note.png"), -ms-linear-gradient(top, #f4f6fa 0%,#e8edf6 100%); /* IE10+ */
>+ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f4f6fa', endColorstr='#e8edf6',GradientType=0 ); /* IE6-9 */
>+ background-image: url("../../img/note.png"), linear-gradient(top, #f4f6fa 0%,#e8edf6 100%); /* W3C */
>+ border : 1px solid #BCBCBC;
>+ padding : .5em .5em .5em 20px;
>+ margin : .5em 0;
> }
> 
> div.results {
>- 	padding : .7em 0;
>+ padding : .7em 0;
> }
> 
> .accesskey {
>- 	text-decoration : underline;
>+ text-decoration : underline;
> }
> 
> label.required,
>@@ -1219,8 +1219,8 @@ span.required {
> }
> 
> span.required {
>-	font-style : italic;
>-	margin-left : .5em;
>+ font-style : italic;
>+ margin-left : .5em;
> }
> 
> .missing{
>@@ -1229,11 +1229,11 @@ span.required {
> 
> .term {
> background-color: #FFC;
>-	 color : #990000;
>+ color : #990000;
> }
> 
> a .term {
>-	 text-decoration : underline;
>+ text-decoration : underline;
> }
> 
> /* style for shelving location in catalogsearch */
>@@ -1243,23 +1243,23 @@ a .term {
> }
> 
> a:hover .term {
>-	color : #FF9090;
>+ color : #FF9090;
> }
> 
> div#menu {
> border-right:1px solid #b9d8d9;
>-	margin-right: .5em;
>-	padding-top: 1em;
>-	padding-bottom: 2em;
>+ margin-right: .5em;
>+ padding-top: 1em;
>+ padding-bottom: 2em;
> }
> 
> *html #menu li {
>-	display : inline;
>+ display : inline;
> }
> 
> div#menu li a {
>-	text-decoration: none;
>-	display: block;
>+ text-decoration: none;
>+ display: block;
> 
> background: #e8f0f6; /* Old browsers */
> background: -moz-linear-gradient(left, #e8f0f6 0%, #e8f0f6 96%, #c1c1c1 100%); /* FF3.6+ */
>@@ -1268,15 +1268,15 @@ div#menu li a {
> background: -o-linear-gradient(left, #e8f0f6 0%,#e8f0f6 96%,#c1c1c1 100%); /* Opera11.10+ */
> background: -ms-linear-gradient(left, #e8f0f6 0%,#e8f0f6 96%,#c1c1c1 100%); /* IE10+ */
> background: linear-gradient(left, #e8f0f6 0%,#e8f0f6 96%,#c1c1c1 100%); /* W3C */
>-	-moz-border-top-left-radius: 5px;
>-	border-top-left-radius: 5px;
>-	-moz-border-bottom-left-radius: 5px;
>-	border-bottom-left-radius: 5px;
>+ -moz-border-top-left-radius: 5px;
>+ border-top-left-radius: 5px;
>+ -moz-border-bottom-left-radius: 5px;
>+ border-bottom-left-radius: 5px;
> border:1px solid #b9d8d9;
>-	font-size: 111%;
>-	margin: .5em 0;
>-	padding: .4em .3em;
>-	margin-right : -1px;
>+ font-size: 111%;
>+ margin: .5em 0;
>+ padding: .4em .3em;
>+ margin-right : -1px;
> }
> 
> div#menu li a:hover {
>@@ -1293,18 +1293,18 @@ div#menu li a:hover {
> }
> 
> div#menu li.active a:hover {
>-	background-color: #fff;
>+ background-color: #fff;
> color : #538200;
> }
> 
> #menu ul li {
>-	list-style-type: none;
>+ list-style-type: none;
> }
> 
> #menu ul li.active a {
>-	background-color: #FFF;
>-	background-image : none;
>-	font-weight: bold;
>+ background-color: #FFF;
>+ background-image : none;
>+ font-weight: bold;
> color:#000000;
> border-left: 1px solid #85CA11;
> border-top: 1px solid #85CA11;
>@@ -1313,69 +1313,69 @@ div#menu li.active a:hover {
> }
> 
> h1#logo {
>-	border:0pt none;
>-	float:left !important;
>-	margin:0;
>-	padding:0;
>-	width:180px;
>+ border:0pt none;
>+ float:left !important;
>+ margin:0;
>+ padding:0;
>+ width:180px;
> }
> h1#logo {
>-	background:transparent url(../../img/koha-logo-medium.gif) no-repeat scroll 0%;
>-	margin:0.75em .3em 0.75em .7em;
>+ background:transparent url(../../img/koha-logo-medium.gif) no-repeat scroll 0%;
>+ margin:0.75em .3em 0.75em .7em;
> }
> 
> *html h1#logo {
>-	margin : 0.75em .3em 0.75em .3em;
>+ margin : 0.75em .3em 0.75em .3em;
> }
> 
> h1#logo a {
>-	border:0;
>-	cursor:pointer;
>-	display:block;
>-	height:0px !important;
>-	margin:0;
>-	overflow:hidden;
>-	padding:44px 0 0;
>-	text-decoration:none;
>-	width:180px;
>+ border:0;
>+ cursor:pointer;
>+ display:block;
>+ height:0px !important;
>+ margin:0;
>+ overflow:hidden;
>+ padding:44px 0 0;
>+ text-decoration:none;
>+ width:180px;
> }
> 
> #closewindow {
>-	margin-top : 2em;
>-	text-align : center;
>+ margin-top : 2em;
>+ text-align : center;
> }
> 
> #closewindow a {
>-	font-weight : bold;	
>+ font-weight : bold;
> }
> 
> .patroninfo+#menu {
>-	margin-right : 0;
>+ margin-right : 0;
> }
> 
> .barcode {
>-	font-size : 200%;
>+ font-size : 200%;
> }
> 
> li.email a {
>-	display:block;
>-	overflow:hidden;
>-	width:13em;
>+ display:block;
>+ overflow:hidden;
>+ width:13em;
> }
> li.email {
>-	background: #FFF url(../../img/elipsis.gif) right bottom no-repeat;
>-	font-size : 87%;
>-	overflow:hidden;
>-	padding :0 10px 0 0;
>-	width:13em;
>+ background: #FFF url(../../img/elipsis.gif) right bottom no-repeat;
>+ font-size : 87%;
>+ overflow:hidden;
>+ padding :0 10px 0 0;
>+ width:13em;
> }
> 
> .empty {
>-	color : #CCC;
>+ color : #CCC;
> }
> 
> .address {
>-	font-size: 110%;
>+ font-size: 110%;
> }
> 
> .clearfix:after {
>@@ -1391,19 +1391,19 @@ li.email {
> /* End hide from IE-mac */
> 
> .title {
>-	font-weight : bold;
>-	font-size : 105%;
>+ font-weight : bold;
>+ font-size : 105%;
> }
> 
> .hold {
>-	float : right;
>-	font-size: 90%;
>-	margin: 0;
>+ float : right;
>+ font-size: 90%;
>+ margin: 0;
> }
> 
> .thumbnail {
>-	display : block;
>-	margin : auto;
>+ display : block;
>+ margin : auto;
> }
> 
> .thumbnails > li {
>@@ -1411,40 +1411,40 @@ li.email {
> }
> 
> #searchresults ul li {
>-	font-size : 90%;
>-	list-style : url(../../img/item-bullet.gif);
>-	padding : .2em 0;
>+ font-size : 90%;
>+ list-style : url(../../img/item-bullet.gif);
>+ padding : .2em 0;
> clear : left;
> }
> 
> #searchresults span.status {
>-	clear : left;
>-	color : #900;
>-	display : block;
>+ clear : left;
>+ color : #900;
>+ display : block;
> }
> 
> #searchresults span.unavailable {
>-	clear : left;
>-	display : block;
>+ clear : left;
>+ display : block;
> }
> 
> #searchresults .availability strong {
>-	display : block;
>+ display : block;
> }
> 
> #searchresults ul li img {
>-	float : left;
>-	margin : 3px 5px 3px -5px;
>+ float : left;
>+ margin : 3px 5px 3px -5px;
> }
> 
> #searchresults table td {
>-	vertical-align : top;
>+ vertical-align : top;
> }
> 
> #searchheader {
> background-color : #E6F0F2;
>-	font-size : 80%;
>-	margin : 0 0 .5em -1px;
>+ font-size : 80%;
>+ margin : 0 0 .5em -1px;
> padding : .4em 0 .4em 1em;
> border-radius : 5px 5px 0 0;
> border : 1px solid #B9D8D9;
>@@ -1455,30 +1455,30 @@ li.email {
> }
> 
> #searchheader form {
>-	float : right;
>+ float : right;
> padding : 5px 5px 3px 0;
> }
> 
> #searchheader form.fz3950 {
>-	float : right;
>-	font-size : 125%;
>-	padding : 0 0 0 5em;
>+ float : right;
>+ font-size : 125%;
>+ padding : 0 0 0 5em;
> }
> 
> #searchheader form.fz3950bigrpad {
>-	float : right;
>-	font-size : 125%;
>-	padding : 5px 25em 0 0;
>+ float : right;
>+ font-size : 125%;
>+ padding : 5px 25em 0 0;
> }
> 
> #searchheader .yui-button button,
> #searchheader .yui-button a {
>-	line-height : 1.5em;
>+ line-height : 1.5em;
> }
> 
> #search-facets ul {
>-	margin : 0;
>-	padding : .3em;
>+ margin : 0;
>+ padding : .3em;
> }
> 
> #search-facets {
>@@ -1490,27 +1490,27 @@ li.email {
> background-color : #E6F0F2;
> border-bottom : 1px solid #B9D8D9;
> border-radius: 5px 5px 0 0;
>-	font-size : 90%;
>-	margin : 0;
>-	padding : .4em .2em;
>-	text-align : center;
>+ font-size : 90%;
>+ margin : 0;
>+ padding : .4em .2em;
>+ text-align : center;
> }
> 
> #search-facets ul li {
>-	font-weight : bold;
>-	list-style-type : none;
>+ font-weight : bold;
>+ list-style-type : none;
> }
> 
> #search-facets li li {
>-	font-weight : normal;
>-	font-size : 85%;
>-	margin-bottom : 2px;
>-	padding : .1em .2em;
>+ font-weight : normal;
>+ font-size : 85%;
>+ margin-bottom : 2px;
>+ padding : .1em .2em;
> }
> 
> #search-facets li.showmore {
>-	font-weight : bold;
>-	text-indent : 1em;
>+ font-weight : bold;
>+ text-indent : 1em;
> }
> 
> .facet-count {
>@@ -1518,79 +1518,79 @@ li.email {
> }
> 
> div.pages {
>-	margin : .5em 0;
>+ margin : .5em 0;
> }
> 
> div.pages a {
>-	font-weight: bold;
>-	padding: 1px 5px 1px 5px;
>-	text-decoration: none;
>+ font-weight: bold;
>+ padding: 1px 5px 1px 5px;
>+ text-decoration: none;
> }
> 
> div.pages a:link,
> div.pages a:visited {
>-	background-color : #eeeeee;
>-	color : #3366CC;
>+ background-color : #eeeeee;
>+ color : #3366CC;
> }
> 
> div.pages a:hover {
>-	background-color : #FFC;
>+ background-color : #FFC;
> }
> 
> div.pages a:active {
>-	background-color : #ffc;
>+ background-color : #ffc;
> }
> 
> div.pages .current,
> div.pages .currentPage {
>-	background-color : #e6fcb7;
>-	color : #666;
>-	font-weight: bold;
>-	padding: 1px 5px 1px 5px;
>+ background-color : #e6fcb7;
>+ color : #666;
>+ font-weight: bold;
>+ padding: 1px 5px 1px 5px;
> }
> 
> div.pages .inactive {
>-	background-color : #f3f3f3;
>-	color : #BCBCBC;
>-	font-weight: bold;
>-	padding: 1px 5px 1px 5px;
>+ background-color : #f3f3f3;
>+ color : #BCBCBC;
>+ font-weight: bold;
>+ padding: 1px 5px 1px 5px;
> }
> 
> div.browse {
>-	margin : .5em 0;
>+ margin : .5em 0;
> }
> 
> div#bookcoverimg {
>-	text-align : center;
>+ text-align : center;
> }
> 
> div#header_search input.submit {
>-	font-size : 1em;
>+ font-size : 1em;
> }
> 
> *html input.submit {
>-	padding : .1em;
>+ padding : .1em;
> }
> 
> input[type=submit]:active, input[type=button]:active, button.submit:active, a.submit:active {
>-	border : 1px inset #999999;
>+ border : 1px inset #999999;
> }
> 
> input[type=submit], input[type=reset], input[type=button], input.submit, button.submit, a.submit {
>-	border: 1px outset #999999;
>-	border-top-color: #666;
>-	border-left-color: #666;
>-	-moz-border-radius : 2px;
>-	padding: 0.25em;
>-	background: #ffffff; /* Old browsers */
>-	background: -moz-linear-gradient(top, #ffffff 0%, #f7f7f7 35%, #e0e0e0 100%); /* FF3.6+ */
>-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(35%,#f7f7f7), color-stop(100%,#e0e0e0)); /* Chrome,Safari4+ */
>-	background: -webkit-linear-gradient(top, #ffffff 0%,#f7f7f7 35%,#e0e0e0 100%); /* Chrome10+,Safari5.1+ */
>-	background: -o-linear-gradient(top, #ffffff 0%,#f7f7f7 35%,#e0e0e0 100%); /* Opera11.10+ */
>-	background: -ms-linear-gradient(top, #ffffff 0%,#f7f7f7 35%,#e0e0e0 100%); /* IE10+ */
>-	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#e0e0e0',GradientType=0 ); /* IE6-9 */
>-	background: linear-gradient(top, #ffffff 0%,#f7f7f7 35%,#e0e0e0 100%); /* W3C */
>-	color: #333333;
>+ border: 1px outset #999999;
>+ border-top-color: #666;
>+ border-left-color: #666;
>+ -moz-border-radius : 2px;
>+ padding: 0.25em;
>+ background: #ffffff; /* Old browsers */
>+ background: -moz-linear-gradient(top, #ffffff 0%, #f7f7f7 35%, #e0e0e0 100%); /* FF3.6+ */
>+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(35%,#f7f7f7), color-stop(100%,#e0e0e0)); /* Chrome,Safari4+ */
>+ background: -webkit-linear-gradient(top, #ffffff 0%,#f7f7f7 35%,#e0e0e0 100%); /* Chrome10+,Safari5.1+ */
>+ background: -o-linear-gradient(top, #ffffff 0%,#f7f7f7 35%,#e0e0e0 100%); /* Opera11.10+ */
>+ background: -ms-linear-gradient(top, #ffffff 0%,#f7f7f7 35%,#e0e0e0 100%); /* IE10+ */
>+ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#e0e0e0',GradientType=0 ); /* IE6-9 */
>+ background: linear-gradient(top, #ffffff 0%,#f7f7f7 35%,#e0e0e0 100%); /* W3C */
>+ color: #333333;
> }
> 
> input[type=submit]:disabled,
>@@ -1605,7 +1605,7 @@ a.submit:disabled {
> }
> 
> input[type=reset]:active, input[type=button]:active, input.submit:active, button.submit:active, a.submit:active {
>-	border : 1px inset #999999;
>+ border : 1px inset #999999;
> }
> 
> a.submit {
>@@ -1613,155 +1613,39 @@ a.submit {
> }
> 
> ul li input.submit {
>-	font-size : 87%;
>-	padding : 2px;
>+ font-size : 87%;
>+ padding : 2px;
> }
> 
> input.warning {
> background : #FFF url(../../img/famfamfam/silk/error.png) no-repeat 4px center;
>-	padding : 0.25em 0.25em 0.25em 25px;
>+ padding : 0.25em 0.25em 0.25em 25px;
> }
> 
> .searchhighlightblob {
> font-size:75%;
>-	font-style : italic;
>+ font-style : italic;
> }
> 
> a.yuimenuitemlabel:hover {
>-	background-color : #B3D4FF;
>-	color : #000;
>+ background-color : #B3D4FF;
>+ color : #000;
> }
>-		
>+
> #displayexample {
>-	padding: 5px; 
>-	margin-bottom: 10px;
>-	background-color: #CCCCCC;
>+ padding: 5px;
>+ margin-bottom: 10px;
>+ background-color: #CCCCCC;
> }
> 
> #irregularity_summary {
>-	vertical-align : top;
>+ vertical-align : top;
> }
> 
> ul#toplevelmenu {
> padding : 0;
> }
> 
>-/*#toplevelnav {
>-	float : left;
>-	margin-left : .5em;
>- width: 40%;
>-}
>-
>-ul#toplevelmenu li {
>-	display: inline;
>-	padding : 0 .6em;
>-}
>-		
>-ul#toplevelmenu li.more a {
>-	background-image:url(../../img/more-arrow.gif);
>-	background-position:right center;
>-	background-repeat:no-repeat;
>-	padding-right:13px;
>-}
>-		
>-ul#toplevelmenu li.more ul li a {
>-	background-image : none;
>-	padding-right : 20px;
>-}
>-
>-ul#toplevelmenu li.more ul li a.yuimenuitemlabel {
>-	padding: .2em 20px .2em 20px;
>-}
>-		
>-ul#toplevelmenu li a {
>-	text-decoration : none;
>-}
>-ul#toplevelmenu li ul li {
>-	display :block;
>-	padding :0;
>-}
>-ul#toplevelmenu li ul li a {
>-	text-decoration : none;
>-}
>-
>-ul#i18nMenu {
>- 	margin : 0;
>-	padding : .2em 0;
>- }
>- 
>-ul#i18nMenu li {
>- 	border-left : 1px solid #CCC;
>- 	display : inline;
>-	float: left;
>-	list-style : none;
>-	padding : 0 10px;
>-}
>-
>-ul#i18nMenu li.yuimenuitem {
>-	float: none;
>-}
>-
>-ul#i18nMenu li:first-child {
>- 	border-left : 0;
>- }
>- 
>-ul#i18nMenu li ul li {
>- 	border : 0;
>- 	display : block;
>-	padding : 0;
>- }
>- 
>-ul#i18nMenu li.more a {
>-	background-image:url(../../img/more-up-arrow.gif);
>-	background-position:right center;
>-	background-repeat:no-repeat;
>-	padding-right:13px;
>-}
>-		
>-ul#i18nMenu li.more ul li a {
>-	background-image : none;
>-	padding-right : 20px;
>-}
>-
>-div.lang {
>- float:left;
>-}
>- 
>- div#changelanguage{
>-	background-color: #fff;
>-	border-top: 1px solid #CCC;
>- position:absolute;
>- bottom:0;
>- left:0;
>- width:100%;
>- height: 2em;
>- }
>- 
>- @media screen{
>- body>div#changelanguage {
>- position: fixed;
>- }
>- }
>- 
>- * html body{
>- overflow:hidden;
>- } 
>- 
>- * html div#doc1{
>- height:100%;
>- overflow:auto;
>- }
>- 
>- * html div#doc2{
>- height:100%;
>- overflow:auto;
>- }
>- 
>- * html div#doc3{
>- height:100%;
>- overflow:auto;
>- }*/
>-
> table > caption span.actions {
> font-size: 66%;
> font-weight : normal;
>@@ -1769,91 +1653,91 @@ table > caption span.actions {
> }
> 
> #CheckAll, #CheckNone, #CheckPending {
>-	font-weight : normal;
>-	margin : 0 .5em 0 0;
>+ font-weight : normal;
>+ margin : 0 .5em 0 0;
> }
> .lost,.dmg,.wdn {
>-	display : block;
>-	color : #990000;
>+ display : block;
>+ color : #990000;
> }
> .datedue {
>-	display : block;
>-	color : #999;
>-	font-style : italic;
>+ display : block;
>+ color : #999;
>+ font-style : italic;
> }
> 
> tr.reserved td {
>-	background-color : #eeffd4;
>+ background-color : #eeffd4;
> }
> tr.transfered td {
>-	background-color : #e8f0f6;
>+ background-color : #e8f0f6;
> }
> .waitinghere,
> .credit {
>-	color : #669900;
>+ color : #669900;
> }
> 
> /* Permissions Labels */
> label.permissioncode:before {
>-	content: "(";
>+ content: "(";
> }
> label.permissioncode:after {
>-	content: ")";
>+ content: ")";
> }
> label.permissioncode {
>-	font-style : italic;
>+ font-style : italic;
> }
> span.permissiondesc {
>-	font-weight : normal;
>+ font-weight : normal;
> }
> #mainuserblock {
>-	border : 1px solid #E8E8E8;
>-	margin-top : .5em;
>-	padding : .5em;
>+ border : 1px solid #E8E8E8;
>+ margin-top : .5em;
>+ padding : .5em;
> }
> 
> .labeledmarc-table {
>-	border: 0;
>+ border: 0;
> }
> 
> .labeledmarc-label {
>-	border: 0;
>-	padding: 5;
>-	font-size: 11pt;
>+ border: 0;
>+ padding: 5;
>+ font-size: 11pt;
> color: #000000;
> font-style: italic;
> }
> 
> .labeledmarc-value {
>-	border: 0;
>-	padding: 5;
>-	font-size: 10pt;
>-	color: black;
>+ border: 0;
>+ padding: 5;
>+ font-size: 10pt;
>+ color: black;
> }
> 
> #cartDetails {
>-	background-color : #FFF;
>-	border: 1px solid #739acf;
>-	 -moz-box-shadow: 1px 1px 3px 0 #666;
>-	 -webkit-box-shadow: 1px 1px 3px 0 #666;
>-	 box-shadow: 1px 1px 3px 0 #666;
>-	color : black;
>-	display : none;
>-	margin : 0;
>-	padding : 10px;
>-	text-align : center;
>-	width : 180px;
>-	z-index : 50;
>+ background-color : #FFF;
>+ border: 1px solid #739acf;
>+ -moz-box-shadow: 1px 1px 3px 0 #666;
>+ -webkit-box-shadow: 1px 1px 3px 0 #666;
>+ box-shadow: 1px 1px 3px 0 #666;
>+ color : black;
>+ display : none;
>+ margin : 0;
>+ padding : 10px;
>+ text-align : center;
>+ width : 180px;
>+ z-index : 50;
> }
> #cartmenulink {
> background: transparent url("../../img/cart-small.gif") left center no-repeat;
> padding-left : 15px;
> }
> #cartmenulink span#basketcount span {
>-	display : inline;
>-	font-size : 90%;
>-	font-weight : normal;
>-	padding : 0;
>+ display : inline;
>+ font-size : 90%;
>+ font-weight : normal;
>+ padding : 0;
> }
> #moremenu {
> display : none;
>@@ -1893,19 +1777,19 @@ ul.budget_hierarchy li:first-child:after {
> }
> .holdcount { font-size : 105%; line-height : 200%; }
> .holdcount a {
>-	border : 1px solid #a4bedd;
>-	background-color : #e4ecf5;
>-	font-weight : bold;
>-	-moz-border-radius: 4px;
>-	border-radius: 4px;
>-	padding : .1em .4em;
>-	text-decoration : none;
>+ border : 1px solid #a4bedd;
>+ background-color : #e4ecf5;
>+ font-weight : bold;
>+ -moz-border-radius: 4px;
>+ border-radius: 4px;
>+ padding : .1em .4em;
>+ text-decoration : none;
> }
> .holdcount a:hover { background-color : #ebeff7; }
> .container {
>-	border : 1px solid #EEE;
>-	padding : 1em;
>-	margin : 1em 0;
>+ border : 1px solid #EEE;
>+ padding : 1em;
>+ margin : 1em 0;
> }
> fieldset.rows+h3 {clear:both;padding-top:.5em;}
> 
>@@ -2008,32 +1892,32 @@ fieldset.rows+h3 {clear:both;padding-top:.5em;}
> }
> 
> div.pager {
>-	background-color : #E8E8E8;
>-	border : 1px solid #BCBCBC;
>-	-moz-border-radius : 5px;
>+ background-color : #E8E8E8;
>+ border : 1px solid #BCBCBC;
>+ -moz-border-radius : 5px;
> border-radius : 5px;
>-	display : inline-block;
>-	font-size : 85%;
>-	padding : .3em .5em .3em .5em;
>-	margin : .4em 0;
>+ display : inline-block;
>+ font-size : 85%;
>+ padding : .3em .5em .3em .5em;
>+ margin : .4em 0;
> }
> div.pager img {
>-	vertical-align : middle;
>+ vertical-align : middle;
> }
> 
> div.pager img.last {
>-	padding-right: 5px;
>+ padding-right: 5px;
> }
> div.pager input.pagedisplay {
>-	border : 0;
>-	background-color : transparent;
>-	font-weight: bold;
>-	text-align : center;
>+ border : 0;
>+ background-color : transparent;
>+ font-weight: bold;
>+ text-align : center;
> }
> a.localimage img {
>-	border : 1px solid #0000CC;
>-	margin : 0 .5em;
>-	padding : .3em;
>+ border : 1px solid #0000CC;
>+ margin : 0 .5em;
>+ padding : .3em;
> }
> 
> .no-image {
>@@ -2049,7 +1933,7 @@ a.localimage img {
> }
> 
> div.pager p {
>-	margin: 0;
>+ margin: 0;
> }
> 
> div#acqui_order_supplierlist > div.supplier {
>@@ -2760,3 +2644,36 @@ span.browse-button {
> font-size:0.8em;
> padding:0.5em;
> }
>+
>+#i18nMenu .navbar-text .currentlanguage {
>+ color : #000;
>+ font-weight: bold;
>+}
>+
>+#i18nMenu a.currentlanguage:link,
>+#i18nMenu a.currentlanguage:visited {
>+ font-weight: bold;
>+}
>+
>+#i18nMenu a,
>+#i18nMenu a:link,
>+#i18nMenu a:visited {
>+ color : #004d99;
>+ font-weight: normal;
>+}
>+
>+#i18nMenu a:hover,
>+#i18nMenu a:active {
>+ color : #538200;
>+ font-weight: normal;
>+}
>+
>+#i18nMenu a .sublanguage-selected {
>+ color: #000;
>+ font-weight: bold;
>+}
>+
>+#i18nMenu .dropdown-menu a:hover,
>+#i18nMenu .dropdown-menu a:focus {
>+ color : #FFF;
>+}
>\ No newline at end of file
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
>index 442a7bb..d937656 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
>@@ -9,28 +9,41 @@
> 
> [% IF ( languages_loo.group_enabled ) %]
> [% IF ( languages_loo.plural ) %]
>- <li class="dropdown"><a class="dropdown-toggle dropup" data-toggle="dropdown" id="show[% languages_loo.rfc4646_subtag %]" href="#">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %] </a>
>+ <li class="dropdown"><a class="dropdown-toggle dropup" data-toggle="dropdown" id="show[% languages_loo.rfc4646_subtag %]" href="#">
>+ [% IF ( languages_loo.native_description ) %]
>+ [% languages_loo.native_description %]
>+ [% ELSE %]
>+ [% languages_loo.rfc4646_subtag %]
>+ [% END %]
>+ [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
>+ [% IF ( sublanguages_loo.enabled ) %]
>+ [% IF ( sublanguages_loo.sublanguage_current ) %]
>+ ([% sublanguages_loo.rfc4646_subtag %])
>+ [% END %]
>+ [% END %]
>+ [% END %]
>+ </a>
> <ul id="sub[% languages_loo.rfc4646_subtag %]" class="dropdown-menu">
> [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
>-		[% IF ( sublanguages_loo.enabled ) %]
>+ [% IF ( sublanguages_loo.enabled ) %]
> [% IF ( sublanguages_loo.sublanguage_current ) %]
>- <li> <a href="#">[% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] ([% sublanguages_loo.rfc4646_subtag %])</a></li>
>+ <li class="navbar-text"> <a href="#" class="currentlanguage disabled">[% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] ([% sublanguages_loo.rfc4646_subtag %])</a></li>
> [% ELSE %]
> <li><a href="/cgi-bin/koha/changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag %]"> [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] ([% sublanguages_loo.rfc4646_subtag %])</a></li>
>-		[% END %]
>+ [% END %]
> [% END %]
> 
> [% END %]
> </ul></li>
> 
> [% ELSE %]
>-	 	[% IF ( languages_loo.group_enabled ) %]
>+ [% IF ( languages_loo.group_enabled ) %]
> [% IF ( languages_loo.current ) %]
> <li class="navbar-text">
> [% IF ( languages_loo.native_description ) %]
>- [% languages_loo.native_description %]
>- [% ELSE %]
>- [% languages_loo.rfc4646_subtag %]
>+ [% languages_loo.native_description %]
>+ [% ELSE %]
>+ [% languages_loo.rfc4646_subtag %]
> [% END %]
> </li>
> [% ELSE %]
>@@ -42,7 +55,7 @@
> [% END %]
> </a></li>
> [% END %]
>-		[% END %]
>+ [% END %]
> [% END %]
> [% END %]
> 
>-- 
>1.7.9.5

Actions: View | Diff | Splinter Review

Attachments on bug 12597: 29856 | 30224 | 30236 | 30358