Require logins, removed jquery UI

6 files changed, 129 insertions, 46 deletions

diff --git a/apps/it/templates/default.html b/apps/it/templates/default.html
index 08bde0f..c163995 100755
--- a/apps/it/templates/default.html
+++ b/apps/it/templates/default.html
@@ -10,7 +10,7 @@
   <title>IT</title>

 

   <!-- Core CSS - Include with every page -->

-  <link href="{{ STATIC_URL }}js/ui/themes/base/jquery-ui.css" rel="stylesheet">

+  <link href="http://code.jquery.com/ui/1.10.4/themes/smoothness/jquery-ui.css" rel="stylesheet"></link>

   <link href="{{ STATIC_URL }}css/bootstrap.min.css" rel="stylesheet">

   <link href="{{ STATIC_URL }}font-awesome/css/font-awesome.css" rel="stylesheet">

 

@@ -225,12 +225,7 @@
             <i class="fa fa-user fa-fw"></i>  <i class="fa fa-caret-down"></i>

           </a>

           <ul class="dropdown-menu dropdown-user">

-            <li><a href="#"><i class="fa fa-user fa-fw"></i> User Profile</a>

-            </li>

-            <li><a href="#"><i class="fa fa-gear fa-fw"></i> Settings</a>

-            </li>

-            <li class="divider"></li>

-            <li><a href="login.html"><i class="fa fa-sign-out fa-fw"></i> Logout</a>

+            <li><a href="{% url 'logout' %}"><i class="fa fa-sign-out fa-fw"></i> {% trans "Logout" %}</a>

             </li>

           </ul>

           <!-- /.dropdown-user -->

@@ -259,8 +254,8 @@
             <a href="{% url 'home' %}?state=NEW"><i class="fa fa-dashboard fa-fw"></i> {% trans "Issues" %} <span class="badge pull-right">{% new_issue_count request %}</span></a>

           </li>

           <li><a href="{% url 'list_stuff' %}?kind=SERVER"><i class="fa fa-hdd-o fa-fw"></i> {% trans "Assets" %} <span class="badge pull-right">{% new_asset_count request %}</span></a></li>

-          <li><a href="{% url 'home' %}"><i class="fa fa-book fa-fw"></i> {% trans "Documentation" %}</a></li>

-          <li><a href="{% url 'home' %}"><i class="fa fa-users fa-fw"></i> Users</a></li>

+          <li><a href="{% url 'docs' %}"><i class="fa fa-book fa-fw"></i> {% trans "Documentation" %}</a></li>

+          <li><a href="{% url 'users' %}"><i class="fa fa-users fa-fw"></i> {% trans "Users" %}</a></li>

         </ul>

         <!-- /#side-menu -->

       </div>

@@ -298,7 +293,7 @@
   <script src="{{ STATIC_URL }}js/dropzone.js"></script>

   <script src="{{ STATIC_URL }}js/bootstrap.min.js"></script>

   <script src="{{ STATIC_URL }}js/plugins/metisMenu/jquery.metisMenu.js"></script>

-  <script src="{{ STATIC_URL }}js/ui/ui/minified/jquery-ui.min.js"></script>

+  <script src="http://code.jquery.com/ui/1.10.4/jquery-ui.js"></script>

 

   <!-- Page-Level Plugin Scripts - Blank -->

 

@@ -306,39 +301,7 @@
   <script src="{{ STATIC_URL }}js/sb-admin.js"></script>

 

   <!-- Page-Level Demo Scripts - Blank - Use for reference -->

-  <script type="text/javascript">

-    $('.media').hover(

-    function(){

-      $(this).find('.btn-group').fadeIn();

-    },

-    function(){

-      $('.btn-group').fadeOut();

-    });

-    Dropzone.options.myAwesomeDropzone = {

-      paramName: "attachment", // The name that will be used to transfer the file

-      maxFilesize: 2, // MB

-    };

-    $('.confirm').click(function(e){

-      if(confirm('Are you sure?')) {

-        return true;

-      }

-      e.preventDefault();

-    });

-    $('.searchfield').on('keyup', function(e){

-      if(e.keyCode == 13) {

-        document.location = '/search/?q=' + $(this).val();

-      }

-    });

-    $('.autocomplete').each(function(i, e){

-      $(e).autocomplete({source: $(e).data('source')});

-    });

-    $('.draggable').draggable({opacity: 0.75, zIndex: 100, cursor: 'pointer'});

-    $('.dragarea').droppable({

-      out: function(e, ui) {

-        $.ajax($(ui.draggable).data('destroy'));

-        $(ui.draggable).remove();

-    }});

-  </script>

+  <script type="text/javascript" src="{{ STATIC_URL }}js/it.js"></script>

   </body>

 

 </html>

diff --git a/apps/it/templates/docs.html b/apps/it/templates/docs.html
new file mode 100644
index 0000000..22243fc
--- /dev/null
+++ b/apps/it/templates/docs.html
@@ -0,0 +1,32 @@
+{% extends "default.html" %}
+{% load bootstrap3 %}
+{% load humanize %}
+{% load it_tags %}
+{% load i18n %}
+
+{% block main %}
+{% for i in object_list %}
+    <div class="media">
+      <a class="pull-left" href="#">
+        <img class="media-object img-thumbnail" src="{{ STATIC_URL }}images/bubble-128.png" alt="...">
+      </a>
+      <div class="media-body">
+        <h5 class="media-heading pull-left">
+          <i class="fa fa-user fa-fw"></i> <span>{{ i.created_by }}</span> <i class="fa fa-clock-o fa-fw"></i> {{ i.created_at|naturaltime }}
+        </h5>
+        <div class="btn-group pull-right" style="display:none">
+          <button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown">
+            <i class="fa fa-cog"></i> 
+            <span class="caret"></span>
+          </button>
+          <ul class="dropdown-menu" role="menu">
+            <li><a href="{% url 'edit_task' issue.pk i.pk %}">{% trans "Edit" %}</a></li>
+            <li><a href="{% url 'delete_issue' issue.pk %}" class="confirm">{% trans "Delete" %}</a></li>
+          </ul>
+        </div>
+        <div class="clearfix"></div>
+        {{ i.description|markdown }}
+      </div>
+    </div>
+{% endfor %}
+{% endblock main %}
diff --git a/apps/it/templates/generic_list.html b/apps/it/templates/generic_list.html
new file mode 100644
index 0000000..af23b56
--- /dev/null
+++ b/apps/it/templates/generic_list.html
@@ -0,0 +1,24 @@
+{% extends "default.html" %}
+{% load bootstrap3 %}
+{% load i18n %}
+
+{% block main %}
+<table>
+  <tbody>
+{% for i in object_list %}
+  <tr>
+    <td>{{ i.email }}</td>
+  </tr>
+{% endfor %}
+  </tbody>
+</table>
+
+{% endblock main %}
+
+{% block inspector %}
+<form method="post" action="">
+  {% csrf_token %}
+  {% bootstrap_form form %}
+  <button class="btn btn-default btn-primary pull-right">{% trans "Add User" %}</button>
+</form>
+{% endblock inspector %}
diff --git a/apps/it/templates/login.html b/apps/it/templates/login.html
new file mode 100755
index 0000000..03d4656
--- /dev/null
+++ b/apps/it/templates/login.html
@@ -0,0 +1,57 @@
+{% load i18n %}

+{% load bootstrap3 %}

+<!DOCTYPE html>

+<html>

+

+<head>

+

+  <meta charset="utf-8">

+  <meta name="viewport" content="width=device-width, initial-scale=1.0">

+

+  <title>IT Login</title>

+

+  <!-- Core CSS - Include with every page -->

+  <link href="{{ STATIC_URL }}css/bootstrap.min.css" rel="stylesheet">

+  <link href="{{ STATIC_URL }}font-awesome/css/font-awesome.css" rel="stylesheet">

+

+  <!-- SB Admin CSS - Include with every page -->

+  <link href="{{ STATIC_URL }}css/sb-admin.css" rel="stylesheet">

+

+</head>

+

+<body>

+

+  <div class="container">

+    <div class="row">

+      <div class="col-md-4 col-md-offset-4">

+        <div class="login-panel panel panel-default">

+          <div class="panel-heading">

+            <h3 class="panel-title">{% trans "Please Sign In" %}</h3>

+          </div>

+          <div class="panel-body">

+            {% bootstrap_messages %}

+            <form role="form" action="" method="post">

+              {% csrf_token %}

+              <fieldset>

+                {% bootstrap_form form %}

+                <!-- Change this to a button or input when using this as a form -->

+                <button class="btn btn-lg btn-success btn-block" type="submit">{% trans "Login" %}</button>

+              </fieldset>

+            </form>

+          </div>

+        </div>

+      </div>

+    </div>

+  </div>

+

+  <!-- Core Scripts - Include with every page -->

+  <script src="{{ STATIC_URL }}js/jquery-1.10.2.js"></script>

+  <script src="{{ STATIC_URL }}js/bootstrap.min.js"></script>

+  <script src="{{ STATIC_URL }}js/plugins/metisMenu/jquery.metisMenu.js"></script>

+

+  <!-- SB Admin Scripts - Include with every page -->

+  <script src="{{ STATIC_URL }}js/sb-admin.js"></script>

+

+</body>

+

+</html>

diff --git a/apps/it/templates/view_asset.html b/apps/it/templates/view_asset.html
new file mode 100644
index 0000000..090eb8f
--- /dev/null
+++ b/apps/it/templates/view_asset.html
@@ -0,0 +1,7 @@
+{% extends "default.html" %}
+
+{% block main %}
+<div class="page-header">
+  <h1>{{ asset.name }}</h1>
+</div>
+{% endblock main %}
diff --git a/apps/it/templates/view_issue.html b/apps/it/templates/view_issue.html
index b528aa8..b60afb2 100644
--- a/apps/it/templates/view_issue.html
+++ b/apps/it/templates/view_issue.html
@@ -30,9 +30,9 @@
     <img class="media-object img-thumbnail" src="{{ STATIC_URL }}images/bubble-128.png" alt="...">
   </a>
   <div class="media-body">
-    <h4 class="media-heading pull-left">
-      <span>{{ i.created_by }}</span> <i class="fa fa-clock-o fa-fw"></i> {{ i.created_at|naturaltime }}
-    </h4>
+    <h5 class="media-heading pull-left">
+      <i class="fa fa-user fa-fw"></i> <span>{{ i.created_by }}</span> <i class="fa fa-clock-o fa-fw"></i> {{ i.created_at|naturaltime }}
+    </h5>
     <div class="btn-group pull-right" style="display:none">
       <button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown">
         <i class="fa fa-cog"></i>