Fixed nav toggle

Removed campaign_results.html template (not needed - covered in AngularJS template now)

static/css/flat-ui.css

@@ -1962,17 +1962,6 @@ fieldset[disabled] .input-group-btn .btn-default.active {
   height: 53px;
   line-height: 53px;
 }
-.navbar-toggle:before {
-  color: #16a085;
-  content: "\e00c";
-  font-family: "Flat-UI-Icons";
-  font-size: 22px;
-  font-style: normal;
-  font-weight: normal;
-  -webkit-font-smoothing: antialiased;
-  -webkit-transition: color 0.25s linear;
-  transition: color 0.25s linear;
-}
 .navbar-toggle:hover,
 .navbar-toggle:focus {
   outline: none;
@@ -1981,9 +1970,6 @@ fieldset[disabled] .input-group-btn .btn-default.active {
 .navbar-toggle:focus:before {
   color: #1abc9c;
 }
-.navbar-toggle .icon-bar {
-  display: none;
-}
 @media (min-width: 768px) {
   .navbar-toggle {
     display: none;

static/js/app/controllers.js

@@ -329,7 +329,6 @@ app.controller('TemplateCtrl', function($scope, $modal, TemplateService, ngTable
 })
 
 var TemplateModalCtrl = function($scope, $modalInstance) {
-    console.log($scope.template)
     $scope.cancel = function() {
         $modalInstance.dismiss('cancel');
     };

templates/base.html

@@ -49,6 +49,16 @@
             </div>
             <div class="navbar-collapse collapse">
                 <ul class="nav navbar-nav navbar-right">
+                    <li><a href="#/">Dashboard</a>
+                    </li>
+                    <li><a href="#/users">Users &amp; Groups</a>
+                    </li>
+                    <li><a href="#/templates">Templates</a>
+                    </li>
+                    <li><a href="#/settings">Settings</a>
+                    </li>
+                    <li><a href="/api/">API Documentation</a>
+                    </li>
                     <li>
                         {{%if .User%}}
                         <div class="btn-group" id="navbar-dropdown">

templates/campaign_results.html

@@ -1,56 +0,0 @@
-{{% define "content" %}} {{% template "nav" .User %}}
-<div class="jumbotron">
-    <div class="container" style="text-align:center;">
-        <h1 class="sans header">
-            Dashboard
-        </h1>
-    </div>
-</div>
-<div class="container">
-    <div class="col-md-3 sidebar">
-        <ul class="nav nav-pills nav-stacked">
-            <li class="active"><a href="/">Dashboard</a>
-            </li>
-            <li><a href="/users">Users &amp; Groups</a>
-            </li>
-            <li><a href="/templates">Templates</a>
-            </li>
-            <li><a href="/settings">Settings</a>
-            </li>
-            <li><a href="/api/">API Documentation</a>
-            </li>
-        </ul>
-    </div>
-    <div class="col-md-9" ng-controller="CampaignResultsCtrl">
-        <div class="row">
-        <h1 style="margin-top:0px;">Results for {{campaign.name}}</h1>
-        </div>
-        <div class="row">
-            <div class="btn-group">
-                <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
-                    <i class="fa fa-cogs fa-lg"></i> 
-                    <span class="caret"></span>
-                </button>
-                <ul class="dropdown-menu">
-                    <li><a href="#">Export</a>
-                    </li>
-                    <li><a href="#">Relaunch</a>
-                    </li>
-                </ul>
-            </div>
-            <button type="button" class="btn btn-danger" tooltip="Delete Campaign" tooltip-placement="right"><i class="fa fa-times fa-lg"></i></button>
-        </div>
-        &nbsp;
-        <div class="row">
-            <table ng-table="mainTableParams" class="table table-hover table-striped table-bordered">
-                <tbody>
-                    <tr ng-repeat="result in $data" class="editable-row">
-                        <td data-title="'Email'" class="col-sm-1">{{result.email}}</td>
-                        <td data-title="'Status'" class="col-sm-2">{{result.status}}</td>
-                    </tr>
-                </tbody>
-            </table>
-        </div>
-    </div>
-</div>
-{{% end %}}