fixed #138 and #142

orientechnologies · Sep 22, 2014 · 51cd99d · 51cd99d
1 parent 51d1ec3
commit 51cd99d
Show file tree

Hide file tree

Showing 10 changed files with 90 additions and 40 deletions.
diff --git a/app/index.html b/app/index.html
@@ -36,6 +36,7 @@
     <link rel="stylesheet" href="components/fontIconPicker/themes/inverted-theme/jquery.fonticonpicker.inverted.css">
     <link rel="stylesheet" href="components/ng-tags-input/ng-tags-input.min.css">
     <link rel="stylesheet" href="components/ng-tags-input/ng-tags-input.bootstrap.css">
+    <link rel="stylesheet" href="components/bootstrap-switch/dist/css/bootstrap3/bootstrap-switch.min.css">
 
     <!--<link rel="stylesheet" href="components/ng-grid/ng-grid.min.css"/>-->
     <!--<link rel="stylesheet" href="components/bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css"/>-->
@@ -163,7 +164,8 @@
 <script src="scripts/util/orientdb-hint.js"></script>
 <script src="components/angular-scroll/angular-scroll.min.js"></script>
 <script src="components/ng-table/ng-table.min.js"></script>
-
+<script src="components/angular-bootstrap-switch/dist/angular-bootstrap-switch.min.js"></script>
+<script src="components/bootstrap-switch/dist/js/bootstrap-switch.min.js"></script>
 
 <!--<script type="text/javascript"-->
 <!--src="components/bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js"></script>-->

diff --git a/app/scripts/app.js b/app/scripts/app.js
@@ -31,7 +31,8 @@ var deps = ['header.controller',
     'ngAnimate',
     'angularSpectrumColorpicker',
     'pascalprecht.translate',
-    'ngTagsInput'];
+    'ngTagsInput',
+    'frapontillo.bootstrap-switch'];
 
 
 var App = angular.module('OrientDBStudioApp', deps);

diff --git a/app/scripts/controllers/function-controller.js b/app/scripts/controllers/function-controller.js
@@ -4,6 +4,7 @@ schemaModule.controller("FunctionController", ['$scope', '$routeParams', '$locat
     $scope.database = Database;
     $scope.listClass = 'fa-mail-reply';
     $scope.logLevel = ""
+    $scope.isCode = true;
     $scope.listClasses = $scope.database.listClasses();
     $scope.editorOptions = {
         lineWrapping: true,

diff --git a/app/scripts/controllers/login-controller.js b/app/scripts/controllers/login-controller.js
@@ -1,5 +1,5 @@
 var login = angular.module('login.controller', ['database.services']);
-login.controller("LoginController", ['$scope', '$rootScope', '$routeParams', '$location', '$modal', '$q', 'Database', 'DatabaseApi', 'Notification', '$http', 'Spinner', function ($scope, $rootScope, $routeParams, $location, $modal, $q, Database, DatabaseApi, Notification, $http, Spinner) {
+login.controller("LoginController", ['$scope', '$rootScope', '$routeParams', '$location', '$modal', '$q', 'Database', 'DatabaseApi', 'Notification', '$http', 'Spinner', 'localStorageService', function ($scope, $rootScope, $routeParams, $location, $modal, $q, Database, DatabaseApi, Notification, $http, Spinner, localStorageService) {
 
     $scope.server = "http://localhost:2480"
 
@@ -108,6 +108,11 @@ login.controller("LoginController", ['$scope', '$rootScope', '$routeParams', '$l
                 if ($scope.databases.length > 0) {
                     $scope.database = $scope.databases[0];
                 }
+                var timeline = localStorageService.get("Timeline");
+                if (timeline) {
+                    delete timeline[modalPromise.$scope.name];
+                    localStorageService.add("Timeline", timeline);
+                }
                 Notification.push({content: noti});
                 modalPromise.hide();
             }, function (data) {

diff --git a/app/styles/animation.css b/app/styles/animation.css
@@ -85,5 +85,27 @@
 }
 
 
+@-webkit-keyframes bookmarksInFromLeft {
+    0% {
+        -webkit-transform: translateX(-25%);
+    }
+    40% {
+        -webkit-transform: translateX(-15%);
+    }
+    100% {
+        -webkit-transform: translateX(0px);
+    }
+}
+@-moz-keyframes bookmarksInFromLeft {
+    0% {
+        transform: translateX(-320px);
+    }
+    40% {
+        transform: translateX(-100px);
+    }
+    100% {
+        transform: translateX(0px);
+    }
+}
 
 
diff --git a/app/styles/layout.css b/app/styles/layout.css
@@ -190,21 +190,51 @@ body div.container-studio {
     /*color: white;*/
 }
 
+.aside-list {
+    overflow: auto;
+    height: 100%;
+}
+
+.aside .container-fluid {
+    height: 100%;
+}
+
+.aside-list-container .row:first-child {
+    height: 20%;
+}
+
+.aside-list-container .row:last-child {
+    height: 80%;
+}
+
+.aside-list-container {
+    height: 100%;
+}
+
+.oaside-body {
+    height: 100%;
+
+}
+
+.search-bookmarks label {
+    color: white;
+}
+
 .oaside {
     background-color: #30333a;
     /*background-color: #222326;*/
     height: 100%;
-    width: 320px;
+    width: 25%;
     position: fixed;
     top: 0px;
     padding-top: 50px;
     left: 0px;
     z-index: 1000;
     border-right: 1px solid #222326;
     box-shadow: 0 0 5px 2px rgba(0, 0, 0, 0.5);
-    -webkit-transform: translateX(-320px);
-    transform: translateX(-320px);
-    -ms-transform: translateX(-320px);
+    -webkit-transform: translateX(-100%);
+    transform: translateX(-100%);
+    -ms-transform: translateX(-100%);
 }
 
 .oaside .close {
@@ -241,30 +271,6 @@ body div.container-studio {
     -webkit-animation-duration: 0.2s;
 }
 
-@-moz-keyframes bookmarksInFromLeft {
-    0% {
-        transform: translateX(-260px);
-    }
-    40% {
-        transform: translateX(-100px);
-    }
-    100% {
-        transform: translateX(0px);
-    }
-}
-
-@-webkit-keyframes bookmarksInFromLeft {
-    0% {
-        -webkit-transform: translateX(-320px);
-    }
-    40% {
-        -webkit-transform: translateX(-100px);
-    }
-    100% {
-        -webkit-transform: translateX(0px);
-    }
-}
-
 input.search-query {
     padding-right: 14px;
     padding-right: 4px \9;
@@ -280,10 +286,12 @@ input.search-query {
 }
 
 .search-bookmarks div.form-group {
-    margin-top: 15px;
+    margin-top: 10px;
+    margin-bottom: 10px;
 }
 
 .search-bookmarks {
+    margin-bottom: 5px;
 }
 
 .antialiased {

diff --git a/app/views/database/config/configuration.html b/app/views/database/config/configuration.html
@@ -53,7 +53,7 @@ <h3>Custom Properties</h3>
                         <a ng-show="links[val.name]" href="javascript:void(0)" tabindex="1"
                            data-trigger="focus" data-placement="right"
                            data-container="body"
-                           
+
                            data-content="{{ 'configuration.'  + val.name | translate:links }}" bs-popover>
                             <i class="fa fa-question-circle"></i>
                         </a>

diff --git a/app/views/database/function/functionAside.html b/app/views/database/function/functionAside.html
@@ -1,18 +1,28 @@
-<div class="container-fluid" role="dialog" tabindex="-1">
-
+<div class="container-fluid aside-list-container" role="dialog" tabindex="-1">
 
     <div class="row">
         <form class="form-search search-bookmarks">
-            <div class="form-group col-md-10 col-md-offset-1">
-                <input type="text" class="form-control  search-query" ng-model="queryy"
+            <div class="form-group col-md-12" ng-hide="isCode">
+                <input type="text" class="form-control  search-query" ng-model="query.name"
+                       placeholder="Search Functions">
+            </div>
+            <div class="form-group col-md-12" ng-show="isCode">
+                <input type="text" class="form-control  search-query" ng-model="query"
                        placeholder="Search Functions">
             </div>
+            <div class="form-group col-md-12">
+                <label class="col-md-8 control-label">Search also in code</label>
+                <div class="col-md-4">
+                    <input type="checkbox" ng-change="query = null" bs-switch switch-size="mini" ng-model="isCode"
+                           placeholder="Search In code">
+                </div>
+            </div>
         </form>
     </div>
     <div class="row">
         <div class="list-group aside-list">
             <a class="list-group-item" href="javascript:void(0)"
-               ng-repeat="func in functions | orderBy: 'name' | filter:queryy |filter:queryy.code"
+               ng-repeat="func in functions | orderBy: 'name' | filter:query"
                ng-class="{active : functionToExecute == func}" ng-click="selectFunction(func)"
                value="{{func['name']}}">
                 <span class="badge">{{func['language']}}</span>

diff --git a/app/views/widget/aside.html b/app/views/widget/aside.html
@@ -5,6 +5,6 @@
         <h5 class="oaside-title">{{model.title}}</h5>
     </div>
 
-    <div aside="model"></div>
+    <div class="oaside-body" aside="model"></div>
 
 </div>
diff --git a/bower.json b/bower.json
@@ -34,7 +34,8 @@
     "nprogress": "0.1.6",
     "ng-tags-input": "2.1.1",
     "angular-translate": "2.2.0",
-    "angular-translate-loader-partial": "2.0.0"
+    "angular-translate-loader-partial": "2.0.0",
+    "angular-bootstrap-switch": "0.3.0"
   },
   "devDependencies": {
     "angular-mocks": "~1.0.5",