Brandon: Prior to post-beta edits.

SMU-SIS · Aug 14, 2013 · 8ea5086 · 8ea5086
1 parent 6d69fce
commit 8ea5086
Show file tree

Hide file tree

Showing 31 changed files with 407 additions and 319 deletions.
diff --git a/app.yaml b/app.yaml
@@ -1,5 +1,5 @@
 application: k-sketch-test
-version: 13
+version: 15
 runtime: python27
 api_version: 1
 threadsafe: false

diff --git a/app/console.html b/app/console.html
@@ -119,8 +119,8 @@ <h3 id="myUploadItems">{{heading}}</h3>
       <div class="navbar-inner">
         <div class="container-fluid" ng-cloak>
           <!-- a class="brand" id="logo" href="#"><img style="height:36px" src="ico/KSketch-logo.png"></a -->
-          <a class="brand" id="logo" href=" index.html">K-Sketch</a>
-          <ul class="nav">
+          <a class="brand" id="logo" href=" index.html" title="Return to K-Sketch">K-Sketch</a>
+          <ul class="nav" ng-cloak>
             <li>
               <!--Username and profile link goes here.-->
               <a ng-show="User.u_login" ng-cloak href="profile.html?id={{User.id}}" class="navbar-link"><span id="heading">Hello, {{User.u_name}}!</span></a>
@@ -133,9 +133,11 @@ <h3 id="myUploadItems">{{heading}}</h3>
               <a href="/user/logout">Logout</a>
             </li>
           </ul>                 
-          <p class="navbar-text pull-right">
-            <a href="/app/console.html"><span style="font-weight:bold">Administrator Console</span></a>
-          </p>
+          <ul class="nav pull-right">
+            <li>
+              <a href="/app/console.html"><span style="font-weight:bold">Administrator Console</span></a>
+            </li>
+          </ul>
         </div>
       </div>
     </div>
@@ -691,8 +693,13 @@ <h4>{{selecteduserdata.u_name}}'s Sketches</h4>
                                 <br>
                               </div>
                             </td>
-                            <td>{{files.data.fileName}}</td>    
-                            <td>{{files.data.changeDescription}}</td>
+                            <td>{{files.data.fileName}}</td>                   
+                            <td ui-if="files.data.changeDescription.length > 50" title="{{files.data.changeDescription}}" ng-cloak>
+                              {{files.data.changeDescription.substring(0, 49)}}...
+                            </td>
+                            <td ui-if="files.data.changeDescription.length <= 50" ng-cloak>
+                              {{files.data.changeDescription}}
+                            </td>
                             <td>{{tzformat(files.created)}}</td>
                             <td>{{files.data.appver.toFixed(1)}}</td>
                             <td>

diff --git a/app/css/additional.css b/app/css/additional.css
@@ -22,6 +22,12 @@
       min-height: 300px;
     }
 
+    #group_permissions {
+      width: 300px;
+      height: 350px;
+      overflow-y: scroll;
+    }
+
     /*LoadingDiv*/
     /*IE will need an 'adjustment'*/
     * html #LoadingDiv{
@@ -63,10 +69,6 @@
       _height: expression(document.body.offsetHeight + "px");
       background-color: rgba(216, 216, 216, 0.5);
     }
-
-    #logo {
-        /*padding: 0px 5px 0px;*/
-    }
 
     #main {
       overflow: hidden;
@@ -86,7 +88,7 @@
 
     .navbar-text{
       margin-bottom: 0;
-      margin-top: 10px;
+      margin-top: -10px;
       line-height: 40px;
       color: #777;
     }
@@ -96,6 +98,14 @@
       margin-top: 12px;
       margin-bottom: 0;
     }
+
+    .navbar-search > .search-query {
+      margin-top: -9px;
+    }
+
+    .navbar-search > .btn {
+      margin-top: -9px;
+    }
 
     #profile_img {
       position: relative;
@@ -104,6 +114,12 @@
       min-width: 100%;
     }
 
+    #sketchDisplay {
+      width: 150px;
+      height: 100px;
+      resize: none;
+    }
+
     #sketchDescription {
       width: 300px;
       height: 100px;
@@ -136,6 +152,10 @@
       overflow-y: hidden; 
     }
 
+/*     .search-query {
+    
+    } */
+
     .sidebar-nav {
       padding: 9px 0;
     }      
@@ -192,6 +212,12 @@
 
     /*Responsive*/
 
+    @media (min-width: 980px) {
+      #logo {
+        padding: 0px 20px 10px;
+      }
+    }
+
 	  @media (max-width: 979px) {
       .sidebar-nav-fixed {
         top:70px;

diff --git a/app/groups.html b/app/groups.html
@@ -137,7 +137,7 @@ <h3 id="myUploadItems">{{heading}}</h3>
         <div class="container-fluid" ng-cloak>
           <!-- a class="brand" id="logo" href="#"><img style="height:36px" src="ico/KSketch-logo.png"></a -->
           <a class="brand" id="logo" href=" index.html">K-Sketch</a>
-          <ul class="nav">
+          <ul class="nav" ng-cloak>
             <li>
               <!--Username and profile link goes here.-->
               <a ng-show="User.u_login" ng-cloak href="profile.html?id={{User.id}}" class="navbar-link"><span id="heading">Hello, {{User.u_name}}!</span></a>
@@ -216,7 +216,6 @@ <h3 id="myUploadItems">{{heading}}</h3>
 
               <li id="sc" ng-show="User.u_login" ng-cloak><a title="View personal profile, sketches and group memberships" href="profile.html?id={{User.id}}">My Sketchbook</a></li>
               <li id="cs"><a title="Open editor to create a new sketch" href="sketch.html">Create a Sketch</a></li>
-              <li id="vs"><a title="Search for sketch" href="search.html">Search for Sketch</a></li>
             </ul>
           </div><!--/.well -->
         </div><!--/span-->
@@ -264,7 +263,12 @@ <h2>Group Members</h2>
                       </thead>
                       <tbody>
                         <tr ng-repeat="users in u_groups">
-                          <td><a ng-show="User.u_login" ng-cloak href="profile.html?id={{users.user_id}}">{{users.user}}</a></td>
+                          <td>
+                            <a ng-cloak href="profile.html?id={{users.user_id}}">
+                              <img id="comment_img" src="https://secure.gravatar.com/avatar/{{users.g_hash}}?s=200&r=pg&d=mm" />
+                              <span>{{users.user}}</span>
+                            </a>
+                          </td>
                           <td>{{users.role}}</td>
                         </tr>
                       </tbody>
@@ -300,8 +304,13 @@ <h2>Group Sketches</h2>
                               <span>No preview available</span>
                             </div>
                           </td>
-                          <td>{{files.data.fileName}}</td>  
-                          <td>{{files.data.changeDescription}}</td>
+                          <td>{{files.data.fileName}}</td>                  
+                          <td ui-if="files.data.changeDescription.length > 50" title="{{files.data.changeDescription}}" ng-cloak>
+                            {{files.data.changeDescription.substring(0, 49)}}...
+                          </td>
+                          <td ui-if="files.data.changeDescription.length <= 50" ng-cloak>
+                            {{files.data.changeDescription}}
+                          </td>
                           <td>{{tzformat(files.created)}}</td>
                           <td ng-cloak>
                             <a class="btn btn-info btn-small" href="view.html?id={{files.data.sketchId}}&version={{files.data.version}}">View</a>

diff --git a/app/index.html b/app/index.html
@@ -98,7 +98,7 @@ <h3 id="myUploadItems">{{heading}}</h3>
         <div class="container-fluid" ng-cloak>
           <!-- a class="brand" id="logo" href="#"><img style="height:36px" src="ico/KSketch-logo.png"></a -->
           <a class="brand" id="logo" href=" index.html">K-Sketch</a>
-          <ul class="nav">
+          <ul class="nav" ng-cloak>
             <li>
               <!--Username and profile link goes here.-->
               <a ng-show="User.u_login" ng-cloak href="profile.html?id={{User.id}}" class="navbar-link"><span id="heading">Hello, {{User.u_name}}!</span></a>
@@ -177,7 +177,6 @@ <h3 id="myUploadItems">{{heading}}</h3>
 
               <li id="sc" ng-show="User.u_login" ng-cloak><a title="View personal profile, sketches and group memberships" href="profile.html?id={{User.id}}">My Sketchbook</a></li>
               <li id="cs"><a title="Open editor to create a new sketch" href="sketch.html">Create a Sketch</a></li>
-              <li id="vs"><a title="Search for sketch" href="search.html">Search for Sketch</a></li>
             </ul>
           </div><!--/.well -->
         </div><!--/span-->
@@ -186,7 +185,8 @@ <h3 id="myUploadItems">{{heading}}</h3>
         <div class="span10">
           <span id="testdiv" ng-model="test" hidden></span>        
           <div class="hero-unit">
-            <div id="myCarousel" class="carousel slide">
+
+            <div id="myCarousel" class="carousel slide" data-interval="false">
               <div class="well well-small">
                 <div class="carousel-inner">
                   <div class="item active">
@@ -220,38 +220,24 @@ <h1 id="title1">Most Popular Sketches</h1>
                         </div>
                       </div>
                     </div>
-                  </div>
-                  <!--div class="item">
-                    <div class="container-fluid">
-                      <h1 id="title1">K-Sketch Developers</h1>
-                      <p><a href="https://sourceforge.net/projects/k-sketch">Sourceforge</a></p>
-                      <p><a href="http://www.k-sketch.org/indigo/#klector">K-Lector</a></p>
-                      <p><a href="www.richardcdavis.com">Richard C. Davis</a> - Project Leader</p>
-                      <p>Zhang Rui - Research Fellow</p>
-                      <p>Guan Mengyuan - Research Fellow</p>
-                    </div>
-                  </div>   
-                  <div class="item">
-                    <div class="container-fluid">
-                      <h1 id="title1">The Kinnovators!</h1>
-                      <p>We at "The Kinnovators!" believe in facilitating the creative process. Our hope is that, by embarking on this project, we can help to create a community where creative ideas can be nurtured, and where said ideas can mingle and inspire others.</p>
-                      <p><a class="btn btn-primary btn-large" href="https://wiki.smu.edu.sg/is480/IS480_Team_wiki:_2013T1_The_Kinnovators!">Visit our Wiki! &raquo;</a></p>
-                    </div>
-                  </div-->                    
+                  </div>                  
                 </div>                
               </div>
 
               <a class="left carousel-control" href="#myCarousel" data-slide="prev">&lsaquo;</a>
               <a class="right carousel-control" href="#myCarousel" data-slide="next">&rsaquo;</a>              
             </div>
+
           </div>
         </div><!--/span-->
       </div><!--/row-->
 
       <hr>
 
       <footer>
-        <p>This page requires JavaScript and Adobe Flash Player, and is optimized for Mozilla Firefox and Google Chrome. &copy; Richard C. Davis 2013</p>
+        <p>
+          This page requires JavaScript and Adobe Flash Player, and is optimized for Mozilla Firefox and Google Chrome. &copy; Richard C. Davis 2013
+        </p>
       </footer>
 
     </div><!--/.fluid-container-->

diff --git a/app/js/angular/console-controller.js b/app/js/angular/console-controller.js
@@ -3,7 +3,7 @@
 /* Controller for profile.html */
 
 //angular.module('app', ['ngResource']);
-function ConsoleController($scope,$resource,sharedProperties){
+function ConsoleController($scope,$resource,sharedProperties, sharedFunctions){
 
 	$scope.User = {"id": 0, "u_name" :"Anonymous User",  "u_realname" :"Anonymous User", "u_login": false, "u_email": "", "g_hash": "", 'u_created': "", 'u_lastlogin': "", 'u_logincount': "", 'u_version': 1.0, 'u_isadmin': false, 'u_isactive': false};
 
@@ -93,7 +93,6 @@ function ConsoleController($scope,$resource,sharedProperties){
             }
             else { window.location.replace("index.html");}
           }
-          $scope.waiting = "Ready";
     });
   }	
 

diff --git a/app/js/angular/groups-controller.js b/app/js/angular/groups-controller.js
@@ -3,7 +3,7 @@
 /* Controller for groups.html */
 
 //angular.module('app', ['ngResource']);
-function GroupsController($scope,$resource,sharedProperties){
+function GroupsController($scope,$resource,sharedProperties, sharedFunctions){
 
 	$scope.User = {"id": 0, "u_name" :"Anonymous User",  "u_realname" :"Anonymous User", "u_login": false, "u_email": "", "g_hash": "",  'u_created': "", 'u_lastlogin': "", 'u_logincount': "", 'u_version': 1.0, 'u_isadmin': false, 'u_isactive': false};
 
@@ -73,7 +73,6 @@ function GroupsController($scope,$resource,sharedProperties){
             }
             else { window.location.replace("index.html");}
           }
-          $scope.waiting = "Ready";
     });
   }	
 
@@ -176,8 +175,10 @@ function GroupsController($scope,$resource,sharedProperties){
     $scope.waiting = "Loading";
     $scope.NotificationResource.get(function(response) { 
         $scope.smallnotifications = response;
-        if ($scope.smallnotifications.entities.length > 0) {
-          $scope.notify = "You have pending notification(s).";
+        if ($scope.smallnotifications.entities !== undefined) {
+          if ($scope.smallnotifications.entities.length > 0) {
+            $scope.notify = "You have pending notification(s).";
+          }
         }
         $scope.waiting = "Ready";
      });  
@@ -227,11 +228,7 @@ function GroupsController($scope,$resource,sharedProperties){
   };
 
   $scope.simpleSearch = function() {
-    if ($scope.search.replace(/^\s+|\s+$/g,'') !== "") {
-      var searchUrl = "search.html?query=" + $scope.search.replace(/^\s+|\s+$/g,'');
-      window.location.href=searchUrl;
-    }
+    sharedFunctions.simpleSearch($scope.search);
   }
-
   $scope.getuser();
 }
diff --git a/app/js/angular/index-controller.js b/app/js/angular/index-controller.js
@@ -3,7 +3,7 @@
 /* Controller for index.html */
 
 //angular.module('app', ['ngResource']);
-function IndexController($scope,$resource,sharedProperties){
+function IndexController($scope,$resource,sharedProperties, sharedFunctions){
 
 	$scope.User = {"id": 0, "u_name" :"Anonymous User",  "u_realname" :"Anonymous User", "u_login": false, "u_email": "", "g_hash": "",  'u_created': "", 'u_lastlogin': "", 'u_logincount': "", 'u_version': 1.0, 'u_isadmin': false, 'u_isactive': false};
 
@@ -49,8 +49,8 @@ function IndexController($scope,$resource,sharedProperties){
             $scope.get_notification();            
           } else {
             $scope.User = {"id": 0, "u_name" :"Anonymous User",  "u_realname" :"Anonymous User", "u_login": false, "u_email": "", "g_hash": "",  'u_created': "", 'u_lastlogin': "", 'u_logincount': "", 'u_version': 1.0, 'u_isadmin': false, 'u_isactive': false};
+            $scope.waiting = "Ready";
           }
-          $scope.waiting = "Ready";
     });
   }
 
@@ -64,8 +64,10 @@ function IndexController($scope,$resource,sharedProperties){
     $scope.waiting = "Loading";   
     $scope.NotificationResource.get(function(response) { 
         $scope.smallnotifications = response;
-        if ($scope.smallnotifications.entities.length > 0) {
-          $scope.notify = "You have pending notification(s).";
+        if ($scope.smallnotifications.entities !== undefined) {
+          if ($scope.smallnotifications.entities.length > 0) {
+            $scope.notify = "You have pending notification(s).";
+          }
         }
         $scope.waiting = "Ready";
      });  
@@ -120,12 +122,10 @@ function IndexController($scope,$resource,sharedProperties){
     $scope.heading = "";
     $scope.message = "";
     $scope.submessage = "";
-  }  
+  }
+
   $scope.simpleSearch = function() {
-    if ($scope.search.replace(/^\s+|\s+$/g,'') !== "") {
-      var searchUrl = "search.html?query=" + $scope.search.replace(/^\s+|\s+$/g,'');
-      window.location.href=searchUrl;
-    }
+    sharedFunctions.simpleSearch($scope.search);
   }
 
   $scope.getuser();