浏览代码

re-added ability to delete room \ minor edits to FAQ

Akira Laine 9 年之前
父节点
当前提交
11ae4d0c63
共有 3 个文件被更改,包括 14 次插入6 次删除
  1. 6 0
      app/client/scripts/events.js
  2. 1 6
      app/client/templates/faq.html
  3. 7 0
      app/client/templates/manageStation.html

+ 6 - 0
app/client/scripts/events.js

@@ -894,6 +894,12 @@ Template.manageStation.events({
         var query = {room: id.toLowerCase()};
         var obj = $(this)[0];
         Meteor.call("removeReport", query, obj);
+    },
+    "click #deleteRoom": function(){
+        var type = location.href.split("/")[3];
+        Meteor.call("deleteRoom", type, function(err,res){
+            window.location.href = "/";
+        })
     }
 });
 

+ 1 - 6
app/client/templates/faq.html

@@ -28,7 +28,7 @@
                 </li>
                 <li>
                     <div class="collapsible-header"><i class="material-icons">help</i>How do I reset my password?</div>
-                    <div class="collapsible-body"><p>You currently can't manually reset your password. If you want to reset your password, please send an email to <a href="mailto:krisvos130@gmail.com">krisvos130@gmail.com</a> asking for a password reset. We will then set your password to something else.</p></div>
+                    <div class="collapsible-body"><p>Go to the <a href="/settings">settings</a> page. You will be able to reset your password there.</p></div>
                 </li>
                 <li>
                     <div class="collapsible-header"><i class="material-icons">help</i>What are the username requirements?</div>
@@ -96,11 +96,6 @@
                     <div class="collapsible-header"><i class="material-icons">help</i>How can I add a song?</div>
                     <div class="collapsible-body"><p>You can add a song if you are logged in, by clicking on the Add Song button under the video in the station you want to add your song in. That will open up a modal where you can search search for a song by putting a search query there or by putting a link in there and clicking the Search Song button. You can then edit some more information, like the artist and title. It's helpful for us if you fill those in so we don't have to research every song, but you are not required to. You can also import playlists from YouTube.</p></div>
                 </li>
-                <h5>Social Media</h5>
-                <!--li>
-                    <div class="collapsible-header"><i class="material-icons">help</i>Where else can I connect with the Musare community?</div>
-                    <div class="collapsible-body"><p></p></div>
-                </li-->
                 <h5>Technical</h5>
                 <li>
                     <div class="collapsible-header"><i class="material-icons">help</i>Why is the song info wrong?</div>

+ 7 - 0
app/client/templates/manageStation.html

@@ -85,8 +85,15 @@
                     </table>
                 </div>
             </div>
+            <div class="col m12 s12 l8 offset-l2 admin-playlist-panel card-panel teal accent-3">
+                <div class="card-content white-text">
+                    <h3 class="text-center">Delete Room</h3>
+                    <a id="deleteRoom" class="waves-effect waves-light btn red" style="margin-bottom: 10px">Delete Room</a>
+                </div>
+            </div>
         </div>
     </div>
+
     <div id="editModal" class="modal modal-fixed-footer">
         <div class="modal-content musare white-text">
             <div class="row">