Merge remote-tracking branch 'origin/feature/cale/cms-master' into

feature/dhm/cms-settings

Conflicts:
	cms/static/sass/_base.scss

cms/static/sass/_base.scss

@@ -80,8 +80,7 @@ footer {
 
 input[type="text"],
 input[type="email"],
-input[type="password"],
-textarea {
+input[type="password"] {
     padding: 6px 8px 8px;
     @include box-sizing(border-box);
     border: 1px solid #b0b6c2;
@@ -181,6 +180,11 @@ code {
         padding: 20px;
     }
 
+    .details {
+      margin-bottom: 30px;
+      font-size: 14px;
+    }
+
     h4 {
         padding: 6px 14px;
         border-bottom: 1px solid #cbd1db;
@@ -338,4 +342,29 @@ body.show-wip {
         content: '';
         @extend .spinner-icon;
     }
+}
+
+.new-button {
+    @include grey-button;
+    padding: 20px 0;
+    text-align: center;
+
+    &.big {
+        display: block;
+    }
+}
+
+.edit-button.standard,
+.delete-button.standard {
+  float: left;
+  @include white-button;
+  padding: 3px 10px 4px;
+  margin-left: 7px;
+  font-size: 12px;
+  font-weight: 400;
+
+  .edit-icon,
+  .delete-icon {
+    margin-right: 4px;
+  }
 }
\ No newline at end of file

cms/templates/asset_index.html

@@ -21,7 +21,7 @@
         </div>
       </td>
       <td class="name-col">
-        <a href="{{url}}" class="filename">{{displayname}}</a>
+        <a data-tooltip="Open/download this file" href="{{url}}" class="filename">{{displayname}}</a>
         <div class="embeddable-xml"></div>
       </td>
       <td class="date-col">
@@ -61,7 +61,7 @@
                 </div>
               </td>
               <td class="name-col">
-                <a href="${asset['url']}" class="filename">${asset['displayname']}</a>
+                <a data-tooltip="Open/download this file" href="${asset['url']}" class="filename">${asset['displayname']}</a>
                 <div class="embeddable-xml"></div>
               </td>
               <td class="date-col">

cms/templates/base.html

@@ -33,6 +33,7 @@
     <script src="${static.url('js/vendor/jquery.leanModal.min.js')}"></script>
     <script src="${static.url('js/vendor/jquery.tablednd.js')}"></script>
     <script src="${static.url('js/vendor/jquery.form.js')}"></script>
+    <script type="text/javascript" src="${static.url('coffee/src/discussion/tooltip_manager.js')}"></script>
     <script type="text/javascript" src="${static.url('js/vendor/CodeMirror/htmlmixed.js')}"></script>
     <script type="text/javascript" src="${static.url('js/vendor/CodeMirror/css.js')}"></script>
     <script type="text/javascript">

cms/templates/component.html

@@ -9,5 +9,5 @@
   <a href="#" class="edit-button standard"><span class="edit-icon"></span>Edit</a>
   <a href="#" class="delete-button standard"><span class="delete-icon"></span>Delete</a>  
 </div>
-<a href="#" class="drag-handle"></a>
+<a data-tooltip="Drag to reorder" href="#" class="drag-handle"></a>
 ${preview}
\ No newline at end of file

cms/templates/editable_preview.html

@@ -4,7 +4,7 @@ ${content}
   <a href="#" class="edit-button"><span class="edit-icon white"></span>Edit</a>
   <a href="#" class="delete-button"><span class="delete-icon white"></span>Delete</a>	
 </div>
-<a href="#" class="drag-handle"></a>
+<a data-tooltip="Drag to reorder" href="#" class="drag-handle"></a>
 <div class="component-editor">
   <h5>Edit Video Component</h5>
   <textarea class="component-source"><video youtube="1.50:q1xkuPsOY6Q,1.25:9WOY2dHz5i4,1.0:4rpg8Bq6hb4,0.75:KLim9Xkp7IY"/></textarea>

cms/templates/overview.html

@@ -22,7 +22,7 @@
   <script type="text/template" id="new-section-template">
     <section class="courseware-section branch new-section">
       <header>
-        <a href="#" class="expand-collapse-icon collapse"></a>
+        <a href="#"  data-tooltip="Collapse/expand this section" class="expand-collapse-icon collapse"></a>
         <div class="item-details">
           <h3 class="section-name">
           <form class="section-name-form">
@@ -38,7 +38,7 @@
   <script type="text/template" id="blank-slate-template">
     <section class="courseware-section branch new-section">
       <header>
-        <a href="#" class="expand-collapse-icon collapse"></a>
+        <a href="#"  data-tooltip="Collapse/expand this section" class="expand-collapse-icon collapse"></a>
         <div class="item-details">
           <h3 class="section-name">
           <span class="section-name-span">Click here to set the section name</span>
@@ -49,8 +49,8 @@
           </form>
         </div>
         <div class="item-actions">
-          <a href="#" class="delete-button delete-section-button"><span class="delete-icon"></span></a>
-          <a href="#" class="drag-handle"></a>
+          <a href="#" data-tooltip="Delete this section" class="delete-button delete-section-button"><span class="delete-icon"></span></a>
+          <a href="#" data-tooltip="Drag to re-order" class="drag-handle"></a>
         </div>
       </header>
     </section>
@@ -105,10 +105,10 @@
         % for section in sections:
         <section class="courseware-section branch" data-id="${section.location}">
           <header>
-            <a href="#" class="expand-collapse-icon collapse"></a>
+            <a href="#" data-tooltip="Collapse/expand this section" class="expand-collapse-icon collapse"></a>
             <div class="item-details" data-id="${section.location}">
               <h3 class="section-name">
-                <span class="section-name-span">${section.display_name}</span>
+                <span data-tooltip="Edit this section's name" class="section-name-span">${section.display_name}</span>
                 <form class="section-name-edit" style="display:none">
                   <input type="text" value="${section.display_name}" class="edit-section-name" autocomplete="off"/>
                   <input type="submit" class="save-button edit-section-name-save" value="Save" />
@@ -131,8 +131,8 @@
               </div>
             </div>
             <div class="item-actions">
-              <a href="#" class="delete-button delete-section-button"><span class="delete-icon"></span></a>
-              <a href="#" class="drag-handle"></a>
+              <a href="#" data-tooltip="Delete this section" class="delete-button delete-section-button"><span class="delete-icon"></span></a>
+              <a href="#" data-tooltip="Drag to reorder" class="drag-handle"></a>
             </div>
           </header>
           <div class="subsection-list">
@@ -146,15 +146,15 @@
               <li class="branch collapsed" data-id="${subsection.location}">
                 <div class="section-item">
                   <div>
-                    <a href="#" class="expand-collapse-icon expand"></a>
+                    <a href="#" data-tooltip="Collapse/expand this subsection" class="expand-collapse-icon expand"></a>
                     <a href="${reverse('edit_subsection', args=[subsection.location])}">
                       <span class="folder-icon"></span>
                       <span class="subsection-name"><span class="subsection-name-value">${subsection.display_name}</span></span>
                     </a>
                   </div>
                   <div class="item-actions">
-                    <a href="#" class="delete-button delete-subsection-button"><span class="delete-icon"></span></a>                    
-                    <a href="#" class="drag-handle"></a>
+                    <a href="#" data-tooltip="Delete this subsection" class="delete-button delete-subsection-button"><span class="delete-icon"></span></a>                    
+                    <a href="#" data-tooltip="Drag to reorder" class="drag-handle"></a>
                   </div>
                 </div>
                 ${units.enum_units(subsection)}