fix #7 #17

myriad/manage.py

@@ -143,6 +143,28 @@ def delete_icon(mid, icon_id):
 
     return redirect(url_for("manage.edit", mid=mid))
 
+@bp.route("/delete_blinkie/<mid>/<blinkie_id>")
+@login_required
+def delete_blinkie(mid, blinkie_id):
+    db = get_db()
+    icon = db.execute("SELECT blinkie_location FROM blinkies WHERE id=(?)",(blinkie_id,)).fetchone()
+    db.execute("DELETE FROM blinkies WHERE id=(?)",(blinkie_id,))
+    db.commit()
+    os.remove(os.path.join(current_app.config["BLINKIES_UPLOAD_FOLDER"], icon[0]))
+
+    return redirect(url_for("manage.edit", mid=mid))
+
+@bp.route("/delete_stamp/<mid>/<stamp_id>")
+@login_required
+def delete_stamp(mid, stamp_id):
+    db = get_db()
+    icon = db.execute("SELECT stamp_location FROM stamps WHERE id=(?)",(stamp_id,)).fetchone()
+    db.execute("DELETE FROM stamps WHERE id=(?)",(stamp_id,))
+    db.commit()
+    os.remove(os.path.join(current_app.config["STAMPS_UPLOAD_FOLDER"], icon[0]))
+
+    return redirect(url_for("manage.edit", mid=mid))
+
 
 @bp.route("/add_to_front/<mid>/<location>")
 @login_required

myriad/static/style.css

@@ -98,10 +98,34 @@ form textarea{
     border-width:5px;
 }
 
-#manage_icons{
+.manage_images{
     max-height:400px;
     overflow-y:scroll;
 }
+.manage_images_2{
+    clear:both;
+    width:600px;
+}
+.manage_icons_3{
+    display:block;
+   width:200px;
+   height:200px;
+   float:left;
+}
+.manage_blinkies_3{
+    display:block;
+   width:200px;
+   height:50px;
+   float:left;
+}
+.manage_stamps_3{
+    display:block;
+   width:120px;
+   height:100px;
+   float:left;
+}
+
+
 
 
 

myriad/templates/manage/edit.html

@@ -63,14 +63,17 @@
       <input type="submit" value="Upload New Icon">
   </form>
 
-  <div id="manage_icons" id="icons">
+  <div class="manage_images">
+    <div class="manage_images_2">
     {% for icon in icons %}
-      <img class="icon" src="{{ url_for('static', filename='icons/'+icon[2]) }}">
+      <div class="manage_icons_3">
-      <br class="clear" />
+        <img class="icon" src="{{ url_for('static', filename='icons/'+icon[2]) }}">
-      <a href="{{ url_for('manage.set_main_icon', mid=member[0], icon_id=icon[0]) }}">Set Main Icon</a> &#9734 <a href="{{ url_for('manage.delete_icon', mid=member[0], icon_id=icon[0]) }}">Delete Icon</a>
+        <br class="clear" />
-      <br class="clear" />
+        <a href="{{ url_for('manage.set_main_icon', mid=member[0], icon_id=icon[0]) }}">Set Main Icon</a> &#9734 <a href="{{ url_for('manage.delete_icon', mid=member[0], icon_id=icon[0]) }}">Delete Icon</a>
-      <hr>
+        <br class="clear" />
+      </div>
     {% endfor %}
+    </div>
   </div>
 
 
@@ -81,9 +84,17 @@
       <input type="submit" value="Upload to Blinkies">
   </form>
 
+  <div class="manage_images">
+    <div class="manage_images_2">
   {% for blinkie in blinkies %}
-      <img src="{{ url_for('static', filename='blinkies/'+blinkie[2]) }}">
+      <div class="manage_blinkies_3">
+        <img src="{{ url_for('static', filename='blinkies/'+blinkie[2]) }}">
+        <br class="clear" />
+        <a href="{{ url_for('manage.delete_blinkie', mid=member[0], blinkie_id=blinkie[0]) }}">Delete</a>
+      </div>
     {% endfor %}
+    </div>
+  </div>
   
 
   <div class="heading">Manage Stamps</div>
@@ -92,9 +103,17 @@
       <input type="submit" value="Upload to Stamps">
   </form>
 
+  <div class="manage_images">
+    <div class="manage_images_2">
   {% for stamp in stamps %}
+    <div class="manage_stamps_3">
       <img src="{{ url_for('static', filename='stamps/'+stamp[2]) }}">
+      <br class="clear" />
+      <a href="{{ url_for('manage.delete_stamp', mid=member[0], stamp_id=stamp[0]) }}">Delete</a>
+    </div>
     {% endfor %}
+    </div>
+  </div>