Merge 419f847 into bd77de2

dimagi · Jan 15, 2016 · 03e4c67 · 03e4c67
2 parents bd77de2 + 419f847
commit 03e4c67
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 22 deletions.
diff --git a/couchlog/config.py b/couchlog/config.py
@@ -33,11 +33,7 @@
                                     "https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.7/jquery-ui.min.js")
 COUCHLOG_JQUERYUI_CSS_LOC = getattr(settings, "COUCHLOG_JQUERYUI_CSS_LOC", 
                                     "https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.7/themes/smoothness/jquery-ui.css")
-COUCHLOG_JQMODAL_LOC = getattr(settings, "COUCHLOG_JQMODAL_LOC", 
-                                   "http://dev.iceburg.net/jquery/jqModal/jqModal.js")
-COUCHLOG_JQMODAL_CSS_LOC = getattr(settings, "COUCHLOG_JQMODAL_CSS_LOC", 
-                                   "http://dev.iceburg.net/jquery/jqModal/jqModal.css")
 COUCHLOG_DATATABLES_LOC = getattr(settings, "COUCHLOG_DATATABLES_LOC", 
                                   "http://www.datatables.net/download/build/jquery.dataTables.min.js")
 COUCHLOG_BLUEPRINT_HOME = getattr(settings, "COUCHLOG_BLUEPRINT_HOME", 
-                                  "https://github.com/joshuaclayton/blueprint-css/raw/master/blueprint/")
+                                  "https://github.com/joshuaclayton/blueprint-css/raw/master/blueprint/")
diff --git a/couchlog/static/couchlog/js/logtable.js b/couchlog/static/couchlog/js/logtable.js
@@ -58,7 +58,7 @@ function init_log_table(filter, id_column, archived_column, date_column,
                         } else {
                             display = oObj.aData[message_column];
                         }
-                        return '<a href="' + single_url_base + oObj.aData[0] + '" onclick="$(\'#modal-placeholder\').jqmShow($(this)); return false;"  class="logview">' + display +'</a>';
+                        return '<a href="' + single_url_base + oObj.aData[0] + '" target="_blank" class="logview">' + display +'</a>';
                     },
                     "aTargets": [message_column]
                 }, 
@@ -89,4 +89,4 @@ function init_log_table(filter, id_column, archived_column, date_column,
                 { "sWidth": "11em", "aTargets": [ actions_column ] }
         ]
     });
-}
+}
diff --git a/couchlog/templates/couchlog/ajax/single.html b/couchlog/templates/couchlog/ajax/single.html
@@ -27,8 +27,5 @@
     <tr><td>{{ item }}:&nbsp;&nbsp;</td><td><strong>{{ log|get_attr:item|default:"N/A" }}</strong></td></tr>
 {% endfor %}
   </table>
-<div class="nav">
-    <a href="{% url 'couchlog_single' log.get_id %}" target="_blank">new window</a>
 </div>
-</div>
-</body>
+</body>
diff --git a/couchlog/templates/couchlog/dashboard.html b/couchlog/templates/couchlog/dashboard.html
@@ -7,7 +7,6 @@
 {% block javascripts %}
     {% include "couchlog/imports/jquery.html" %}
     {% include "couchlog/imports/jquery-ui.html" %}
-    {% include "couchlog/imports/jqmodal.html" %}
     {% include "couchlog/imports/datatables.html" %}
 {% endblock %}
 {% block page_javascripts %}
@@ -149,13 +148,6 @@
                 });
     });
     </script>
-    <script type="text/javascript">
-    // this one allows the log viewer to pop up
-    $().ready(function() {
-        $('#modal-placeholder').jqm({ajax: '@href', trigger: 'a.logview', 
-                                     ajaxText: "Please wait while we load that for you..." });
-    });
-    </script>
 {% endblock %}
 {% block content %}
 {% if lucene_enabled %}
@@ -187,7 +179,6 @@ <h3>Exception Records</h3>
 <tbody>
 </tbody>
 </table>
-<div class="jqmWindow" id="modal-placeholder"></div>
 <input type="hidden" id="startkey" value="{{startkey}}"></input>
 <input type="hidden" id="endkey" value="{{endkey}}"></input>
 <div id="email-form" title="Report error">

diff --git a/couchlog/templates/couchlog/imports/jqmodal.html b/couchlog/templates/couchlog/imports/jqmodal.html