Merge branch 'master' of github.com:NUKnightLab/StoryMapJS

nixta · Apr 7, 2014 · 765011a · 765011a
2 parents a478f03 + 63704ad
commit 765011a
Show file tree

Hide file tree

Showing 6 changed files with 526 additions and 234 deletions.
diff --git a/website/static/css/editor.css b/website/static/css/editor.css
@@ -140,7 +140,6 @@ a.help:hover {text-decoration: none;}
 .upload-conflict-rename input[type="radio"] {margin-top: 8px;}
 .upload-conflict-rename input[type="text"] {margin-left: 4px;margin-bottom: 4px;}
 
-
 #error_modal {background-color: #f2dede;color: #b94a48;border-color: #eed3d7;}
 
 #progress_modal i {margin-right: 10px;}
@@ -334,8 +333,10 @@ a.help:hover {text-decoration: none;}
 }
 .entry-list i.icon-warning-sign { margin-right: 0.5em; }
 
-.entry-list .list-item-edit {margin-left: 10px;}
 .entry-list .list-item-delete {margin-left: 10px;}
+.entry-list .list-item-rename {margin-left: 10px;}
+.entry-list .list-item-copy {margin-left: 10px;}
+.entry-list .list-item-options {margin-left: 10px;}
 
 #entry_user_info, .entry-list .modded {
 	font-family: "Apres RE","Helvetica Neue",Helvetica,Arial,sans-serif;
@@ -345,13 +346,19 @@ a.help:hover {text-decoration: none;}
 	color:#333;
 	font-size:18px;
 }
-a.list-item-delete {
+
+/*a.list-item-delete, a.list-item-rename, a.list-item-copy,*/
+a.list-item-options {
 	color:#999;
 }
-a.list-item-delete:hover {
+
+/*a.list-item-delete:hover, a.list-item-rename:hover, a.list-item-copy:hover*/
+a.list-item-options:hover {
 	text-decoration:none;
-	color:#DA0000;
+    color: #1dacd6;
 }
+
+
 /*	EDIT PAGE
 ----------------------------------------------------- */
 

diff --git a/website/static/js/editor.js b/website/static/js/editor.js
@@ -93,7 +93,7 @@ function show_error(msg, err) {
             message += '<p><a class="report" href="'+link+'">Report this error to the Knight Lab</a></p>';
         }
     }
-       
+
     hide_progress();
     $('#error_modal .modal-msg').html(message);
     $('#error_modal').modal('show');
@@ -115,8 +115,7 @@ function hide_progress() {
 
 function show_confirm(msg, callback) {
     $('#confirm_modal .modal-msg').html(msg);
-    $('#confirm_modal .btn-primary').bind('click.confirm', function(event) {
-        $(this).unbind('click.confirm');
+    $('#confirm_modal .btn-primary').one('click.confirm', function(event) {
         $('#confirm_modal').modal('hide');
         if(callback) {
             callback();