close #67 and #68

ninuxorg · Jan 30, 2012 · 6753316 · 6753316
1 parent 33a46bd
commit 6753316
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/media/js/compressed/nodeshot.js b/media/js/compressed/nodeshot.js
diff --git a/media/js/nodeshot.js b/media/js/nodeshot.js
@@ -1058,6 +1058,8 @@ var nodeshot = {
                 }
                 // if success
                 else {
+                    // restore "Add new node" text
+                    nodeshot.layout.$addNode.find('span.maponly').text(i18n.ADDNODE);
                     // fade out overlay
                     nodeshot.layout.$overlayInner.fadeOut(500, function(){
                         // send a nice message to the user

diff --git a/nodeshot/views.py b/nodeshot/views.py
@@ -234,13 +234,8 @@ def overview(request):
     Overview about the wireless network. Device status and link performance for the entire network.
     This is quite database expensive. Use with caution. Needs caching.
     """
-    # if request is sent with ajax
-    if request.is_ajax():
-        # just load the fragment
-        template = 'ajax/overview.html'
-    # otherwise if request is sent normally
-    else:
-        template = 'overview.html'
+    # load always frament only
+    template = 'ajax/overview.html'
 
     devices = Device.objects.all().order_by('node__name', 'added').select_related().only('name', 'type', 'node__name', 'node__status', 'node__slug');
     new_devices = []