enter captchas on webui

3 files changed, 28 insertions, 5 deletions

diff --git a/module/web/templates/default/backbone/modal.html b/module/web/templates/default/backbone/modal.html
index d1186d40a..ed618f3d0 100755
--- a/module/web/templates/default/backbone/modal.html
+++ b/module/web/templates/default/backbone/modal.html
@@ -4,7 +4,7 @@
 </div>

 <div class="modal-body">

     {% block content %}

-    <%= content %>

+    <% content %>

     {% endblock %}

 </div>

 <div class="modal-footer">

diff --git a/module/web/templates/default/backbone/queryDialog.html b/module/web/templates/default/backbone/queryDialog.html
new file mode 100755
index 000000000..a37ac6256
--- /dev/null
+++ b/module/web/templates/default/backbone/queryDialog.html
@@ -0,0 +1,25 @@
+{% extends 'default/backbone/modal.html' %}
+{% block header %}
+    <% title %>
+    <small style="background: url('icons/<% plugin %>') no-repeat right 0; background-size: 20px; padding-right: 22px">
+        <% plugin %>
+    </small>
+{% endblock %}
+{% block content %}
+    <form class="form-horizontal" action="#">
+        <legend><% description %></legend>
+        <div class="control-group">
+            <%= if captcha %>
+            <label class="control-label" for="inputText"><img src="data:image/<% type %>;base64,<% captcha %>"></label>
+            <div class="controls">
+                <input type="text" id="inputText" name="captcha">
+            </div>
+            <%/if%>
+            <% content %>
+        </div>
+    </form>
+{% endblock %}
+{% block buttons %}
+    <a href="#" class="btn btn-success">Submit</a>
+    <a href="#" class="btn btn-close">Close</a>
+{% endblock %}
\ No newline at end of file
diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html
index dfcfb9e3a..846b396a0 100644
--- a/module/web/templates/default/base.html
+++ b/module/web/templates/default/base.html
@@ -50,11 +50,12 @@
         <%/if%>

         <i class="iconf-list pull-right"></i>

 

+{#  TODO: active animation      #}

         <div class="progress" id="globalprogress">

             <%= if single %>

                 <div class="bar" style="width: <% percent %>%">

             <% else %>

-                <div class="bar" style="width: 0%">

+                <div class="bar <%= if downloads %>running<%/if%>">

             <%/if%>

             </div>

         </div>

@@ -103,9 +104,6 @@
         Notifications <span class="badge badge-success"><% notifications %></span>

         </span>

         <%/if%>

-        <%= if empty %>

-        Nothing to show

-        <%/if%>

     </%if%>

     </script>