-
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/webapp/example/employee.js b/src/main/webapp/example/employee.js
old mode 100644
new mode 100755
index 906b8a0..f697ac9
--- a/src/main/webapp/example/employee.js
+++ b/src/main/webapp/example/employee.js
@@ -1,214 +1,214 @@
-(function() {
- cola(function(model) {
- $(".ui.accordion").accordion({
- exclusive: false
- });
- model.describe("employees", {
- dataType: {
- name: "Employee",
- properties: {
- lastName: {
- validators: [
- "required", {
- $type: "length",
- min: 4,
- max: 20
- }
- ]
- },
- firstName: {
- validators: [
- "required", {
- $type: "length",
- min: 4,
- max: 20
- }
- ]
- },
- sex: {
- dataType: "boolean",
- defaultValue: true,
- validators: ["required"]
- },
- birthDate: {
- dataType: "date"
- },
- hireDate: {
- dataType: "date"
- },
- phone: {
- validators: ["required"]
- }
- }
- },
- provider: {
- name: "provider1",
- url: "./service/employee/",
- pageSize: 4,
- beforeSend: function(self, arg) {
- var contain, data;
- data = arg.options.data;
- contain = model.get("contain");
- return data.contain = contain;
- }
- }
- });
- model.set("countries", [
- {
- name: "中国"
- }, {
- name: "美国"
- }, {
- name: "加拿大"
- }, {
- name: "印度尼西亚"
- }, {
- name: "马来西亚"
- }, {
- name: "英国"
- }, {
- name: "韩国"
- }, {
- name: "蒙古国"
- }, {
- name: "俄罗斯"
- }
- ]);
- model.describe("editItem", "Employee");
- model.action({
- getColor: function(status) {
- if (status === "完成") {
- return "positive-text";
- } else {
- return "negative-text";
- }
- },
- search: function() {
- return model.get("employees").flush();
- },
- add: function() {
- model.set("editItem", {
- sex: true
+(function () {
+ cola(function (model) {
+ $(".ui.accordion").accordion({
+ exclusive: false
});
- return cola.widget("editLayer").show();
- },
- edit: function(item) {
- model.set("editItem", item.toJSON());
- return cola.widget("editLayer").show();
- },
- cancel: function() {
- return cola.widget("editLayer").hide();
- },
- ok: function() {
- debugger;
- var data, editItem, id, validate;
- editItem = model.get("editItem");
- validate = editItem.validate();
- console.log(validate);
- if (validate) {
- id = editItem.get("id");
- data = editItem.toJSON();
- NProgress.start();
- return $.ajax("./service/employee/", {
- data: JSON.stringify(data),
- type: data.id ? "PUT" : "POST",
- contentType: "application/json",
- complete: function() {
- cola.widget("editLayer").hide();
- return NProgress.done();
+ model.describe("employees", {
+ dataType: {
+ name: "Employee",
+ properties: {
+ name: {
+ validators: [
+ "required", {
+ $type: "length",
+ min: 1,
+ max: 20
+ }
+ ]
+ },
+ email: {
+ validators: [
+ "required", {
+ $type: "length",
+ min: 4,
+ max: 20
+ }
+ ]
+ },
+ gender: {
+ dataType: "boolean",
+ defaultValue: true,
+ validators: ["required"]
+ },
+ birthday: {
+ dataType: "date"
+ },
+ createdAt: {
+ dataType: "date"
+ },
+ updatedAt: {
+ dataType: "date"
+ }
+ }
+ },
+ provider: {
+ url: "./service/employee/find",
+ pageSize: 10,
+ beforeSend: function (self, arg) {
+ var contain, data;
+ data = arg.options.data;
+ contain = model.get("contain");
+ return data.contain = contain;
+ }
}
- });
- }
- },
- del: function(item) {
- return item.remove();
- }
- });
- return model.widgetConfig({
- radioGroup: {
- items: [
- {
- value: true,
- label: "男"
- }, {
- value: false,
- label: "女"
- }
- ]
- },
- editLayer: {
- $type: "layer",
- width: "100%",
- onShow: function() {
- return $("#mainView").hide();
- },
- beforeHide: function() {
- return $("#mainView").show();
- }
- },
- shopDropDown: {
- $type: "dropdown",
- "class": "error",
- openMode: "drop",
- items: "{{shop in shops}}",
- valueProperty: "name",
- bind: "editItem.shop"
- },
- birthDatePicker: {
- $type: "datePicker",
- bind: "editItem.birthDate"
- },
- hireDatePicker: {
- $type: "datePicker",
- bind: "editItem.hireDate"
- },
- countryDropDown: {
- $type: "dropdown",
- "class": "error",
- openMode: "drop",
- items: "{{country in countries}}",
- valueProperty: "name",
- bind: "editItem.country"
- },
- employeeTable: {
- $type: "table",
- showHeader: true,
- bind: "item in employees",
- highlightCurrentItem: true,
- currentPageOnly: true,
- columns: [
- {
- bind: ".id",
- caption: "ID"
- }, {
- bind: ".lastName",
- caption: "Last Name"
- }, {
- bind: ".firstName",
- caption: "First Name"
- }, {
- bind: ".title",
- caption: "Title"
- }, {
- bind: ".titleOfCourtesy",
- caption: "Title Of Courtesy"
- }, {
- bind: ".sex",
- caption: "Sex"
- }, {
- bind: "formatDate(employee.birthDate, 'yyyy-MM-dd')",
- caption: "Birthday"
- }, {
- bind: ".phone",
- caption: "phone"
- }, {
- caption: "Operation",
- align: "center",
- template: "operations"
- }
- ]
- }
+ });
+ model.set("countries", [
+ {
+ name: "中国"
+ }, {
+ name: "美国"
+ }, {
+ name: "加拿大"
+ }, {
+ name: "印度尼西亚"
+ }, {
+ name: "马来西亚"
+ }, {
+ name: "英国"
+ }, {
+ name: "韩国"
+ }, {
+ name: "蒙古国"
+ }, {
+ name: "俄罗斯"
+ }
+ ]);
+ model.describe("editItem", "Employee");
+ model.action({
+ getColor: function (status) {
+ if (status === "完成") {
+ return "positive-text";
+ } else {
+ return "negative-text";
+ }
+ },
+ search: function () {
+ return model.get("employees").flush();
+ },
+ add: function () {
+ model.set("editItem", {
+ sex: true
+ });
+ return cola.widget("editLayer").show();
+ },
+ edit: function (item) {
+ model.set("editItem", item.toJSON());
+ return cola.widget("editLayer").show();
+ },
+ cancel: function () {
+ return cola.widget("editLayer").hide();
+ },
+ ok: function () {
+ debugger;
+ var data, editItem, validate;
+ editItem = model.get("editItem");
+ validate = editItem.validate();
+ if (validate) {
+ data = editItem.toJSON();
+ return $.ajax("./service/employee/", {
+ data: JSON.stringify(data),
+ type: data.id ? "PUT" : "POST",
+ contentType: "application/json",
+ complete: function () {
+ cola.widget("editLayer").hide();
+ }
+ });
+ }
+ },
+ del: function (item) {
+ item.remove();
+ return $.ajax("./service/employee/"+item.get("id")+"/", {
+ type: "DELETE"
+ });
+ }
+ });
+ return model.widgetConfig({
+ radioGroup: {
+ items: [
+ {
+ value: true,
+ label: "男"
+ }, {
+ value: false,
+ label: "女"
+ }
+ ]
+ },
+ editLayer: {
+ $type: "layer",
+ width: "100%",
+ onShow: function () {
+ return $("#mainView").hide();
+ },
+ beforeHide: function () {
+ return $("#mainView").show();
+ }
+ },
+ shopDropDown: {
+ $type: "dropdown",
+ "class": "error",
+ openMode: "drop",
+ items: "{{shop in shops}}",
+ valueProperty: "name",
+ bind: "editItem.shop"
+ },
+ birthDatePicker: {
+ $type: "datePicker",
+ bind: "editItem.birthday",
+ displayFormat: "yyyy-MM-dd HH:mm:ss"
+ },
+ hireDatePicker: {
+ $type: "datePicker",
+ bind: "editItem.createdAt",
+ displayFormat: "yyyy-MM-dd HH:mm:ss"
+ },
+ countryDropDown: {
+ $type: "dropdown",
+ "class": "error",
+ openMode: "drop",
+ items: "{{country in countries}}",
+ valueProperty: "name",
+ bind: "editItem.country"
+ },
+ employeeTable: {
+ $type: "table",
+ showHeader: true,
+ bind: "item in employees",
+ highlightCurrentItem: true,
+ currentPageOnly: true,
+ columns: [
+ {
+ bind: ".id",
+ caption: "ID"
+ }, {
+ bind: ".name",
+ caption: "Name"
+ }, {
+ bind: ".avatar",
+ caption: "AVATAR"
+ }, {
+ bind: ".degree",
+ caption: "DEGREE"
+ }, {
+ bind: ".website",
+ caption: "WEBSITE"
+ }, {
+ bind: "item.gender?'男':'女'",
+ caption: "GENDER"
+ }, {
+ bind: "formatDate(item.birthday, 'yyyy-MM-dd HH:mm:ss')",
+ caption: "Birthday"
+ }, {
+ bind: ".email",
+ caption: "EMAIL"
+ }, {
+ caption: "Operation",
+ align: "center",
+ template: "operations"
+ }
+ ]
+ }
+ });
});
- });
}).call(this);
diff --git a/src/main/webapp/example/master-detail.css b/src/main/webapp/example/master-detail.css
old mode 100644
new mode 100755
diff --git a/src/main/webapp/example/master-detail.html b/src/main/webapp/example/master-detail.html
old mode 100644
new mode 100755
index ac04921..8b97b60
--- a/src/main/webapp/example/master-detail.html
+++ b/src/main/webapp/example/master-detail.html
@@ -16,14 +16,14 @@
diff --git a/src/main/webapp/example/master-detail.js b/src/main/webapp/example/master-detail.js
old mode 100644
new mode 100755
diff --git a/src/main/webapp/example/table.css b/src/main/webapp/example/table.css
old mode 100644
new mode 100755
diff --git a/src/main/webapp/example/table.html b/src/main/webapp/example/table.html
old mode 100644
new mode 100755
index a3b203c..7facacb
--- a/src/main/webapp/example/table.html
+++ b/src/main/webapp/example/table.html
@@ -16,14 +16,16 @@
diff --git a/src/main/webapp/example/table.js b/src/main/webapp/example/table.js
old mode 100644
new mode 100755
diff --git a/src/main/webapp/example/time-line.html b/src/main/webapp/example/time-line.html
old mode 100644
new mode 100755
index 855bce7..aecffa7
--- a/src/main/webapp/example/time-line.html
+++ b/src/main/webapp/example/time-line.html
@@ -15,10 +15,10 @@
-
+
diff --git a/src/main/webapp/favicon.ico b/src/main/webapp/favicon.ico
new file mode 100644
index 0000000..749ae85
Binary files /dev/null and b/src/main/webapp/favicon.ico differ
diff --git a/src/main/webapp/frame/404.html b/src/main/webapp/frame/404.html
index 1e36762..eee00b0 100644
--- a/src/main/webapp/frame/404.html
+++ b/src/main/webapp/frame/404.html
@@ -16,7 +16,7 @@
diff --git a/src/main/webapp/frame/500.html b/src/main/webapp/frame/500.html
index e9a9822..5c7ddd4 100644
--- a/src/main/webapp/frame/500.html
+++ b/src/main/webapp/frame/500.html
@@ -16,7 +16,7 @@
diff --git a/src/main/webapp/frame/account/account.css b/src/main/webapp/frame/account/account.css
old mode 100644
new mode 100755
diff --git a/src/main/webapp/frame/account/forgot-password.css b/src/main/webapp/frame/account/forgot-password.css
old mode 100644
new mode 100755
diff --git a/src/main/webapp/frame/account/forgot-password.html b/src/main/webapp/frame/account/forgot-password.html
old mode 100644
new mode 100755
index cab78b4..7c44366
--- a/src/main/webapp/frame/account/forgot-password.html
+++ b/src/main/webapp/frame/account/forgot-password.html
@@ -16,7 +16,7 @@
@@ -34,7 +34,7 @@
找回密码
-
+
diff --git a/src/main/webapp/frame/account/forgot-password.js b/src/main/webapp/frame/account/forgot-password.js
old mode 100644
new mode 100755
diff --git a/src/main/webapp/frame/account/login.css b/src/main/webapp/frame/account/login.css
old mode 100644
new mode 100755
diff --git a/src/main/webapp/frame/account/login.html b/src/main/webapp/frame/account/login.html
old mode 100644
new mode 100755
index beaf0b4..8313f07
--- a/src/main/webapp/frame/account/login.html
+++ b/src/main/webapp/frame/account/login.html
@@ -16,7 +16,7 @@
@@ -38,7 +38,7 @@
用户登录
-
+
diff --git a/src/main/webapp/frame/account/login.js b/src/main/webapp/frame/account/login.js
old mode 100644
new mode 100755
diff --git a/src/main/webapp/frame/main.css b/src/main/webapp/frame/main.css
index d8675c2..c07067f 100644
--- a/src/main/webapp/frame/main.css
+++ b/src/main/webapp/frame/main.css
@@ -1,373 +1,425 @@
-/* 主色调定义 */
-/* 文字内容色调定义 */
-/* 背景色调定义 */
-/* 边框色调定义 */
-/* 主题色定义 */
-/* Input */
-/* main page */
html body {
- font-size: 14px !important;
+ font-size: 14px !important
}
+
.page-header.ui.menu .logo img {
- margin-right: 0.6em;
+ margin-right: 0.6em
}
+
.page-header.ui.menu .item.msg {
- padding-right: 0.52857143em;
- padding-left: 0.52857143em;
- position: relative;
+ padding-right: 0.52857143em;
+ padding-left: 0.52857143em;
+ position: relative
}
+
.page-header.ui.menu .item.msg i {
- font-size: 1.25em;
+ font-size: 1.25em
}
+
.page-header.ui.menu .item.msg span.badge {
- border-radius: 3px;
- position: relative;
- top: -8px;
- left: 2px;
- font-size: 0.8em;
- background-color: #d93e50;
- color: rgba(255, 255, 255, 0.9);
- padding: 0.2em 0.2em 0.1em 0.2em;
- min-width: 16px;
- text-align: center;
- display: inline-block;
- font-weight: bold;
-}
+ border-radius: 3px;
+ position: relative;
+ top: -8px;
+ left: 2px;
+ font-size: 0.8em;
+ background-color: #d93e50;
+ color: rgba(255, 255, 255, 0.9);
+ padding: 0.2em 0.2em 0.1em 0.2em;
+ min-width: 16px;
+ text-align: center;
+ display: inline-block;
+ font-weight: bold
+}
+
.page-header.ui.menu .item.msg.mail span.badge {
- background-color: #2f886e;
+ background-color: #2f886e
}
+
.page-header.ui.menu .user.item i {
- margin: 0em 0em 0em 0.5em;
+ margin: 0em 0em 0em 0.5em
}
+
.page-header.ui.menu .user.item .avatar {
- margin: 0;
+ margin: 0
}
+
#loginDialog {
- border-radius: 0.7571429rem;
+ border-radius: 0.7571429rem
}
+
#loginDialog #containerSignIn {
- border-radius: 0.7571429rem;
- margin: 0;
- padding: 2em 2em 1em 2em;
+ border-radius: 0.7571429rem;
+ margin: 0;
+ padding: 2em 2em 1em 2em
}
+
#loginDialog #containerSignIn h2 {
- margin: 0 0 25px;
- font-size: 25px;
- font-weight: 400;
- text-align: center;
- color: #323a45;
+ margin: 0 0 25px;
+ font-size: 25px;
+ font-weight: 400;
+ text-align: center;
+ color: #323a45
}
+
#loginDialog #containerSignIn .ui.form > .field:not(:last-child) {
- margin-bottom: 1.6em;
+ margin-bottom: 1.6em
}
+
#loginDialog #containerSignIn .ui.form a.float-right {
- float: right;
+ float: right
}
+
#loginDialog #containerSignIn .ui.form .submit-btn {
- margin-top: 1em;
+ margin-top: 1em
}
+
#viewTab > .tab-bar {
- height: 36px;
+ height: 28px
}
+
#viewTab > .tab-bar > .tabs > .tab-button {
- border-top-right-radius: 2px;
- border-top-left-radius: 2px;
- line-height: 36px;
- font-size: 0.92em;
+ border-top-right-radius: 2px;
+ border-top-left-radius: 2px;
+ line-height: 36px;
+ font-size: 0.92em
}
+
#viewTab > .tab-bar > .tabs > .tab-button.active {
- box-shadow: inset 0 2px 0 #40bf97;
+ box-shadow: inset 0 2px 0 #40bf97
}
+
#viewTab > .contents {
- padding: 0;
+ padding: 0
}
+
#viewTab > .contents .item {
- height: 100%;
+ height: 100%
}
+
#viewTab > .contents .item > * {
- height: inherit;
+ height: inherit
}
+
#userSidebar {
- width: 16em;
- left: auto;
- background-color: #314253;
+ width: 16em;
+ left: auto;
+ background-color: #314253
}
+
#userSidebar .box {
- padding: 3em 1em;
+ padding: 3em 1em
}
+
#userSidebar .ui.segment.basic-info {
- background-color: transparent;
+ background-color: transparent
}
+
#userSidebar .ui.segment.basic-info > .avatar {
- display: inline-block;
- border: 2px solid rgba(255, 255, 255, 0.75);
- border-radius: 50%;
+ display: inline-block;
+ border: 2px solid rgba(255, 255, 255, 0.75);
+ border-radius: 50%
}
+
#userSidebar .ui.segment.basic-info .name {
- margin-top: 0.5em;
- line-height: 2em;
- color: rgba(255, 255, 255, 0.8);
+ margin-top: 0.5em;
+ line-height: 2em;
+ color: rgba(255, 255, 255, 0.8)
}
+
#userSidebar .flex-box a.msg {
- cursor: pointer;
- font-size: 0.8em;
- padding: 0 0.5em;
- color: rgba(255, 255, 255, 0.8);
+ cursor: pointer;
+ font-size: 0.8em;
+ padding: 0 0.5em;
+ color: rgba(255, 255, 255, 0.8)
}
+
#userSidebar .flex-box a.msg i.icon.alarm {
- color: #e59f52;
+ color: #e59f52
}
+
#userSidebar .flex-box a.msg i.icon.mail {
- color: #40bf97;
+ color: #40bf97
}
+
#userSidebar .sign-out-btn {
- box-shadow: 0px 0px 0px 1px #40bf97 inset !important;
- color: #40bf97 !important;
+ box-shadow: 0 0 0 1px #40bf97 inset !important;
+ color: #40bf97 !important
}
+
.main-menu.ui.segment.inverted {
- -webkit-transition: width 0.2s ease-out;
- -moz-transition: width 0.2s ease-out;
- -o-transition: width 0.2s ease-out;
- transition: width 0.2s ease-out;
- padding: 0;
- background-color: #293846;
- width: 14em;
- overflow: hidden;
-}
+ -webkit-transition: width 0.2s ease-out;
+ -moz-transition: width 0.2s ease-out;
+ -o-transition: width 0.2s ease-out;
+ transition: width 0.2s ease-out;
+ padding: 0;
+ background-color: #293846;
+ width: 14em;
+ overflow: hidden
+}
+
+.main-menu.ui.segment.inverted:hover {
+ overflow: auto
+}
+
.main-menu.ui.segment.inverted .bar {
- line-height: 2em;
- background-color: #314253;
- text-align: center;
- cursor: pointer;
+ line-height: 2em;
+ background-color: #314253;
+ text-align: center;
+ cursor: pointer
}
+
.main-menu.ui.segment.inverted .bar i {
- display: inline-block;
- color: rgba(255, 255, 255, 0.7);
+ display: inline-block;
+ color: rgba(255, 255, 255, 0.7)
}
+
.main-menu.ui.segment.inverted.collapsed {
- width: 3em;
+ width: 3em
}
+
.main-menu.ui.segment.inverted.collapsed .bar i {
- -webkit-transform: rotate(90deg);
- -moz-transform: rotate(90deg);
- -ms-transform: rotate(90deg);
- -o-transform: rotate(90deg);
- transform: rotate(90deg);
+ -webkit-transform: rotate(90deg);
+ -moz-transform: rotate(90deg);
+ -ms-transform: rotate(90deg);
+ -o-transform: rotate(90deg);
+ transform: rotate(90deg)
}
-.main-menu.ui.segment.inverted.collapsed #frameworkSidebar > .item > .title .dropdown-icon {
- display: none;
+
+.main-menu.ui.segment.inverted.collapsed #frameworkSidebar > .item > .title .dropdown-icon,.main-menu.ui.segment.inverted.collapsed #frameworkSidebar > .item > .content .dropdown-icon {
+ display: none
}
+
.main-menu.ui.segment.inverted #frameworkSidebar {
- padding: 0;
- width: 14em;
+ padding: 0;
+ width: 14em
}
+
.main-menu.ui.segment.inverted #frameworkSidebar > .item ul {
- padding: 0;
- margin: 0;
- list-style: none;
+ padding: 0;
+ margin: 0;
+ list-style: none
}
+
.main-menu.ui.segment.inverted #frameworkSidebar > .item > .title {
- background-color: #1a232c;
+ background-color: black;
}
+
.main-menu.ui.segment.inverted #frameworkSidebar > .item > .content {
- padding: 0;
+ padding: 0
}
+
.main-menu.ui.segment.inverted #frameworkSidebar > .item > .content .content {
- padding: 0 0 0 1em;
-}
-.main-menu.ui.segment.inverted #frameworkSidebar > .item > .title,
-.main-menu.ui.segment.inverted #frameworkSidebar > .item .menu-item {
- position: relative;
- white-space: nowrap;
- cursor: pointer;
- padding: 0;
- line-height: 2.5em;
-}
-.main-menu.ui.segment.inverted #frameworkSidebar > .item > .title .dropdown-icon,
-.main-menu.ui.segment.inverted #frameworkSidebar > .item .menu-item .dropdown-icon {
- position: absolute;
- right: 0.8em;
- top: 50%;
- width: 1rem;
- -webkit-transform: scale(0.8, 0.8);
- -moz-transform: scale(0.8, 0.8);
- -ms-transform: scale(0.8, 0.8);
- -o-transform: scale(0.8, 0.8);
- transform: scale(0.8, 0.8);
- -webkit-transition: -webkit-transform 0.2s ease-out;
- -moz-transition: -moz-transform 0.2s ease-out;
- -o-transition: -o-transform 0.2s ease-out;
- transition: transform 0.2s ease-out;
- margin-top: -0.6rem;
- line-height: 1.2rem;
- display: inline-block;
-}
-.main-menu.ui.segment.inverted #frameworkSidebar > .item > .title:hover,
-.main-menu.ui.segment.inverted #frameworkSidebar > .item .menu-item:hover,
-.main-menu.ui.segment.inverted #frameworkSidebar > .item > .title.current-item,
-.main-menu.ui.segment.inverted #frameworkSidebar > .item .menu-item.current-item {
- background-color: #314253;
-}
-.main-menu.ui.segment.inverted #frameworkSidebar > .item > .title:hover:before,
-.main-menu.ui.segment.inverted #frameworkSidebar > .item .menu-item:hover:before,
-.main-menu.ui.segment.inverted #frameworkSidebar > .item > .title.current-item:before,
-.main-menu.ui.segment.inverted #frameworkSidebar > .item .menu-item.current-item:before {
- position: absolute;
- left: 0;
- top: 0;
- content: "";
- width: 3px;
- background-color: #40bf97;
- bottom: 0;
-}
-.main-menu.ui.segment.inverted #frameworkSidebar > .item > .title > i,
-.main-menu.ui.segment.inverted #frameworkSidebar > .item .menu-item > i {
- position: absolute;
- color: #aeb9c2;
- width: 3em;
- text-align: center;
-}
-.main-menu.ui.segment.inverted #frameworkSidebar > .item > .title > i.iconfont:before,
-.main-menu.ui.segment.inverted #frameworkSidebar > .item .menu-item > i.iconfont:before,
-.main-menu.ui.segment.inverted #frameworkSidebar > .item > .title > i.dropdown-icon:before,
-.main-menu.ui.segment.inverted #frameworkSidebar > .item .menu-item > i.dropdown-icon:before {
- font-size: 20px;
-}
-.main-menu.ui.segment.inverted #frameworkSidebar > .item > .title > span,
-.main-menu.ui.segment.inverted #frameworkSidebar > .item .menu-item > span {
- margin-left: 3.5em;
- font-size: 0.85em;
- color: rgba(255, 255, 255, 0.7);
-}
+ padding: 0 0 0 1em
+}
+
+.main-menu.ui.segment.inverted #frameworkSidebar > .item > .content .menu-item:hover, .main-menu.ui.segment.inverted #frameworkSidebar > .item > .content .menu-item.current-item {
+ background-color: #314253
+}
+
+.main-menu.ui.segment.inverted #frameworkSidebar > .item > .title, .main-menu.ui.segment.inverted #frameworkSidebar > .item .menu-item {
+ position: relative;
+ white-space: nowrap;
+ cursor: pointer;
+ padding: 0;
+ line-height: 2.5em
+}
+
+.main-menu.ui.segment.inverted #frameworkSidebar > .item > .title .dropdown-icon, .main-menu.ui.segment.inverted #frameworkSidebar > .item .menu-item .dropdown-icon {
+ position: absolute;
+ right: 0.8em;
+ top: 50%;
+ width: 1rem;
+ -webkit-transform: scale(.8, .8);
+ -moz-transform: scale(.8, .8);
+ -ms-transform: scale(.8, .8);
+ -o-transform: scale(.8, .8);
+ transform: scale(.8, .8);
+ -webkit-transition: -webkit-transform 0.2s ease-out;
+ -moz-transition: -moz-transform 0.2s ease-out;
+ -o-transition: -o-transform 0.2s ease-out;
+ transition: transform 0.2s ease-out;
+ margin-top: -0.6rem;
+ line-height: 1.2rem;
+ display: inline-block
+}
+
+.main-menu.ui.segment.inverted #frameworkSidebar > .item > .title:hover:before, .main-menu.ui.segment.inverted #frameworkSidebar > .item .menu-item:hover:before, .main-menu.ui.segment.inverted #frameworkSidebar > .item > .title.current-item:before, .main-menu.ui.segment.inverted #frameworkSidebar > .item .menu-item.current-item:before {
+ position: absolute;
+ left: 0;
+ top: 0;
+ content: "";
+ width: 3px;
+ background-color: #40bf97;
+ bottom: 0
+}
+
+.main-menu.ui.segment.inverted #frameworkSidebar > .item > .title > i, .main-menu.ui.segment.inverted #frameworkSidebar > .item .menu-item > i {
+ position: absolute;
+ color: #aeb9c2;
+ width: 3em;
+ text-align: center
+}
+
+.main-menu.ui.segment.inverted #frameworkSidebar > .item > .title > i.iconfont:before, .main-menu.ui.segment.inverted #frameworkSidebar > .item .menu-item > i.iconfont:before, .main-menu.ui.segment.inverted #frameworkSidebar > .item > .title > i.dropdown-icon:before, .main-menu.ui.segment.inverted #frameworkSidebar > .item .menu-item > i.dropdown-icon:before {
+ font-size: 20px
+}
+
+.main-menu.ui.segment.inverted #frameworkSidebar > .item > .title > span, .main-menu.ui.segment.inverted #frameworkSidebar > .item .menu-item > span {
+ margin-left: 3.5em;
+ font-size: 0.85em;
+ color: rgba(255, 255, 255, 0.7)
+}
+
.main-menu.ui.segment.inverted #frameworkSidebar > .item > .title.active .dropdown-icon {
- -webkit-transform: rotate(-90deg) scale(0.8, 0.8);
- -moz-transform: rotate(-90deg) scale(0.8, 0.8);
- -ms-transform: rotate(-90deg) scale(0.8, 0.8);
- -o-transform: rotate(-90deg) scale(0.8, 0.8);
- transform: rotate(-90deg) scale(0.8, 0.8);
+ -webkit-transform: rotate(-90deg) scale(.8, .8);
+ -moz-transform: rotate(-90deg) scale(.8, .8);
+ -ms-transform: rotate(-90deg) scale(.8, .8);
+ -o-transform: rotate(-90deg) scale(.8, .8);
+ transform: rotate(-90deg) scale(.8, .8)
}
+
.main-menu.ui.segment.inverted #frameworkSidebar > .item > .content .menu-item.current-item .dropdown-icon {
- -webkit-transform: rotate(-90deg) scale(0.8, 0.8);
- -moz-transform: rotate(-90deg) scale(0.8, 0.8);
- -ms-transform: rotate(-90deg) scale(0.8, 0.8);
- -o-transform: rotate(-90deg) scale(0.8, 0.8);
- transform: rotate(-90deg) scale(0.8, 0.8);
+ -webkit-transform: rotate(-90deg) scale(.8, .8);
+ -moz-transform: rotate(-90deg) scale(.8, .8);
+ -ms-transform: rotate(-90deg) scale(.8, .8);
+ -o-transform: rotate(-90deg) scale(.8, .8);
+ transform: rotate(-90deg) scale(.8, .8)
}
+
#rightContainer {
- position: relative;
+ position: relative
}
+
#rightContainer .layer-dimmer {
- position: absolute;
- left: 0;
- right: 0;
- top: 0;
- bottom: 0;
- content: "";
- background-color: transparent;
- z-index: 60;
- display: none;
-}
+ position: absolute;
+ left: 0;
+ right: 0;
+ top: 0;
+ bottom: 0;
+ content: "";
+ background-color: transparent;
+ z-index: 60;
+ display: none
+}
+
#rightContainer.lock .layer-dimmer {
- display: block;
+ display: block
}
+
#subMenuLayer {
- overflow: hidden;
- width: 16em;
- -webkit-transition: width 0.2s ease-out;
- -moz-transition: width 0.2s ease-out;
- -o-transition: width 0.2s ease-out;
- transition: width 0.2s ease-out;
-}
+ overflow: hidden;
+ width: 16em;
+ -webkit-transition: width 0.2s ease-out;
+ -moz-transition: width 0.2s ease-out;
+ -o-transition: width 0.2s ease-out;
+ transition: width 0.2s ease-out
+}
+
#subMenuLayer.collapsed {
- width: 1.2em;
+ width: 1.2em
}
+
#subMenuLayer.collapsed > .title > * {
- display: none;
+ display: none
}
+
#subMenuLayer.collapsed #subMenuTree {
- display: none;
+ display: none
}
+
#subMenuLayer #subMenuNavbar {
- cursor: pointer;
- display: inline-block;
- position: absolute;
- overflow: hidden;
- top: 50%;
- right: 0;
- height: 48px;
- margin-top: -24px;
- background-color: transparent;
- width: 12px;
- padding: 12px 0;
-}
+ cursor: pointer;
+ display: inline-block;
+ position: absolute;
+ overflow: hidden;
+ top: 50%;
+ right: 0;
+ height: 48px;
+ margin-top: -24px;
+ background-color: transparent;
+ width: 12px;
+ padding: 12px 0
+}
+
#subMenuLayer #subMenuNavbar:hover {
- width: 14px;
+ width: 14px
}
+
#subMenuLayer #subMenuNavbar > div {
- display: inline-block;
- height: 24px;
- padding-top: 2px;
- padding-left: 2px;
- background-color: #ffffff;
- color: #314253;
-}
+ display: inline-block;
+ height: 24px;
+ padding-top: 2px;
+ padding-left: 2px;
+ background-color: #ffffff;
+ color: #314253
+}
+
#subMenuLayer #subMenuNavbar > div:before {
- position: absolute;
- right: 0;
- content: "";
- width: 0;
- top: 0px;
- left: 0px;
- height: 0;
- border-bottom: 12px solid #ffffff;
- border-left: 14px solid transparent;
-}
+ position: absolute;
+ right: 0;
+ content: "";
+ width: 0;
+ top: 0px;
+ left: 0px;
+ height: 0;
+ border-bottom: 12px solid #ffffff;
+ border-left: 14px solid transparent
+}
+
#subMenuLayer #subMenuNavbar > div:after {
- position: absolute;
- content: "";
- left: 0px;
- width: 0;
- height: 0;
- bottom: 0px;
- border-top: 12px solid #ffffff;
- border-left: 14px solid transparent;
-}
+ position: absolute;
+ content: "";
+ left: 0px;
+ width: 0;
+ height: 0;
+ bottom: 0px;
+ border-top: 12px solid #ffffff;
+ border-left: 14px solid transparent
+}
+
#subMenuLayer #subMenuNavbar > div i {
- line-height: 24px;
-}
-#subMenuLayer > .title {
- height: 65px;
- padding: 1em;
- background-color: #D9DEE4;
- line-height: 2.7em;
- color: #000000;
-}
-#subMenuLayer > .title i {
- font-size: 1.2em;
- margin-right: 0.6em;
- color: rgba(72, 179, 221, 0.81);
-}
+ line-height: 24px
+}
+
+#subMenuLayer > .v-box > .title {
+ height: 64px;
+ padding: 1em;
+ background-color: #D9DEE4;
+ line-height: 2.7em;
+ color: #000000
+}
+
+#subMenuLayer > .v-box > .title i {
+ font-size: 1.2em;
+ margin-right: 0.6em;
+ color: rgba(72, 179, 221, 0.81)
+}
+
#subMenuLayer #subMenuTree {
- height: 100%;
- background-color: #f3f3f4;
+ background-color: #f3f3f4
}
+
#subMenuLayer #subMenuTree .child-nodes {
- overflow: visible;
- margin-left: 1.8em !important;
+ overflow: visible;
+ margin-left: 1.8em !important
}
+
#subMenuLayer .tree.item {
- background-color: #fbfbfb;
+ background-color: #fbfbfb
}
+
#subMenuLayer .tree.node > .expand-button {
- width: 1.2em;
+ width: 1.2em
}
+
#subMenuLayer .tree.node > .node-content > i {
- position: absolute;
- color: #aeb9c2;
- width: 1.4em;
- text-align: center;
+ position: absolute;
+ color: #aeb9c2;
+ width: 1.4em;
+ text-align: center
}
+
#subMenuLayer .tree.node > .node-content > span {
- margin-left: 1.8em;
- font-size: 0.95em;
-}
+ margin-left: 1.8em;
+ font-size: 0.95em
+}
\ No newline at end of file
diff --git a/src/main/webapp/frame/main.html b/src/main/webapp/frame/main.html
index 3663905..9bbe94a 100644
--- a/src/main/webapp/frame/main.html
+++ b/src/main/webapp/frame/main.html
@@ -16,13 +16,16 @@
-
+
-
diff --git a/src/main/webapp/frame/main.js b/src/main/webapp/frame/main.js
index 0905117..b4ee83d 100644
--- a/src/main/webapp/frame/main.js
+++ b/src/main/webapp/frame/main.js
@@ -114,9 +114,22 @@
recursive: true,
expression: "menu in menu.menus"
}
+ },
+ itemClick: function(self, arg) {
+ var data, menus;
+ data = arg.item.get("data").toJSON();
+ menus = data.menus;
+ if (menus && menus.length > 0) {
+ return;
+ } else {
+ App.open(data.path, data);
+ cola.widget("subMenuLayer").hide();
+ }
}
},
subMenuLayer: {
+ $type: "Layer",
+ animation: "slide right",
beforeShow: function() {
return $("#viewTab").parent().addClass("lock");
},
diff --git a/src/main/webapp/frame/security/parser.css b/src/main/webapp/frame/security/parser.css
old mode 100644
new mode 100755
diff --git a/src/main/webapp/frame/security/parser.html b/src/main/webapp/frame/security/parser.html
old mode 100644
new mode 100755
diff --git a/src/main/webapp/frame/security/parser.js b/src/main/webapp/frame/security/parser.js
old mode 100644
new mode 100755
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
old mode 100644
new mode 100755
index 453075a..5a303d7
--- a/src/main/webapp/index.html
+++ b/src/main/webapp/index.html
@@ -1,6 +1,6 @@
-
+
@@ -12,31 +12,31 @@
-
-
-
-
-
+
+
+
+
+
-
-
服务启动
-
-
配置Context
-
本示例Context为/
+
+
服务启动
+
+
配置Context
+
本示例Context为/
所以请将jetty或者tomcat的context选项设定为/
+
-
-
-
相关配置
-
-
配置菜单
-
请将服务的修改对应配置
+
+
相关配置
+
+
配置菜单
+
请将服务的修改对应配置
properties = {
mainView: "./frame/main", //系统主框架界面
loginPath: "./login", //登录界面路径
@@ -89,37 +89,73 @@
content: 22
}
]
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/webapp/resources/cola-ui/3rd.js b/src/main/webapp/resources/cola-ui/3rd.js
old mode 100644
new mode 100755
diff --git a/src/main/webapp/resources/cola-ui/cola.css b/src/main/webapp/resources/cola-ui/cola.css
old mode 100644
new mode 100755
diff --git a/src/main/webapp/resources/cola-ui/cola.js b/src/main/webapp/resources/cola-ui/cola.js
old mode 100644
new mode 100755
diff --git a/src/main/webapp/resources/cola-ui/i18n/zh-CN/cola.js b/src/main/webapp/resources/cola-ui/i18n/zh-CN/cola.js
old mode 100644
new mode 100755
diff --git a/src/main/webapp/resources/cola-ui/semantic.css b/src/main/webapp/resources/cola-ui/semantic.css
old mode 100644
new mode 100755
diff --git a/src/main/webapp/resources/cola-ui/semantic.js b/src/main/webapp/resources/cola-ui/semantic.js
old mode 100644
new mode 100755
diff --git a/src/main/webapp/resources/cola-ui/themes/basic/assets/fonts/icons.eot b/src/main/webapp/resources/cola-ui/themes/basic/assets/fonts/icons.eot
old mode 100644
new mode 100755
diff --git a/src/main/webapp/resources/cola-ui/themes/basic/assets/fonts/icons.svg b/src/main/webapp/resources/cola-ui/themes/basic/assets/fonts/icons.svg
old mode 100644
new mode 100755
diff --git a/src/main/webapp/resources/cola-ui/themes/basic/assets/fonts/icons.ttf b/src/main/webapp/resources/cola-ui/themes/basic/assets/fonts/icons.ttf
old mode 100644
new mode 100755
diff --git a/src/main/webapp/resources/cola-ui/themes/basic/assets/fonts/icons.woff b/src/main/webapp/resources/cola-ui/themes/basic/assets/fonts/icons.woff
old mode 100644
new mode 100755
diff --git a/src/main/webapp/resources/cola-ui/themes/default/assets/fonts/icons.eot b/src/main/webapp/resources/cola-ui/themes/default/assets/fonts/icons.eot
old mode 100644
new mode 100755
diff --git a/src/main/webapp/resources/cola-ui/themes/default/assets/fonts/icons.otf b/src/main/webapp/resources/cola-ui/themes/default/assets/fonts/icons.otf
old mode 100644
new mode 100755
diff --git a/src/main/webapp/resources/cola-ui/themes/default/assets/fonts/icons.svg b/src/main/webapp/resources/cola-ui/themes/default/assets/fonts/icons.svg
old mode 100644
new mode 100755
diff --git a/src/main/webapp/resources/cola-ui/themes/default/assets/fonts/icons.ttf b/src/main/webapp/resources/cola-ui/themes/default/assets/fonts/icons.ttf
old mode 100644
new mode 100755
diff --git a/src/main/webapp/resources/cola-ui/themes/default/assets/fonts/icons.woff b/src/main/webapp/resources/cola-ui/themes/default/assets/fonts/icons.woff
old mode 100644
new mode 100755
diff --git a/src/main/webapp/resources/cola-ui/themes/default/assets/fonts/icons.woff2 b/src/main/webapp/resources/cola-ui/themes/default/assets/fonts/icons.woff2
old mode 100644
new mode 100755
diff --git a/src/main/webapp/resources/cola-ui/themes/default/assets/images/flags.png b/src/main/webapp/resources/cola-ui/themes/default/assets/images/flags.png
old mode 100644
new mode 100755
diff --git a/src/main/webapp/resources/cola-ui/themes/github/assets/fonts/octicons-local.ttf b/src/main/webapp/resources/cola-ui/themes/github/assets/fonts/octicons-local.ttf
old mode 100644
new mode 100755
diff --git a/src/main/webapp/resources/cola-ui/themes/github/assets/fonts/octicons.svg b/src/main/webapp/resources/cola-ui/themes/github/assets/fonts/octicons.svg
old mode 100644
new mode 100755
diff --git a/src/main/webapp/resources/cola-ui/themes/github/assets/fonts/octicons.ttf b/src/main/webapp/resources/cola-ui/themes/github/assets/fonts/octicons.ttf
old mode 100644
new mode 100755
diff --git a/src/main/webapp/resources/cola-ui/themes/github/assets/fonts/octicons.woff b/src/main/webapp/resources/cola-ui/themes/github/assets/fonts/octicons.woff
old mode 100644
new mode 100755
diff --git a/src/main/webapp/resources/font/iconfont.ttf b/src/main/webapp/resources/font/iconfont.ttf
old mode 100644
new mode 100755
diff --git a/src/main/webapp/resources/i18n/zh-CN/common.js b/src/main/webapp/resources/i18n/zh-CN/common.js
old mode 100644
new mode 100755
diff --git a/src/main/webapp/resources/images/avatars/alex.png b/src/main/webapp/resources/images/avatars/alex.png
old mode 100644
new mode 100755
diff --git a/src/main/webapp/resources/images/bg.jpg b/src/main/webapp/resources/images/bg.jpg
old mode 100644
new mode 100755
diff --git a/src/main/webapp/resources/images/bg2.jpg b/src/main/webapp/resources/images/bg2.jpg
old mode 100644
new mode 100755
diff --git a/src/main/webapp/resources/images/bg3.jpg b/src/main/webapp/resources/images/bg3.jpg
old mode 100644
new mode 100755
diff --git a/src/main/webapp/resources/images/bg4.jpg b/src/main/webapp/resources/images/bg4.jpg
old mode 100644
new mode 100755
diff --git a/src/main/webapp/resources/images/bg5.jpg b/src/main/webapp/resources/images/bg5.jpg
old mode 100644
new mode 100755
diff --git a/src/main/webapp/resources/images/bg6.jpg b/src/main/webapp/resources/images/bg6.jpg
old mode 100644
new mode 100755
diff --git a/src/main/webapp/resources/images/bg7.jpg b/src/main/webapp/resources/images/bg7.jpg
old mode 100644
new mode 100755
diff --git a/src/main/webapp/resources/images/logo.png b/src/main/webapp/resources/images/logo.png
old mode 100644
new mode 100755
diff --git a/src/main/webapp/resources/jquery/jquery-2.1.3.js b/src/main/webapp/resources/jquery/jquery-2.1.3.js
old mode 100644
new mode 100755
diff --git a/src/main/webapp/resources/jquery/jquery.cookie.js b/src/main/webapp/resources/jquery/jquery.cookie.js
old mode 100644
new mode 100755
diff --git a/src/main/webapp/resources/nprogress/nprogress.css b/src/main/webapp/resources/nprogress/nprogress.css
old mode 100644
new mode 100755
diff --git a/src/main/webapp/resources/nprogress/nprogress.js b/src/main/webapp/resources/nprogress/nprogress.js
old mode 100644
new mode 100755
diff --git a/src/main/webapp/site.css b/src/main/webapp/site.css
old mode 100644
new mode 100755
diff --git a/src/main/webapp/themes.html b/src/main/webapp/themes.html
old mode 100644
new mode 100755
index 7a74578..3372f7a
--- a/src/main/webapp/themes.html
+++ b/src/main/webapp/themes.html
@@ -16,35 +16,35 @@
Colors
-
-
-
-
+
+
+
-
-
-
-
+
+
+
-
-
-
-
+
+
+
-
-
-
-
+
+
+
-
-
-
-
+
+
+
Font
@@ -54,9 +54,13 @@
头部内容1
头部内容2
头部内容3
头部内容4
small标签小字体
-
+
Link 链接定义
-
+
背景色定义
-
diff --git a/src/main/webapp/themes/green.css b/src/main/webapp/themes/green.css
old mode 100644
new mode 100755
diff --git a/src/main/webapp/themes/material.css b/src/main/webapp/themes/material.css
old mode 100644
new mode 100755