div submenu and content height and margin fixed, respectively

diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css
index a0ac2e78ef2b34a1f8592b18fa2c0f4bbef3e6ef..23f7cc963d5a754e718db63be4218d55d816fb6f 100644 (file)
--- a/telemeta/htdocs/css/telemeta.css
+++ b/telemeta/htdocs/css/telemeta.css
@@ -47,7 +47,7 @@ a img { border: none; }
 
 #content {
     position: relative;
-    margin: 2em 2em 0em 2em;
+    margin: 1em 2em 0em 2em;
 }
 
 #content ul, #content ul ul, #content ol {
@@ -92,6 +92,7 @@ a img { border: none; }
 #submenu {
     position: relative;
     margin: 5px 2em 0;
+    height:3ex;
     z-index: 10;
 }
 #submenu h3, #submenu div {
@@ -992,8 +993,8 @@ a.image-link {
     border-radius: 1ex 1ex 1ex 1ex;
 }
 .mediaitem_button:hover,.mediaitem_button:link:hover, .mediaitem_button:visited:hover{
-    background-color: #e9e9d9;
-    color:#6A0307;
+    background-color:  #e9e9e9; /*#e9e9d9;*/
+    color: #000; /*#6A0307;*/
     text-decoration: none;
 }
 .mediaitem_button_no_icon{

diff --git a/telemeta/htdocs/timeside/src/playlist.js b/telemeta/htdocs/timeside/src/playlist.js
index 2be4abf60c79ab41e0378c846262a4f79f4bf806..d8c093fd95b9f3c4a40ec491fae38aa82153198f 100644 (file)
--- a/telemeta/htdocs/timeside/src/playlist.js
+++ b/telemeta/htdocs/timeside/src/playlist.js
@@ -30,6 +30,12 @@ var playlist = {
         };
         popupDialog(element,table,onOk);
 
+    },
+
+    remove: function(id){
+        json([id],'telemeta.del_playlist',function(){
+                window.location.reload();
+            },true);
     }
 //    ,add:function(title){
 //        if(title instanceof String)

diff --git a/telemeta/templates/telemeta_default/home.html b/telemeta/templates/telemeta_default/home.html
index 14255fbbb33f10888650174d5c012acb2b2541a4..e4a50acd0ed009fb2a880552b9ffeded2cdb9281 100644 (file)
--- a/telemeta/templates/telemeta_default/home.html
+++ b/telemeta/templates/telemeta_default/home.html
@@ -55,13 +55,13 @@
 </div>
 
 <div class="home-description">
-<h3>{% trans "Playlists" %} <a href=# style="float:right" class="mediaitem_button mediaitem_button_add" onclick="playlist.add($(this))">
-{% trans "Add" %}</a></h3>
+<h3>{% trans "Playlists" %}</h3> <a href=# style="float:right" class="mediaitem_button mediaitem_button_add" onclick="playlist.add($(this))">
+{% trans "Add" %}</a>
   {% for playlist in playlists %}
   <div>
   <h2>{{ playlist.playlist.title }}</h2>
   <a href="{% url telemeta-playlist-csv-export playlist.playlist.public_id %}" style="float:right" class="mediaitem_button mediaitem_button_add">CSV</a>
-  <a href="#" onclick="" style="float:right" class="mediaitem_button mediaitem_button_cancel"> {% trans "Delete" %}</a>
+  <a href="#" id="{{playlist.playlist.public_id}}" onclick="playlist.remove(this.id);return false;" style="float:right" class="mediaitem_button mediaitem_button_cancel"> {% trans "Delete" %}</a>