Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'bug_8108' into 3.12-master

Browse source
This commit is contained in:
Jared Camins-Esakov 2013-01-31 11:09:00 -05:00
commit 01e727a6d9
16 changed files with 60 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
koha-tmpl/opac-tmpl/ccsr/en/css/jquery.rating.css
View file

@ -1,9 +1,11 @@
/* jQuery.Rating Plugin CSS - http://www.fyneworks.com/jquery/star-rating/ */
div.rating-cancel,div.star-rating{float:left;width:15px;height:15px;text-indent:-999em;cursor:pointer;display:block;background:transparent;overflow:hidden}
div.rating-cancel,div.rating-cancel a{background:url(../../images/delete.gif) no-repeat 0 -16px}
div.star-rating,div.star-rating a{background:url(../../images/star.gif) no-repeat 0 0px}
div.rating-cancel a,div.star-rating a{display:block;width:16px;height:100%;background-position:0 0px;border:0}
div.rating-cancel,div.rating-cancel a{background:url(../../images/star-ratings-sprite.png) no-repeat 0 -49px}
div.star-rating,div.star-rating a{background:url(../../images/star-ratings-sprite.png) no-repeat 0 0px}
div.rating-cancel a{display:block;width:16px;height:100%;background-position:0 -49px;border:0}
div.star-rating a{display:block;width:16px;height:100%;background-position:0 0px;border:0}
div.star-rating-on a{background-position:0 -32px!important}
div.rating-cancel.star-rating-hover a{background-position:0 -65px}
div.star-rating-hover a{background-position:0 -16px}
/* Read Only CSS */
div.star-rating-readonly a{cursor:default !important}

29
koha-tmpl/opac-tmpl/ccsr/en/css/opac.css
View file

@ -724,17 +724,17 @@ input.deleteshelf:active {
#tagslist li { display : inline; }
a.tag_add {
background-image: url(../../images/tag-small.png);
background-position : -1px center;
background-repeat : no-repeat;
background-image: url("../../images/sprite.png"); /* Tag results */
background-position: -10px -1104px;
background-repeat: no-repeat;
padding-left : 13px;
text-decoration: none;
}
#login4tags {
background-image: url(../../images/tag-small-disabled.png);
background-position : -1px center;
background-repeat : no-repeat;
background-image: url("../../images/sprite.png"); /* Tag results disabled */
background-position: -10px -1124px;
background-repeat: no-repeat;
padding-left : 13px;
text-decoration: none;
margin-left: 1em;
@ -1811,23 +1811,6 @@ div#menu li.active a:hover {
margin : 0;
padding : 0;
}
span.starFull {
background: url(../../images/star-ratings.gif) top left no-repeat;
display : block;
height: 10px;
margin: 0;
padding: 0;
}
span.starMT {
background: url(../../images/star-ratings-empty.gif) top left no-repeat;
display : block;
height: 10px;
margin: 0 10px 0 10px;
padding: 0;
position: relative;
width: 50px;
}
#cartmenulink, #listsmenulink {
background-repeat: no-repeat;

BIN
koha-tmpl/opac-tmpl/ccsr/images/sprite.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

108
koha-tmpl/opac-tmpl/prog/en/css/opac.css
View file

@ -429,20 +429,20 @@ a .term {
}
#action a.print {
background-image: url("../../images/sprite.png");
background-image: url("../../images/sprite.png"); /* Print */
background-position: -5px -186px;
background-repeat: no-repeat;
}
#action a.highlight_toggle {
background-image: url("../../images/sprite.png"); /* place hold icon */
background-image: url("../../images/sprite.png"); /* Highlight */
background-position: -5px -841px;
background-repeat: no-repeat;
display: none;
}
#action a#furthersearches {
background-image: url("../../images/sprite.png");
background-image: url("../../images/sprite.png"); /* Menu arrow */
background-position: 106px -295px;
background-repeat: no-repeat;
border : 1px solid #F3F3F3;
@ -460,19 +460,19 @@ a .term {
#action a.reserve,
.searchresults a.reserve {
background-image: url("../../images/sprite.png");
background-image: url("../../images/sprite.png"); /* Place hold */
background-position: -5px -144px;
background-repeat: no-repeat;
}
#action a.addtoshelf, #toolbar a.addtoshelf {
background-image: url("../../images/sprite.png");
background-image: url("../../images/sprite.png"); /* Virtual shelf */
background-position: -5px -225px;
background-repeat: no-repeat;
}
#action a.addtocart, #toolbar a.addtocart {
background-image: url("../../images/sprite.png");
background-image: url("../../images/sprite.png"); /* Cart */
background-position: -5px -265px;
background-repeat: no-repeat;
}
@ -485,7 +485,7 @@ a .term {
}
#action a.incart {
background-image: url("../../images/sprite.png");
background-image: url("../../images/sprite.png"); /* Cart */
background-position: -5px -265px;
background-repeat: no-repeat;
color : #666;
@ -546,7 +546,7 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e0e0e0', end
#toolbar a.print {
background-image: url("../../images/sprite.png");
background-image: url("../../images/sprite.png"); /* Toolbar print */
background-position : 0px -423px;
background-repeat: no-repeat;
text-decoration : none;
@ -554,7 +554,7 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e0e0e0', end
}
#toolbar a.brief {
background-image : url("../../images/sprite.png");
background-image : url("../../images/sprite.png"); /* Zoom out */
background-position : -2px -868px;
background-repeat: no-repeat;
text-decoration : none;
@ -562,7 +562,7 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e0e0e0', end
}
#toolbar a.detail {
background-image : url("../../images/sprite.png");
background-image : url("../../images/sprite.png"); /* Zoom in */
background-position : -2px -898px;
background-repeat: no-repeat;
text-decoration : none;
@ -570,7 +570,7 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e0e0e0', end
}
#toolbar a.download {
background-image : url("../../images/sprite.png");
background-image : url("../../images/sprite.png"); /* Download */
background-position : 2px -348px;
background-repeat: no-repeat;
padding-left : 28px;
@ -578,7 +578,7 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e0e0e0', end
}
#toolbar a.editshelf {
background-image : url("../../images/sprite.png");
background-image : url("../../images/sprite.png"); /* List edit */
background-position : 2px -348px;
background-repeat: no-repeat;
padding-left : 26px;
@ -586,7 +586,7 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e0e0e0', end
}
#toolbar a.empty {
background-image : url("../../images/sprite.png");
background-image : url("../../images/sprite.png"); /* Trash */
background-position : 2px -598px;
background-repeat: no-repeat;
text-decoration : none;
@ -594,7 +594,7 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e0e0e0', end
}
#toolbar a.hide {
background-image : url("../../images/sprite.png");
background-image : url("../../images/sprite.png"); /* Close */
background-position: -3px -814px;
background-repeat: no-repeat;
text-decoration : none;
@ -603,7 +603,7 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e0e0e0', end
#toolbar a.hold,
#selections-toolbar a.hold {
background-image: url("../../images/sprite.png");
background-image: url("../../images/sprite.png"); /* Toolbar place hold */
background-position : -5px -453px;
background-repeat: no-repeat;
text-decoration : none;
@ -611,14 +611,14 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e0e0e0', end
}
#selections-toolbar a.hold.disabled {
background-image: url("../../images/sprite.png");
background-image: url("../../images/sprite.png"); /* Place hold disabled */
background-position : -5px -621px;
background-repeat: no-repeat;
}
#selections-toolbar a.removeitems,
#selections-toolbar a.deleteshelf {
background-image : url("../../images/sprite.png");
background-image : url("../../images/sprite.png"); /* Delete */
background-position : 2px -690px;
background-repeat: no-repeat;
text-decoration : none;
@ -628,14 +628,14 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e0e0e0', end
#selections-toolbar a.removeitems.disabled,
#selections-toolbar a.deleteshelf.disabled {
background-image: url("../../images/sprite.png");
background-image: url("../../images/sprite.png"); /* Delete disabled */
background-position : 2px -712px;
background-repeat: no-repeat;
}
#toolbar a.send,
a.send {
background-image: url("../../images/sprite.png");
background-image: url("../../images/sprite.png"); /* Email */
background-position : 2px -386px;
background-repeat: no-repeat;
text-decoration : none;
@ -643,7 +643,7 @@ a.send {
}
#toolbar a.new {
background-image : url("../../images/sprite.png");
background-image : url("../../images/sprite.png"); /* New */
background-position : -4px -922px;
background-repeat : no-repeat;
padding-left : 23px;
@ -652,7 +652,9 @@ a.send {
#toolbar input.editshelf,
input.editshelf {
background : transparent url("../../images/sprite.png") 2px -732px no-repeat;
background-image : url("../../images/sprite.png"); /* List edit */
background-position : 2px -732px;
background-repeat: no-repeat;
border : 0;
color : #006699;
cursor : pointer;
@ -665,7 +667,7 @@ input.editshelf {
#toolbar input.newshelf,
#toolbar a.newshelf,
a.newshelf {
background-image: url("../../images/sprite.png"); /* add to list icon */
background-image: url("../../images/sprite.png"); /* List new */
background-position: -4px -764px;
background-repeat: no-repeat;
border : 0;
@ -679,14 +681,16 @@ a.newshelf {
}
a.newshelf.disabled {
background-image: url("../../images/sprite.png"); /* add to list icon */
background-image: url("../../images/sprite.png"); /* List new disabled */
background-position: -4px -791px;
background-repeat: no-repeat;
}
#toolbar input.deleteshelf,
input.deleteshelf {
background : transparent url("../../images/sprite.png") 2px -685px no-repeat;
background-image : url("../../images/sprite.png"); /* Delete */
background-position : 2px -685px;
background-repeat: no-repeat;
border : 0;
color : #006699;
cursor : pointer;
@ -714,7 +718,7 @@ input.deleteshelf:active {
#tagsel_span input.submit,
#tagsel_tag {
background-image : url("../../images/sprite.png"); /* tag icon */
background-image : url("../../images/sprite.png"); /* Tags */
background-position : 7px -640px;
background-repeat : no-repeat;
padding-left : 25px;
@ -732,17 +736,17 @@ input.deleteshelf:active {
#tagslist li { display : inline; }
a.tag_add {
background-image: url(../../images/tag-small.png);
background-position : -1px center;
background-repeat : no-repeat;
background-image: url("../../images/sprite.png"); /* Tag results */
background-position: -10px -1104px;
background-repeat: no-repeat;
padding-left : 13px;
text-decoration: none;
}
#login4tags {
background-image: url(../../images/tag-small-disabled.png);
background-position : -1px center;
background-repeat : no-repeat;
background-image: url("../../images/sprite.png"); /* Tag results disabled */
background-position: -10px -1124px;
background-repeat: no-repeat;
padding-left : 13px;
text-decoration: none;
margin-left: 1em;
@ -763,16 +767,17 @@ a.tag_add {
max-width : 10em;
}
/* Search results add to cart (lists disabled) */
.addto a.addtocart {
background-image: url("../../images/sprite.png"); /* cart icon */
background-position: -5px -265px;
background-image: url("../../images/sprite.png"); /* Cart */
background-position: -5px -266px;
background-repeat: no-repeat;
text-decoration : none;
padding-left : 33px;
}
/* Search results place hold link */
#placehold input.submit {
background-image: url("../../images/sprite.png"); /* place hold icon */
background-image: url("../../images/sprite.png"); /* Place hold */
background-position: -1px -140px;
background-repeat: no-repeat;
text-decoration : none;
@ -790,7 +795,7 @@ a.tag_add {
cursor : pointer;
}
.searchresults a.highlight_toggle {
background-image: url("../../images/sprite.png"); /* place hold icon */
background-image: url("../../images/sprite.png"); /* Highlight */
background-position: -11px -841px;
background-repeat: no-repeat;
display: none;
@ -1483,23 +1488,26 @@ padding-left : .4em;
text-decoration : none;
}
/* Search results rows place hold */
.actions a.hold {
background-image : url("../../images/sprite.png");
background-image : url("../../images/sprite.png"); /* Place hold small */
background-position : -10px -542px;
background-repeat: no-repeat;
padding-left : 16px;
}
/* Search results rows add to cart */
.actions a.addtocart {
background-image : url("../../images/sprite.png");
background-image : url("../../images/sprite.png"); /* Cart small */
background-position : -10px -572px;
background-repeat: no-repeat;
padding-left : 15px;
display : none;
}
/* Search results rows save to lists */
.actions a.addtoshelf {
background-image : url("../../images/sprite.png");
background-image : url("../../images/sprite.png"); /* MARC view */
background-position: -10px -27px;
background-repeat: no-repeat;
padding-left : 13px;
@ -1659,7 +1667,7 @@ ul#i18nMenu li ul li {
ul#i18nMenu li.more a {
background-image : url("../../images/sprite.png");
background-image : url("../../images/sprite.png"); /* Arrow up */
background-position : 37px -940px;
background-repeat:no-repeat;
padding-right: 1.3em;
@ -1813,24 +1821,6 @@ div#menu li.active a:hover {
padding : 2px;
}
span.starFull {
background: url(../../images/star-ratings.gif) top left no-repeat;
display : block;
height: 10px;
margin: 0;
padding: 0;
}
span.starMT {
background: url(../../images/star-ratings-empty.gif) top left no-repeat;
display : block;
height: 10px;
margin: 0 10px 0 10px;
padding: 0;
position: relative;
width: 50px;
}
#cartmenulink, #listsmenulink {
background-repeat: no-repeat;
-webkit-border-radius: 5px;
@ -2353,7 +2343,7 @@ a.koha_url {
}
.nav_results .l_Results a {
background:#E1E1E1 url("../../images/sprite.png") no-repeat 0px -504px;
background:#E1E1E1 url("../../images/sprite.png") no-repeat 0px -504px; /* Browse results menu */
color:#006699;
display:block;
padding:8px 28px;

BIN
koha-tmpl/opac-tmpl/prog/images/Star0.gif
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.3 KiB

BIN
koha-tmpl/opac-tmpl/prog/images/Star1.gif
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.4 KiB

BIN
koha-tmpl/opac-tmpl/prog/images/Star2.gif
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.4 KiB

BIN
koha-tmpl/opac-tmpl/prog/images/Star3.gif
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.4 KiB

BIN
koha-tmpl/opac-tmpl/prog/images/Star4.gif
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.3 KiB

BIN
koha-tmpl/opac-tmpl/prog/images/Star5.gif
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.3 KiB

BIN
koha-tmpl/opac-tmpl/prog/images/sprite.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

BIN
koha-tmpl/opac-tmpl/prog/images/star-ratings-empty.gif
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 187 B

BIN
koha-tmpl/opac-tmpl/prog/images/star-ratings.gif
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 295 B

BIN
koha-tmpl/opac-tmpl/prog/images/tag-small-disabled.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 317 B

BIN
koha-tmpl/opac-tmpl/prog/images/tag-small.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 347 B

BIN
misc/interface_customization/opac-sprite.psd Normal file
View file

Binary file not shown.