templates html review

erkobridee · Nov 7, 2013 · 8dc7df5 · 8dc7df5
1 parent ea3469b
commit 8dc7df5
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 18 deletions.
diff --git a/app/about/tpl.html b/app/about/tpl.html
@@ -10,20 +10,28 @@
   <li>
     CSS Framework: <a href="http://getbootstrap.com/">Twitter Bootstrap</a> v3
     <ul>
-      <li><a href="http://getbootstrap.com/css/?#tables" target="_blank">Table</a></li>
-      <li><a href="http://getbootstrap.com/css/?#forms" target="_blank">Form</a></li>
+      <li>
+        <a href="http://getbootstrap.com/css/?#grid" target="_blank">Grid System</a> | 
+        <a href="http://getbootstrap.com/css/?#tables" target="_blank">Table</a> | 
+        <a href="http://getbootstrap.com/css/?#forms" target="_blank">Form</a> | 
+        <a href="http://getbootstrap.com/css/?#responsive-utilities" target="_blank">Responsive utilities</a>
+        <br><br>
+      </li>
     </ul>
   </li>
+
   <li>
     JavaScript Framework: <a href="http://angularjs.org/">Angularjs</a> v1.1.5
     <ul>
-      <li><a href="http://code.angularjs.org/1.1.5/docs/api/ng.$location" target="_blank">$location</a></li>
-      <li><a href="http://code.angularjs.org/1.1.5/docs/api/ngResource.$resource" target="_blank">$resource</a></li>
+      <li>Angular API Docs: 
+        <a href="http://code.angularjs.org/1.1.5/docs/api/ng.$location" target="_blank">$location</a> | 
+        <a href="http://code.angularjs.org/1.1.5/docs/api/ngResource.$resource" target="_blank">$resource</a>
+      </li>
       <li><a href="http://victorbjelkholm.github.io/ngProgress/" target="blank">ngProgress</a> A slim, site-wide progressbar for AngularJS</li>
-      <!-- <li></li> -->
     </ul>
   </li>
 </ul>
+<br>
 
     </li>
     <li>Backend

diff --git a/app/bookmarks/tpl.edit.html b/app/bookmarks/tpl.edit.html
@@ -7,10 +7,7 @@
   <div class="row">
 
 <div class="container">
-  <!-- 
-    Bootstrap v3 : form example 
-    http://bootply.com/82900
-  -->
+
   <form role="form" name="bookmarkForm">
     <div class="row" ng-class="{'has-error': bookmarkForm.name.$invalid}">
       <div class="col-md-1">
@@ -50,20 +47,32 @@
           name="description" ng-model="bookmark.description"></textarea>
       </div>
     </div>
-    <div class="row">&nbsp;</div>
-    <div class="row">
+
+    <div class="row" ng-hide="showConfirm">&nbsp;</div>
+
+    <div class="row" ng-hide="showConfirm">
       <div class="col-md-5">
         <a href="#bookmarks" class="btn">Cancel</a>
         <button 
           ng-click="save()" 
           ng-disabled="isClean() || bookmarkForm.$invalid"
           class="btn btn-primary">Save</button>
         <button 
-          ng-click="destroy()"
+          ng-click="delete()"
           ng-show="bookmark.id" 
           class="btn btn-danger">Delete</button>
       </div>
     </div>
+
+    <div class="bs-callout bs-callout-danger" ng-show="showConfirm">
+      <h4>Confirm</h4>
+      <p>Delete <code>{{bookmark.name}}</code> bookmark?</p>
+      <button ng-click="destroy()"
+        class="btn btn-danger">Delete</button>
+      <button ng-click="cancelDelete()"
+        class="btn btn-default">Cancel</button>  
+    </div>
+
   </form>
 </div>
 

diff --git a/app/main/layout/navbar.tpl.html b/app/main/layout/navbar.tpl.html
@@ -12,12 +12,6 @@
     <div class="navbar-collapse collapse">
 
       <!-- navbar left -->
-      <!--
-      <ul class="nav navbar-nav"> 
-        <li class="active"><a href="#bookmarks">Bookmarks</a></li>
-        <li><a href="#about">About</a></li>
-      </ul>
-      -->
       <ul class="nav navbar-nav" ng-repeat="item in menuItems"> 
         <li class="{{item.css}}"><a href="{{item.url}}">{{item.label}}</a></li>         
       </ul>