sufia 3.7.2 → 4.0.0.beta1

data/app/assets/javascripts/sufia/edit_metadata.js

@@ -1,4 +1,4 @@
-$(function() {
+Blacklight.onLoad(function() {
   function get_autocomplete_opts(field) {
     var autocomplete_opts = {
       minLength: 2,

data/app/assets/javascripts/sufia/editor.js

@@ -0,0 +1,12 @@
+Blacklight.onLoad(function() {
+  // hide the editor initially
+  $($('[data-behavior="reveal-editor"]').data('target')).hide();
+
+  // Show the form, hide the preview
+  $('[data-behavior="reveal-editor"]').on('click', function(evt) {
+    evt.preventDefault();
+    $this = $(this);
+    $this.parent().hide();
+    $($this.data('target')).show();
+  });
+});

data/app/assets/javascripts/sufia/featured_works.js

@@ -0,0 +1,64 @@
+function setWeight(node, weight) {
+  weightField(node).val(weight);
+}
+
+/* find the input element with data-property="order" that is nested under the given node */
+function weightField(node) {
+  return findProperty(node, "order");
+}
+
+function findProperty(node, property) {
+  return node.find("input[data-property=" + property + "]");
+}
+
+function findNode(id, container) {
+  return container.find("[data-id="+id+"]");
+}
+
+function dragAndDrop(selector) {
+  selector.nestable({maxDepth: 1});
+  selector.on('change', function(event) {
+    // Scope to a container because we may have two orderable sections on the page
+    container = $(event.currentTarget);
+    var data = $(this).nestable('serialize')
+    var weight = 0;
+    for(var i in data){
+      var parent_id = data[i]['id'];
+      parent_node = findNode(parent_id, container);
+      setWeight(parent_node, weight++);
+    }
+  });
+}
+
+Blacklight.onLoad(function() {
+  $('a[data-behavior="feature"]').on('click', function(evt) {
+    evt.preventDefault();
+    anchor = $(this);
+    $.ajax({
+       url: anchor.attr('href'),
+       type: "post",
+       success: function(data) {
+         anchor.before("Featured");
+         anchor.remove();
+       }
+    });
+  });
+
+  $('a[data-behavior="unfeature"]').on('click', function(evt) {
+    evt.preventDefault();
+    anchor = $(this);
+    $.ajax({
+       url: anchor.attr('href'),
+       type: "post",
+       data: {"_method":"delete"}, 
+       success: function(data) {
+         row = anchor.closest('li')
+         row.fadeOut(1000, function() {
+           row.remove();
+         });
+       }
+    });
+  });
+
+  dragAndDrop($('#dd'));
+});

data/app/assets/javascripts/sufia/fileupload.js

@@ -1,6 +1,6 @@
 //= require sufia/uploader
 // This file is the default initialization of the fileupload.  If you want to call
 // sufiaUploader with other options (like afterSubmit), then override this file.
-$(function() {
+Blacklight.onLoad(function() {
   $('#fileupload').sufiaUploader();
 });

data/app/assets/javascripts/sufia/multiForm.js

@@ -12,7 +12,7 @@
       var cloneElem = $('#'+cloneId).clone();
       // change the add button to a remove button
       var plusbttn = cloneElem.find('#'+this.id);
-      plusbttn.html('-<span class="accessible-hidden">remove this '+ this.name.replace("_", " ") +'</span>');
+      plusbttn.html('-<span class="sr-only">remove this '+ this.name.replace("_", " ") +'</span>');
       plusbttn.on('click',removeField);
 
 

data/app/assets/javascripts/sufia/permissions.js

@@ -8,7 +8,7 @@
    * submitted
    */
 
-$(function() {
+Blacklight.onLoad(function() {
   // input for uids -  attach function to verify uid
   $('#new_user_name_skel').on('blur', function() {
       // clear out any existing messages
@@ -37,7 +37,6 @@ $(function() {
 
   });
 
-
   // add button for new user
   $('#add_new_user_skel').on('click', function() {
       if ($('#new_user_name_skel').val() == "" || $('#new_user_permission_skel :selected').index() == "0") {
@@ -112,7 +111,6 @@ $(function() {
 
 	});
 
-
   function addPerm(un, perm_form, perm, perm_type)
   {
       var tr = $(document.createElement('tr'));
@@ -153,15 +151,15 @@ $(function() {
 
 });
 
-// return the files visibility level (penn state, open, restricted);
+// return the files visibility level (institution, open, restricted);
 function get_visibility(){
   return $("input[name='visibility']:checked").val()
 }
 
 /*
- * if visibility is Open or Penn State then we can't selectively
+ * if visibility is Open or Institution then we can't selectively
  * set other users/groups to 'read' (it would be over ruled by the
- * visibility of Open or Penn State) so disable the Read option
+ * visibility of Open or Institution) so disable the Read option
  */
 function set_access_levels()
 {
@@ -212,5 +210,3 @@ function is_permission_duplicate(user_or_group_name)
   // rather than setting this flag var
   return (flag ? true : false);
 }
-
-

data/app/assets/javascripts/sufia/single_use_link.js

@@ -9,8 +9,7 @@ function getSingleUse(id) {
     return rurl  + resp.responseText;
 }
 
-// short hand for $(document).ready();
-$(function() {
+Blacklight.onLoad(function() {
     ZeroClipboard.setDefaults({ moviePath: "/assets/ZeroClipboard.swf" });
     $.each($(".copypaste"), function(idx, item) {
         var clip = new ZeroClipboard();

data/app/assets/javascripts/sufia/trophy.js

@@ -1,32 +1,47 @@
-// short hand for $(document).ready();
-$(function() {
+function toggleTrophy(url, anchor) {
+  $.ajax({
+     url: url,
+     type: "post",
+     success: function(data) {
+       gid = data.generic_file_id;
+       if (anchor.hasClass("trophy-on")){
+         // we've just removed the trophy
+         trophyOff(anchor);
+       } else {
+         trophyOn(anchor);
+       }
 
-   $('.trophy-class').click(function(){
-      var uid=$("#current_user").html();
-      $.ajax({
-         url:"/users/"+uid+"/trophy",
-         type:"post",
-         data: "file_id="+this.id,
-         success:function(data) {
-           gid = data.generic_file_id;
-           var oldclass = $('#'+gid).find('i').attr("class");
-           if (oldclass.indexOf("trophy-on") != -1){
-             $('#'+gid).find('i').attr("title", "Highlight work");
-           } else {
-             $('#'+gid).find('i').attr("title", "Unhighlight work");
-           }
-
-           $('#'+gid).find('i').toggleClass("trophy-on");
-           $('#'+gid).find('i').toggleClass("trophy-off");
-           if ($('#'+gid).data('removerow')) {
-             $('#trophyrow_'+gid).fadeOut(1000, function() {
-              $('#trophyrow_'+gid).remove();
-              });
-           }
-         }
-      })
+       anchor.toggleClass("trophy-on");
+       anchor.toggleClass("trophy-off");
+     }
+  });
+}
+// Trophy will be removed
+function trophyOff(anchor) {
+  if (anchor.data('removerow')) {
+    $('#trophyrow_'+gid).fadeOut(1000, function() {
+      $('#trophyrow_'+gid).remove();
     });
+  } else {
+    anchor.attr("title", "Highlight work");
+    $nodes = anchor.contents()
+    $nodes[$nodes.length - 1].nodeValue = anchor.data('add-text')
+  }
+}
+
+function trophyOn(anchor) {
+  anchor.attr("title", "Unhighlight work");
+  $nodes = anchor.contents()
+  $nodes[$nodes.length - 1].nodeValue = anchor.data('remove-text')
+}
 
-}); //closing function at the top of the page
+Blacklight.onLoad( function() {
+  // #this method depends on a "current_user" global variable having been set.
+  $('.trophy-class').click(function(evt){
+    evt.preventDefault();
+    anchor = $(this);
+    toggleTrophy(anchor.data('url'), anchor);
+  });
+});
 
 

data/app/assets/javascripts/terms_of_service.js

@@ -1,6 +1,6 @@
 jQuery.fn.exists = function(){return this.length>0;}
 
-$(function () {
+Blacklight.onLoad(function () {
   // all activate-submit buttons are disabled by default
   $('.activate-submit').each(function() {
     $(this).prop('disabled', true);

data/app/assets/stylesheets/dashboard.css.scss

@@ -1,51 +1,92 @@
-.dashboard {
-  .audiojs {
-    width: 38px;
-    float: left;  
-  }
+$gray-lightish: #bbb;
+$gray-lighter: #eee;
 
-  audio {
-    width: 38px;
-    float: left;
-  }
+.table {
+  > tbody {
+    > tr[id*='detail_'] {
+      > td {
+        padding: 0px;
 
-  .batch-select-all, .button_to {
-   
-    float: right;
-    padding-left: 6px;
-    padding-top: 0px;
-    padding-top: 0px;
-  }
+        .expanded-details {
+          display: none;
+          padding: 0.8em;
+          font-size: 0.9em;
 
-  .bedit {
-    width: 65%;
-   }
-   
-  .batch-select-all .btn-primary {
-    background-color:#da4f49;background-image:-moz-linear-gradient(top, #ee5f5b, #bd362f);background-image:-ms-linear-gradient(top, #ee5f5b, #bd362f);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));background-image:-webkit-linear-gradient(top, #ee5f5b, #bd362f);background-image:-o-linear-gradient(top, #ee5f5b, #bd362f);background-image:linear-gradient(top, #ee5f5b, #bd362f);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0);border-color:#bd362f #bd362f #802420;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#bd362f;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{background-color:#bd362f;*background-color:#a9302a;
-  }
+          dt {
+            text-align: right;
+          }
+          dd {
+            margin-left: -15px;
+          }
+        }
+      }
+    }
 
-  .button_to .btn-primary {
-  background-color:#faa732;background-image:-moz-linear-gradient(top, #fbb450, #f89406);background-image:-ms-linear-gradient(top, #fbb450, #f89406);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));background-image:-webkit-linear-gradient(top, #fbb450, #f89406);background-image:-o-linear-gradient(top, #fbb450, #f89406);background-image:linear-gradient(top, #fbb450, #f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0);border-color:#f89406 #f89406 #ad6704;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#f89406;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{background-color:#f89406;*background-color:#df8505;
+    .document-title {
+      word-break: break-all;
+    }
   }
+}
 
-  .table th, .table td {
-    padding: 4px;
-  }
-  .table .sm {
-    padding: 2px;
+.table-zebra-striped tbody > tr.zebra:nth-child(odd) > td,
+.table-zebra-striped tbody > tr.zebra:nth-child(odd) + tr > td,
+.table-zebra-striped tbody > tr.zebra:nth-child(odd) > th {
+  background-color: #f9f9f9;
+}
+
+.nav > li > a.accordion-toggle {
+  padding-left: 5px;
+  padding-right: 5px;
+}
+
+.slide-list {
+  list-style: none;
+  padding: 0px 0px 0px 15px;
+
+  li {
+    @extend .clearfix;
+    margin-bottom: 0.4em;
+    border-bottom: 1px solid $gray-lighter;
+    padding-bottom: 0.4em;
+
+    &:first-child {
+      border-top: 1px solid $gray-lighter;
+      padding-top: 0.4em;
+    }
   }
 
-  .over {
-  z-index:100;
+  .facet_select {
+
   }
-  .under
-  {
-  position:absolute;
-  padding:0px 0px 0px 0px;
-  left:10px;
-  top:-8px;
-  color:orange;
-  z-index:1; 
+
+  .facet-count {
+    padding-left: 0.2em;
+    padding-right: 0.2em;
+    background: $gray-lighter;
+    float: right;
+    display: block;
   }
+
 }
+
+.batch-info {
+  margin-bottom: 0.8em;
+}
+
+.sorts-dash, .sorts, .expandable_new {
+  cursor: pointer;
+}
+
+.caret.up {
+  border-top: 0;
+  border-bottom: 4px solid;
+  content: "";
+}
+
+.tr-detail {
+  display: none;
+}
+
+.visibility-link:hover {
+  text-decoration: none;
+}

data/app/assets/stylesheets/featured.css.scss

@@ -0,0 +1,16 @@
+ol#featured_works {
+  list-style: none;
+  margin-left: 0;
+  padding-left: 0;
+}
+
+/* don't nest .featured-item in the ol, because it's detached from the list when being dragged */
+.featured-item {
+  h3 {
+    margin-top: 0;
+  }
+  .main {
+    padding: 5px;
+  }
+}
+

data/app/assets/stylesheets/fileupload/{jquery.fileupload-ui.css → jquery.fileupload-ui.css.erb}

@@ -37,7 +37,7 @@
   width: 200px;
 }
 .progress-animated .bar {
-  background: url(/assets/progressbar.gif) !important;
+  background: url(<%= image_path('progressbar.gif') %>) !important;
   filter: none;
 }
 .fileupload-loading {
@@ -45,7 +45,7 @@
   left: 50%;
   width: 128px;
   height: 128px;
-  background: url(/assets/loading.gif) center no-repeat;
+  background: url(<%= image_path('loading.gif') %>) center no-repeat;
   display: none;
 }
 .fileupload-processing .fileupload-loading {

data/app/assets/stylesheets/{generic_files.css → generic_files.css.erb}

@@ -1,8 +1,8 @@
 /*
 *= require_self
 *= require_directory ./fileupload
-*= require reset_body
 */
+
 #upload_tooltip { background: #ff0; padding: 5px; border: 1px solid #ddd; position: absolute; }
 
 button.close {
@@ -16,7 +16,6 @@ overflow-x: auto;
 
 label.error { float: left; color: red; padding-left: .5em; vertical-align: top; }
 
-
 /* These were from batch_edit/edit.html.erb */
 #upload_tooltip { background: #ff0; padding: 5px; border: 1px solid #ddd; position: absolute; }
 
@@ -33,14 +32,14 @@ label.error { float: left; color: red; padding-left: .5em; vertical-align: top;
 }
 
 h2 small {
-   color: red;   
+   color: red;
 }
 
 .status {
-   color: green; 
-   padding:5px 5px 5px;  
+   color: green;
+   padding:5px 5px 5px;
 }
 
-.loading { 
- background: white url('/assets/loading.gif') center bottom no-repeat; 
+.loading {
+   background: white url(<%= image_path('loading.gif') %>) center bottom no-repeat;
 }