kylin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mahong...@apache.org
Subject [13/52] [abbrv] incubator-kylin git commit: move project to header and update AdminLTE css to v2.0.4
Date Fri, 15 May 2015 05:21:42 GMT
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/603fe3fc/webapp/app/less/component.less
----------------------------------------------------------------------
diff --git a/webapp/app/less/component.less b/webapp/app/less/component.less
index 4caf964..18a0cd2 100644
--- a/webapp/app/less/component.less
+++ b/webapp/app/less/component.less
@@ -838,4 +838,26 @@ span.input-icon {
 .cube-dimension .dl-horizontal{
   margin-top: 0px !important;
   margin-bottom: 0px !important;
-}
\ No newline at end of file
+}
+
+//style choosen for bootstrap3
+.chosen-container-single .chosen-single {
+  height: 30px;
+  border-radius: 3px;
+  border: 1px solid #CCCCCC;
+}
+.chosen-container-single .chosen-single span {
+  padding-top: 2px;
+}
+.chosen-container-single .chosen-single div b {
+  margin-top: 2px;
+}
+.chosen-container-active .chosen-single,
+.chosen-container-active.chosen-with-drop .chosen-single {
+  border-color: #ccc;
+  border-color: rgba(82, 168, 236, .8);
+  outline: 0;
+  outline: thin dotted \9;
+  -moz-box-shadow: 0 0 8px rgba(82, 168, 236, .6);
+  box-shadow: 0 0 8px rgba(82, 168, 236, .6)
+}

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/603fe3fc/webapp/app/partials/cubes/cube_json_edit.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubes/cube_json_edit.html b/webapp/app/partials/cubes/cube_json_edit.html
index 461aabd..56baa3e 100644
--- a/webapp/app/partials/cubes/cube_json_edit.html
+++ b/webapp/app/partials/cubes/cube_json_edit.html
@@ -23,21 +23,6 @@
         </div>
         <div class="col-xs-9">
             <form role="form" name="cube_form" novalidate>
-                <div class="row">
-                    <div class="col-xs-12">
-                        <form class="navbar-form navbar-left" style="margin-top: 0px !important;"
ng-if="userService.isAuthorized()">
-                            <div class="form-group">
-                                <span><b>Project: </b></span>
-                                <select chosen ng-model="projectModel.selectedProject"
ng-init="newAccess.permission=permissions.READ.value;"
-                                        ng-options="project as project for project in projectModel.projects"
-                                        style="width: 150px"
-                                        class="chosen-select">
-                                    <option  ng-if="userService.hasRole('ROLE_ADMIN')"
 selected value=""> -- Choose Project -- </option>
-                                </select>
-                            </div>
-                        </form>
-                    </div>
-                </div>
                 <section style="padding-bottom: 20px">
                     <div style="height: 620px; font-size: 14px;" ui-ace="{
                                       useWrapMode : true,

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/603fe3fc/webapp/app/partials/cubes/cubes.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubes/cubes.html b/webapp/app/partials/cubes/cubes.html
index 0a9676a..9e6976f 100644
--- a/webapp/app/partials/cubes/cubes.html
+++ b/webapp/app/partials/cubes/cubes.html
@@ -21,14 +21,6 @@
     <div class="col-xs-3">
         <form ng-if="userService.isAuthorized()">
             <div class="form-group">
-                <span><b>Project: </b></span>
-                <select chosen ng-model="projectModel.selectedProject" ng-init="newAccess.permission=permissions.READ.value;"
-                        ng-options="project as project for project in projectModel.projects"
-                        style="width: 150px"
-                        data-placeholder="select a project"
-                        class="chosen-select">
-                    <option ng-if="userService.hasRole('ROLE_ADMIN')" ng-selected="projectModel.selectedProject==null"
value=""> -- Select All -- </option>
-                </select>
                 <!--Project-->
                 <a class="btn btn-xs btn-info" href="projects" tooltip="Manage Project"><i
class="fa fa-gears"></i></a>
                 <a class="btn btn-xs btn-primary" style="width: 29px" ng-if="userService.hasRole('ROLE_ADMIN')||userService.hasRole('ROLE_MODELER')&&kylinConfig.getDeployEnv()!=='PROD'"
 tooltip="Add Project" ng-click="toCreateProj()">

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/603fe3fc/webapp/app/partials/header.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/header.html b/webapp/app/partials/header.html
index 937f56c..18a9b66 100644
--- a/webapp/app/partials/header.html
+++ b/webapp/app/partials/header.html
@@ -31,20 +31,26 @@
 
             <div class="navbar-collapse collapse" collapse="isCollapsed">
                 <ul class="nav navbar-nav">
+                    <li class="project-cntnr"  style="padding:7px 15px;background-color:#2e8965;"
ng-if="userService.isAuthorized()">
+                        <select chosen ng-model="projectModel.selectedProject" ng-init="newAccess.permission=permissions.READ.value;"
+                                ng-options="project as project for project in projectModel.projects"
+                                style="width: 150px"
+                                data-placeholder="select a project"
+                                class="chosen-select">
+                            <option ng-if="userService.hasRole('ROLE_ADMIN')" ng-selected="projectModel.selectedProject==null"
 value=""> -- Choose Project -- </option>
+                        </select>
+                    </li>
                     <li class="{{activeTab=='query'?'purple':'green'}}" ng-if="userService.isAuthorized()">
-                        <a href="query">Query</a>
+                        <a href="query">Insight</a>
                     </li>
                     <li class="{{activeTab=='cubes'?'purple':'green'}}" ng-if="userService.isAuthorized()">
-                        <a href="cubes">Cubes</a>
+                        <a href="cubes">Model</a>
                     </li>
                     <li class="{{activeTab=='jobs'?'purple':'green'}}" ng-if="userService.isAuthorized()">
-                        <a href="jobs">Jobs</a>
+                        <a href="jobs">Monitor</a>
                     </li>
                     <li class="{{activeTab=='sourceMeta'?'purple':'green'}}" ng-if="userService.isAuthorized()">
-                        <a href="sourceMeta">Tables</a>
-                    </li>
-                    <li class="{{activeTab=='admin'?'purple':'green'}}" ng-if="userService.hasRole('ROLE_ADMIN')">
-                        <a href="admin">Admin</a>
+                        <a href="sourceMeta">System</a>
                     </li>
                 </ul>
                 <ul class="nav navbar-nav navbar-right">

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/603fe3fc/webapp/app/partials/jobs/jobs.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/jobs/jobs.html b/webapp/app/partials/jobs/jobs.html
index aba9ce6..3b2ee04 100644
--- a/webapp/app/partials/jobs/jobs.html
+++ b/webapp/app/partials/jobs/jobs.html
@@ -21,15 +21,6 @@
     <div class="col-xs-3">
         <form ng-if="userService.isAuthorized()">
             <div class="form-group">
-                <span><b>Project: </b></span>
-                <select chosen ng-model="projectModel.selectedProject" ng-init="newAccess.permission=permissions.READ.value;"
-                        ng-options="project as project for project in projectModel.projects"
-                        style="width: 150px"
-                        data-placeholder="select a project"
-                        class="chosen-select">
-                    <option ng-if="userService.hasRole('ROLE_ADMIN')"  ng-selected="projectModel.selectedProject==null"
 value=""> -- Select All -- </option>
-                </select>
-                <!--Project-->
                 <a class="btn btn-xs btn-info" href="projects" tooltip="Manage Project"><i
class="fa fa-gears"></i></a>
                 <a class="btn btn-xs btn-primary" style="width: 29px" ng-if="userService.hasRole('ROLE_ADMIN')||userService.hasRole('ROLE_MODELER')&&kylinConfig.getDeployEnv()!=='PROD'"
 tooltip="Add Project" ng-click="toCreateProj()">
                     <i class="fa fa-plus"></i>
@@ -38,14 +29,12 @@
         </form>
     </div>
     <!--Cube Name: -->
-    <div class="col-xs-3">
-        <form ng-submit="jobList.removeAll();reload()" style="display: inline" >
-            <span class="input-icon input-icon-right nav-search"><b>Cube Name:</b>
+        <form class="pull-right" ng-submit="jobList.removeAll();reload()" style="display:
inline" >
+            <span class="input-icon input-icon-right nav-search"><b>Job Name:</b>
                 <input type="text" placeholder="Filter ..." class="nav-search-input" ng-model="cubeName"
/>
                 <i class="ace-icon fa fa-search blue" ng-click="jobList.removeAll();reload()"></i>
             </span>
         </form>
-    </div>
 </div>
 
 <!--Jobs Table-->

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/603fe3fc/webapp/app/partials/query/query.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/query/query.html b/webapp/app/partials/query/query.html
index 25dcf9f..d34dbc7 100644
--- a/webapp/app/partials/query/query.html
+++ b/webapp/app/partials/query/query.html
@@ -20,15 +20,6 @@
     <!--Project-->
     <form class="navbar-form navbar-left" style="margin-top: 0px !important;" ng-if="userService.isAuthorized()">
         <div class="form-group">
-            <span><b>Project: </b></span>
-            <select chosen ng-model="projectModel.selectedProject" ng-init="newAccess.permission=permissions.READ.value;"
-                    ng-options="project as project for project in projectModel.projects"
-                    style="width: 150px"
-                    data-placeholder="select a project"
-                    class="chosen-select">
-                <option ng-if="userService.hasRole('ROLE_ADMIN')" ng-selected="projectModel.selectedProject==null"
 value=""> -- Choose Project -- </option>
-            </select>
-            <!--Project-->
             <a class="btn btn-xs btn-info" href="projects" tooltip="Manage Project"><i
class="fa fa-gears"></i></a>
             <a class="btn btn-xs btn-primary" ng-if="userService.hasRole('ROLE_ADMIN')||userService.hasRole('ROLE_MODELER')&&kylinConfig.getDeployEnv()!=='PROD'"
style="width: 29px" tooltip="Add Project" ng-click="toCreateProj()">
                 <i class="fa fa-plus"></i>

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/603fe3fc/webapp/app/partials/tables/source_metadata.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/tables/source_metadata.html b/webapp/app/partials/tables/source_metadata.html
index 62b4d0f..d7b5a1e 100755
--- a/webapp/app/partials/tables/source_metadata.html
+++ b/webapp/app/partials/tables/source_metadata.html
@@ -20,14 +20,6 @@
     <!--Project-->
     <form class="navbar-form navbar-left" style="margin-top: 0px !important;" ng-if="userService.isAuthorized()">
         <div class="form-group">
-            <span><b>Project: </b></span>
-            <select chosen ng-model="projectModel.selectedProject" ng-init="newAccess.permission=permissions.READ.value;"
-                    ng-options="project as project for project in projectModel.projects"
-                    style="width: 150px"
-                    data-placeholder="select a project"
-                    class="chosen-select">
-                <option  ng-if="userService.hasRole('ROLE_ADMIN')" ng-selected="projectModel.selectedProject==null"
 value=""> -- Choose Project -- </option>
-            </select>
             <!--Project-->
             <a class="btn btn-xs btn-info" href="projects" tooltip="Manage Project"><i
class="fa fa-gears"></i></a>
             <a class="btn btn-xs btn-primary" style="width: 29px" ng-if="userService.hasRole('ROLE_ADMIN')||userService.hasRole('ROLE_MODELER')&&kylinConfig.getDeployEnv()!=='PROD'"
tooltip="Add Project" ng-click="toCreateProj()">


Mime
View raw message