Bug 8660: follow-up: Porting changes to ccsr theme

Signed-off-by: Mason James <mtj@kohaaloha.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>

diff --git a/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css b/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css
index 6fa04a0..e939a1b 100644 (file)
--- a/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css
@@ -723,7 +723,7 @@ input.deleteshelf:active {
 
 #tagslist li { display : inline; }
 
-a.tag_results_add {
+a.tag_add {
     background-image: url(../../images/tag-small.png);
     background-position : -1px center;
     background-repeat : no-repeat;
@@ -742,7 +742,6 @@ a.tag_results_add {
 
 .tag_results_input {
     background-color: #EEE;
-    display: none;
     margin-left: 1em;
     padding: 0.3em;
 }
@@ -1443,9 +1442,19 @@ padding-left : .4em;
     padding-left:20px
 }
 
-.searchresults .tagstatus {
-        display: block;
-        color: #707070;
+.tagstatus {
+    color: #707070;
+    padding: 0 4px 0 4px;
+    margin-left: 5px;
+    border: 1px solid #bcbcbc;
+    background-color: #ffffcc;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+}
+
+.results_summary.tagstatus {
+    display: inline;
 }
 
 .results_summary .label {
@@ -1456,8 +1465,12 @@ padding-left : .4em;
         font-weight: normal;
 }
 
-.actions a {
-   margin-left : 1em;
+.actions a.hold,
+.actions a.addtocart,
+.actions a.addtoshelf,
+.actions a.addtolist,
+.actions a.tag_add {
+     margin-left : 1em;
      text-decoration : none;
 }
 

diff --git a/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc
index 407ab83..8df82cf 100644 (file)
--- a/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc
+++ b/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc
@@ -83,7 +83,8 @@
     var MSG_TAGS_ADDED = _("Tags added: ");
     var MSG_TAGS_DELETED = _("Tags added: ");
     var MSG_TAGS_ERRORS = _("Errors: ");
-    var MSG_MULTI_ADD_TAG_FAILED = _("Unable to add one or more tags.");[% END %][% END %]
+    var MSG_MULTI_ADD_TAG_FAILED = _("Unable to add one or more tags.");
+    var MSG_NO_TAG_SPECIFIED = _("No tag was specified.");[% END %][% END %]
     [% IF ( OPACAmazonCoverImages ) %]$(window).load(function() {
         verify_images();
     });[% END %]

diff --git a/koha-tmpl/opac-tmpl/ccsr/en/js/tags.js b/koha-tmpl/opac-tmpl/ccsr/en/js/tags.js
index f663696..cffd4bf 100644 (file)
--- a/koha-tmpl/opac-tmpl/ccsr/en/js/tags.js
+++ b/koha-tmpl/opac-tmpl/ccsr/en/js/tags.js
@@ -26,12 +26,11 @@ if (typeof(readCookie) == "undefined") {
    }
 }
 KOHA.Tags = {
-      add_tag_button: function(){
-            var mybibnum = $(this).attr("title");
-          var mynewtag = "newtag" + mybibnum;
+      add_tag_button: function(bibnum, tag){
+          var mynewtag = "newtag" + bibnum;
             var mytagid = "#" + mynewtag;
           var mydata = {CGISESSID: readCookie('CGISESSID')};   // Someday this should be OPACSESSID
-                mydata[mynewtag] = $(mytagid).val();   // need [bracket] for variable property id
+                mydata[mynewtag] = tag;        // need [bracket] for variable property id
                 var response;  // AJAX from server will assign value to response.
                $.post(
                         "/cgi-bin/koha/opac-tags.pl",
@@ -61,11 +60,14 @@ KOHA.Tags = {
       },
      set_tag_status : function(tagid, newstatus) {
           $(tagid).html(newstatus);
-              $(tagid).css({display:"inline"});
+              $(tagid).show();
       },
      append_tag_status : function(tagid, newstatus) {
                $(tagid).append(newstatus);
-            $(tagid).css({display:"inline"});
+            $(tagid).show();
+      },
+     clear_all_tag_status : function() {
+          $(".tagstatus").empty().hide();
       },
 
     tag_message: {
@@ -73,8 +75,8 @@ KOHA.Tags = {
     scrubbed_all_bad : function(arg) {return (MSG_TAG_ALL_BAD);},
   badparam : function(arg) {return (MSG_ILLEGAL_PARAMETER+" "+arg);},
     scrubbed : function(arg) {return (MSG_TAG_SCRUBBED+" "+arg);},
-    failed_add_tag : function(arg) {return (MSG_ADD_TAG_FAILED+ " "+arg+" "+MSG_ADD_TAG_FAILED_NOTE);},
-    failed_delete  : function(arg) {return (MSG_DELETE_TAG_FAILED+ " "+arg+" "+MSG_DELETE_TAG_FAILED_NOTE);},
+    failed_add_tag : function(arg) {return (MSG_ADD_TAG_FAILED+ " '"+arg+"'. \n"+MSG_ADD_TAG_FAILED_NOTE);},
+    failed_delete  : function(arg) {return (MSG_DELETE_TAG_FAILED+ " '"+arg+"'. \n"+MSG_DELETE_TAG_FAILED_NOTE);},
    login : function(arg) {return (MSG_LOGIN_REQUIRED);}
    },
 
@@ -92,7 +94,7 @@ KOHA.Tags = {
                   mydata,
                         function(data){
                                 eval(data);
-                $(".tagstatus").empty();
+                KOHA.Tags.clear_all_tag_status();
                 var bibErrors = false;
 
                 // Display the status for each tagged bib