4.5.8版本发布

doc/db-mcms-open-4.5.8.sql

@@ -4,13 +4,13 @@ Navicat MySQL Data Transfer
 Source Server         : localhost
 Source Server Version : 50520
 Source Host           : localhost:3306
-Source Database       : db-mcms-open
+Source Database       : db-mcms-open-4.5.8
 
 Target Server Type    : MYSQL
 Target Server Version : 50520
 File Encoding         : 65001
 
-Date: 2016-06-27 16:47:31
+Date: 2016-06-28 16:09:01
 */
 
 SET FOREIGN_KEY_CHECKS=0;
@@ -323,6 +323,7 @@ DROP TABLE IF EXISTS `basic_child`;
 CREATE TABLE `basic_child` (
   `bc_basic_Id` int(11) NOT NULL COMMENT '基础basicId',
   `bc_basic_child_Id` int(11) DEFAULT NULL COMMENT '基础basicId关联的子id',
+  PRIMARY KEY (`bc_basic_Id`),
   KEY `bc_basic_Id` (`bc_basic_Id`) USING BTREE,
   KEY `bc_basic_child_Id` (`bc_basic_child_Id`) USING BTREE,
   CONSTRAINT `basic_child_ibfk_1` FOREIGN KEY (`bc_basic_Id`) REFERENCES `basic` (`BASIC_ID`),
@@ -453,7 +454,7 @@ INSERT INTO `category` VALUES ('148', '短图', '0', '2016-06-02 17:24:21', '50'
 -- ----------------------------
 DROP TABLE IF EXISTS `cms_article`;
 CREATE TABLE `cms_article` (
-  `ARTICLE_BASICID` int(20) DEFAULT NULL COMMENT '文章ID',
+  `ARTICLE_BASICID` int(20) NOT NULL DEFAULT '0' COMMENT '文章ID',
   `ARTICLE_AUTHOR` varchar(20) DEFAULT NULL COMMENT '文章作者',
   `ARTICLE_CONTENT` longtext COMMENT '文章内容',
   `ARTICLE_TYPE` varchar(100) DEFAULT NULL COMMENT '文章类型',
@@ -462,6 +463,7 @@ CREATE TABLE `cms_article` (
   `ARTICLE_KEYWORD` varchar(300) DEFAULT NULL COMMENT '文章关键字',
   `ARTICLE_FREEORDER` int(255) DEFAULT NULL COMMENT '文章自定义显示顺序',
   `ARTICLE_WEBID` int(11) DEFAULT NULL COMMENT '文章管理的应用id',
+  PRIMARY KEY (`ARTICLE_BASICID`),
   UNIQUE KEY `ARTICLE_BASICID` (`ARTICLE_BASICID`) USING BTREE,
   KEY `ARTICLE_WEBID` (`ARTICLE_WEBID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='文章表';
@@ -1130,20 +1132,20 @@ CREATE TABLE `system_skin_manager` (
 -- View structure for `v_article`
 -- ----------------------------
 DROP VIEW IF EXISTS `v_article`;
-CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`%` SQL SECURITY INVOKER VIEW `v_article` AS select `cms_article`.`ARTICLE_BASICID` AS `ARTICLE_BASICID`,`basic`.`BASIC_ID` AS `BASIC_ID`,`basic`.`BASIC_CATEGORYID` AS `BASIC_CATEGORYID`,`basic`.`BASIC_TITLE` AS `BASIC_TITLE`,`basic`.`BASIC_DESCRIPTION` AS `BASIC_DESCRIPTION`,`basic`.`BASIC_THUMBNAILS` AS `BASIC_THUMBNAILS`,`basic`.`BASIC_HIT` AS `BASIC_HIT`,`basic`.`BASIC_DATETIME` AS `BASIC_DATETIME`,`basic`.`BASIC_UPDATETIME` AS `BASIC_UPDATETIME`,`basic`.`BASIC_PEOPLEID` AS `BASIC_PEOPLEID`,`cms_article`.`ARTICLE_AUTHOR` AS `ARTICLE_AUTHOR`,`cms_article`.`ARTICLE_CONTENT` AS `ARTICLE_CONTENT`,`cms_article`.`ARTICLE_TYPE` AS `ARTICLE_TYPE`,`cms_article`.`ARTICLE_SOURCE` AS `ARTICLE_SOURCE`,`cms_article`.`ARTICLE_URL` AS `ARTICLE_URL`,`cms_article`.`ARTICLE_KEYWORD` AS `ARTICLE_KEYWORD`,`cms_article`.`ARTICLE_FREEORDER` AS `ARTICLE_FREEORDER`,`cms_article`.`ARTICLE_WEBID` AS `ARTICLE_WEBID`,`cms_column`.`COLUMN_KEYWORD` AS `COLUMN_KEYWORD`,`cms_column`.`COLUMN_DESCRIP` AS `COLUMN_DESCRIP`,`cms_column`.`COLUMN_TYPE` AS `COLUMN_TYPE`,`cms_column`.`COLUMN_URL` AS `COLUMN_URL`,`cms_column`.`COLUMN_LISTURL` AS `COLUMN_LISTURL`,`cms_column`.`COLUMN_TENTMODELID` AS `COLUMN_TENTMODELID`,`cms_column`.`COLUMN_WEBSITEID` AS `COLUMN_WEBSITEID`,`cms_column`.`COLUMN_PATH` AS `column_path`,`cms_column`.`COLUMN_CONTENTMODELID` AS `COLUMN_CONTENTMODELID`,`category`.`CATEGORY_TITLE` AS `CATEGORY_TITLE`,`category`.`CATEGORY_APPID` AS `CATEGORY_APPID`,`cms_column`.`COLUMN_CATEGORYID` AS `COLUMN_CATEGORYID`,`category`.`CATEGORY_ID` AS `CATEGORY_ID`,`basic`.`BASIC_SORT` AS `BASIC_SORT` from (((`basic` join `cms_article` on((`basic`.`BASIC_ID` = `cms_article`.`ARTICLE_BASICID`))) join `cms_column` on((`basic`.`BASIC_CATEGORYID` = `cms_column`.`COLUMN_CATEGORYID`))) join `category` on((`cms_column`.`COLUMN_CATEGORYID` = `category`.`CATEGORY_ID`))) ;
+CREATE  VIEW `v_article` AS select `cms_article`.`ARTICLE_BASICID` AS `ARTICLE_BASICID`,`basic`.`BASIC_ID` AS `BASIC_ID`,`basic`.`BASIC_CATEGORYID` AS `BASIC_CATEGORYID`,`basic`.`BASIC_TITLE` AS `BASIC_TITLE`,`basic`.`BASIC_DESCRIPTION` AS `BASIC_DESCRIPTION`,`basic`.`BASIC_THUMBNAILS` AS `BASIC_THUMBNAILS`,`basic`.`BASIC_HIT` AS `BASIC_HIT`,`basic`.`BASIC_DATETIME` AS `BASIC_DATETIME`,`basic`.`BASIC_UPDATETIME` AS `BASIC_UPDATETIME`,`basic`.`BASIC_PEOPLEID` AS `BASIC_PEOPLEID`,`cms_article`.`ARTICLE_AUTHOR` AS `ARTICLE_AUTHOR`,`cms_article`.`ARTICLE_CONTENT` AS `ARTICLE_CONTENT`,`cms_article`.`ARTICLE_TYPE` AS `ARTICLE_TYPE`,`cms_article`.`ARTICLE_SOURCE` AS `ARTICLE_SOURCE`,`cms_article`.`ARTICLE_URL` AS `ARTICLE_URL`,`cms_article`.`ARTICLE_KEYWORD` AS `ARTICLE_KEYWORD`,`cms_article`.`ARTICLE_FREEORDER` AS `ARTICLE_FREEORDER`,`cms_article`.`ARTICLE_WEBID` AS `ARTICLE_WEBID`,`cms_column`.`COLUMN_KEYWORD` AS `COLUMN_KEYWORD`,`cms_column`.`COLUMN_DESCRIP` AS `COLUMN_DESCRIP`,`cms_column`.`COLUMN_TYPE` AS `COLUMN_TYPE`,`cms_column`.`COLUMN_URL` AS `COLUMN_URL`,`cms_column`.`COLUMN_LISTURL` AS `COLUMN_LISTURL`,`cms_column`.`COLUMN_TENTMODELID` AS `COLUMN_TENTMODELID`,`cms_column`.`COLUMN_WEBSITEID` AS `COLUMN_WEBSITEID`,`cms_column`.`COLUMN_PATH` AS `column_path`,`cms_column`.`COLUMN_CONTENTMODELID` AS `COLUMN_CONTENTMODELID`,`category`.`CATEGORY_TITLE` AS `CATEGORY_TITLE`,`category`.`CATEGORY_APPID` AS `CATEGORY_APPID`,`cms_column`.`COLUMN_CATEGORYID` AS `COLUMN_CATEGORYID`,`category`.`CATEGORY_ID` AS `CATEGORY_ID`,`basic`.`BASIC_SORT` AS `BASIC_SORT` from (((`basic` join `cms_article` on((`basic`.`BASIC_ID` = `cms_article`.`ARTICLE_BASICID`))) join `cms_column` on((`basic`.`BASIC_CATEGORYID` = `cms_column`.`COLUMN_CATEGORYID`))) join `category` on((`cms_column`.`COLUMN_CATEGORYID` = `category`.`CATEGORY_ID`))) ;
 
 -- ----------------------------
 -- View structure for `v_people_user`
 -- ----------------------------
 DROP VIEW IF EXISTS `v_people_user`;
-CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`%` SQL SECURITY INVOKER VIEW `v_people_user` AS select `people`.`PEOPLE_ID` AS `PEOPLE_ID`,`people`.`PEOPLE_PHONE` AS `PEOPLE_PHONE`,`people`.`PEOPLE_NAME` AS `PEOPLE_NAME`,`people`.`PEOPLE_PASSWORD` AS `PEOPLE_PASSWORD`,`people`.`PEOPLE_DATETIME` AS `PEOPLE_DATETIME`,`people`.`PEOPLE_APP_ID` AS `PEOPLE_APP_ID`,`people`.`PEOPLE_MAIL` AS `PEOPLE_MAIL`,`people`.`PEOPLE_STATE` AS `PEOPLE_STATE`,`people`.`PEOPLE_CODE` AS `PEOPLE_CODE`,`people`.`PEOPLE_CODESENDDATE` AS `PEOPLE_CODESENDDATE`,`people`.`PEOPLE_PHONECHECK` AS `PEOPLE_PHONECHECK`,`people`.`PEOPLE_MAILLCHECK` AS `PEOPLE_MAILLCHECK`,`people_user`.`PU_PEOPLE_ID` AS `PU_PEOPLE_ID`,`people_user`.`PU_REAL_NAME` AS `PU_REAL_NAME`,`people_user`.`PU_ADDRESS` AS `PU_ADDRESS`,`people_user`.`PU_ICON` AS `PU_ICON`,`people_user`.`PU_NICKNAME` AS `PU_NICKNAME`,`people_user`.`PU_SEX` AS `PU_SEX`,`people_user`.`PU_BIRTHDAY` AS `PU_BIRTHDAY`,`people_user`.`PU_CARD` AS `PU_CARD`,`people_user`.`PU_APP_ID` AS `PU_APP_ID` from (`people` left join `people_user` on((`people`.`PEOPLE_ID` = `people_user`.`PU_PEOPLE_ID`))) ;
+CREATE  VIEW `v_people_user` AS select `people`.`PEOPLE_ID` AS `PEOPLE_ID`,`people`.`PEOPLE_PHONE` AS `PEOPLE_PHONE`,`people`.`PEOPLE_NAME` AS `PEOPLE_NAME`,`people`.`PEOPLE_PASSWORD` AS `PEOPLE_PASSWORD`,`people`.`PEOPLE_DATETIME` AS `PEOPLE_DATETIME`,`people`.`PEOPLE_APP_ID` AS `PEOPLE_APP_ID`,`people`.`PEOPLE_MAIL` AS `PEOPLE_MAIL`,`people`.`PEOPLE_STATE` AS `PEOPLE_STATE`,`people`.`PEOPLE_CODE` AS `PEOPLE_CODE`,`people`.`PEOPLE_CODESENDDATE` AS `PEOPLE_CODESENDDATE`,`people`.`PEOPLE_PHONECHECK` AS `PEOPLE_PHONECHECK`,`people`.`PEOPLE_MAILLCHECK` AS `PEOPLE_MAILLCHECK`,`people_user`.`PU_PEOPLE_ID` AS `PU_PEOPLE_ID`,`people_user`.`PU_REAL_NAME` AS `PU_REAL_NAME`,`people_user`.`PU_ADDRESS` AS `PU_ADDRESS`,`people_user`.`PU_ICON` AS `PU_ICON`,`people_user`.`PU_NICKNAME` AS `PU_NICKNAME`,`people_user`.`PU_SEX` AS `PU_SEX`,`people_user`.`PU_BIRTHDAY` AS `PU_BIRTHDAY`,`people_user`.`PU_CARD` AS `PU_CARD`,`people_user`.`PU_APP_ID` AS `PU_APP_ID` from (`people` left join `people_user` on((`people`.`PEOPLE_ID` = `people_user`.`PU_PEOPLE_ID`))) ;
 
 -- ----------------------------
 -- Procedure structure for `p_getAllChildren`
 -- ----------------------------
 DROP PROCEDURE IF EXISTS `p_getAllChildren`;
 DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `p_getAllChildren`(`pId` int,`appId`int,`modelId` int)
+CREATE  PROCEDURE `p_getAllChildren`(`pId` int,`appId`int,`modelId` int)
 BEGIN
 	
    declare lev int;

pom.xml

@@ -146,7 +146,7 @@
 		<dependency>
 			<groupId>net.mingsoft</groupId>
 			<artifactId>ms-upgrader</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
+			<version>1.0.2-SNAPSHOT</version>
 		</dependency>
 
 	</dependencies>

src/main/java/com/mingsoft/cms/action/ArticleAction.java

@@ -176,6 +176,7 @@ public class ArticleAction extends BaseAction {
 		mode.addAttribute("articleType", articleType);
 		mode.addAttribute("categoryTitle", categoryTitle);
 		mode.addAttribute("categoryId", categoryId);
+		BasicUtil.removeUrlParams(new String[]{"pageNo"});
 		return view("/cms/article/article_list");
 	}
 

src/main/java/com/mingsoft/cms/parser/CmsParser.java

@@ -638,7 +638,7 @@ public class CmsParser extends IGeneralParser {
 						order = "desc";
 					}
 					
-					BasicUtil.startPage(page.getPageNo(),page.getPageSize(),false);
+					BasicUtil.startPage(page.getPageNo()+1,page.getPageSize(),false);
 					// 从数据库取出文章列表数组
 					List<ArticleEntity> listArticles = articleBiz.query(this.app.getAppId(), columnIds, flag, noFlag,  orderBy, order.equals("desc") ? true : false,null);
 					// 替换列表标签

src/main/java/com/mingsoft/people/action/people/PeopleAction.java

@@ -242,7 +242,7 @@ public class PeopleAction extends BaseAction {
 	 * 
 	 * @param key
 	 */
-	@RequestMapping(value="/{diy}",method=RequestMethod.GET)
+	@RequestMapping(value="/{diy}")
 	public void diy(@PathVariable(value = "diy") String diy, HttpServletRequest req, HttpServletResponse resp) {
 		String content = this.generaterPage("people/" + diy, peopleParser, req);
 		this.outString(resp, content);

src/main/java/com/mingsoft/people/action/web/PeopleAction.java

@@ -222,6 +222,8 @@ public class PeopleAction extends BaseAction {
 
 		}
 
+		LOG.debug(_people.getPeoplePhoneCheck()+":"+PeopleEnum.PHONE_CHECK.toInt());
+		LOG.debug(_people.getPeopleCode()+":"+people.getPeopleCode());
 		// 判断用户验证是否通过\判断用户输入对邮箱验证码是否与系统发送对一致\判断验证码对有效时间
 		if (_people.getPeoplePhoneCheck() == PeopleEnum.PHONE_CHECK.toInt()
 				&& _people.getPeopleCode().equals(people.getPeopleCode())) {
@@ -257,8 +259,8 @@ public class PeopleAction extends BaseAction {
 	@ResponseBody
 	public void isExists(@ModelAttribute PeopleEntity people, HttpServletRequest request,
 			HttpServletResponse response) {
-
-		if (StringUtil.isBlank(people.getPeopleName())) {
+		LOG.debug(JSONObject.toJSONString(people)); 
+		if (StringUtil.isBlank(people.getPeopleName()) && StringUtil.isBlank(people.getPeoplePhone()) && StringUtil.isBlank(people.getPeopleMail())) {
 			this.outJson(response, ModelCode.PEOPLE, false,
 					this.getResString("err.empty", this.getResString("people.name")));
 			return;
@@ -425,6 +427,7 @@ public class PeopleAction extends BaseAction {
 	 *            用户信息<br/>
 	 *            <i>people参数包含字段信息参考：</i><br/>
 	 *            peoplePassword 用户新密码<br/>
+	 *            peopleCode 验证码<br/>
 	 *            <dt><span class="strong">返回</span></dt><br/>
 	 *            {code:"错误编码",<br/>
 	 *            result:"true｜false",<br/>
@@ -463,9 +466,11 @@ public class PeopleAction extends BaseAction {
 				&& _people.getPeopleCode().equals(people.getPeopleCode())) {
 			_people.setPeoplePassword(MD5Util.MD5Encode(people.getPeoplePassword(), Const.UTF8));
 			peopleBiz.updateEntity(_people);
+			LOG.debug("更新密码成功");
 			this.outJson(response, ModelCode.PEOPLE, true,
 					this.getResString("success", this.getResString("people.get.password")));
 		} else {
+			LOG.debug("更新密码失败");
 			this.outJson(response, ModelCode.PEOPLE, false,
 					this.getResString("fail", this.getResString("people.get.password")));
 		}
@@ -600,6 +605,10 @@ public class PeopleAction extends BaseAction {
 		// 更新该实体
 		this.peopleBiz.updateEntity(people);
 
+		PeopleEntity _people = (PeopleEntity) this.getSession(request, SessionConstEnum.PEOPLE_EXISTS_SESSION);
+		if (_people!=null) {
+			this.setSession(request, SessionConstEnum.PEOPLE_EXISTS_SESSION, people);
+		}
 		if (StringUtil.isMobile(receive)) {
 			Result rs = Proxy.post(this.getUrl(request) + "/sms/send.do", null, params, Const.UTF8);
 			this.outJson(response, rs.getContent());

src/main/java/com/mingsoft/people/dao/IPeopleDao.xml

@@ -93,6 +93,7 @@
 	<update id="updateEntity" parameterType="com.mingsoft.base.entity.BaseEntity">
 		update people
 		<set>
+			PEOPLE_ID=#{peopleId},
 			<if test="peoplePhone != null">PEOPLE_PHONE=#{peoplePhone},</if>
 			<if test="peopleName != null">PEOPLE_NAME=#{peopleName},</if>
 			<if test="peoplePassword != null">PEOPLE_PASSWORD=#{peoplePassword},</if>

src/main/java/com/mingsoft/people/entity/PeopleEntity.java

@@ -116,7 +116,7 @@ public class PeopleEntity extends SessionEntity {
 	/**
 	 * 用户状态 1.已审核 0.未审核
 	 */
-	private int peopleState;
+	private Integer peopleState;
 
 	/**
 	 * 用户真信息
@@ -220,7 +220,7 @@ public class PeopleEntity extends SessionEntity {
 	 * 
 	 * @return peopleState
 	 */
-	public int getPeopleState() {
+	public Integer getPeopleState() {
 		return peopleState;
 	}
 
@@ -355,7 +355,7 @@ public class PeopleEntity extends SessionEntity {
 	 * @see setPeopleState(BaseEnum e)
 	 * @param peopleState
 	 */
-	public void setPeopleState(int peopleState) {
+	public void setPeopleState(Integer peopleState) {
 		this.peopleState = peopleState;
 	}
 

src/main/webapp/WEB-INF/manager/cms/article/index.ftl

@@ -17,7 +17,7 @@
 	</@ms.contentMenu>
 	<@ms.contentBody width="85%" style="overflow-y: hidden;">
 		<@ms.contentPanel  style="margin:0;padding:0;overflow-y: hidden;">
-		<iframe src="${base}${baseManager}/cms/article/0/list.do" style="width:100%;maring:0;padding:0;border:none;height:100%;background-image: url(${skin_manager_loadding});  background-repeat: no-repeat;  background-position: center;" id="listFrame" target="listFrame" ></iframe>
+		<iframe src="${managerPath}/cms/article/0/list.do" style="width:100%;maring:0;padding:0;border:none;height:100%;background-image: url(${skin_manager_loadding});  background-repeat: no-repeat;  background-position: center;" id="listFrame" target="listFrame" ></iframe>
 		</@ms.contentPanel>
 	</@ms.contentBody>
 </@ms.content>
@@ -25,7 +25,7 @@
 //树形结点
 function getZtreeId(event,treeId,treeNode){
 	if (treeNode.columnType==1) {
-		$("#listFrame").attr("src","${managerPath}/list.do?categoryTitle="+encodeURIComponent(treeNode.categoryTitle));
+		$("#listFrame").attr("src","${managerPath}/cms/article/"+treeNode.categoryId+"/list.do?categoryTitle="+encodeURIComponent(treeNode.categoryTitle));
 	} else if(treeNode.columnType==2){
 		//判断该单篇栏目是否存在文章
 		$.ajax({ 
@@ -34,14 +34,17 @@ function getZtreeId(event,treeId,treeNode){
 			dataType:"json",
 			success: function(msg){
 				if (msg.result) {
-					$("#listFrame").attr("src","${base}${managerPath}${managerPath}${managerPath}yId+"&categoryTitle="+encodeURIComponent(treeNode.categoryTitle));
+					$("#listFrame").attr("src","${managerPath}/cms/article/add.do?categoryId="+treeNode.categoryId+"&categoryTitle="+encodeURIComponent(treeNode.categoryTitle));
 				} else {
 					//如果该单篇栏目下存在文章则跳转到文章编辑页
-					$("#listFrame").attr("src","${base}${managerPath}ticle/"${managerPath}/edit.${managerPath}ode.categoryId+"&categoryTitle="+encodeURIComponent(treeNode.categoryTitle));
+					$("#listFrame").attr("src","${managerPath}/cms/article/"+treeNode.categoryId+"/edit.do?categoryId="+treeNode.categoryId+"&categoryTitle="+encodeURIComponent(treeNode.categoryTitle));
 				}
 			},
 		});
 	} else if(treeNode.columnType=="" || treeNode.columnType == undefined){
-		$("#listFrame").attr("src","${base}${managerPath}ticle/0/list.d${managerPath}>
+		$("#listFrame").attr("src","${managerPath}/cms/article/0/list.do"); 
+	}
+}
+</script>
 </body>
-</html>
+</html>
\ No newline at end of file

src/main/webapp/WEB-INF/manager/cms/column/column_list.ftl

@@ -7,7 +7,7 @@
 <body>	
 <@ms.content>
 <@ms.contentBody >
-	<@ms.contentNav title="栏目管理" ></@ms.contentNav >
+	<@ms.contentNav title="栏目管理 " ></@ms.contentNav >
 	<@ms.contentPanel>
 		<@ms.panelNav>
 			<@ms.panelNavBtnGroup>

src/main/webapp/static/plugins/bootstrap.daterangepicker/1.3.4/daterangepicker.css

+/*!
+ * Stylesheet for the Date Range Picker, for use with Bootstrap 3.x
+ *
+ * Copyright 2013 Dan Grossman ( http://www.dangrossman.info )
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Built for http://www.improvely.com
+ */
+
+ .daterangepicker.dropdown-menu {
+  max-width: none;
+  z-index: 3000;
+}
+
+.daterangepicker.opensleft .ranges, .daterangepicker.opensleft .calendar {
+  float: left;
+  margin: 4px;
+}
+
+.daterangepicker.opensright .ranges, .daterangepicker.opensright .calendar {
+  float: right;
+  margin: 4px;
+}
+
+.daterangepicker .ranges {
+  width: 160px;
+  text-align: left;
+}
+
+.daterangepicker .ranges .range_inputs>div {
+  float: left;
+}
+
+.daterangepicker .ranges .range_inputs>div:nth-child(2) {
+  padding-left: 11px;
+}
+
+.daterangepicker .calendar {
+  display: none;
+  max-width: 270px;
+}
+
+.daterangepicker.show-calendar .calendar {
+    display: block;
+}
+
+.daterangepicker .calendar.single .calendar-date {
+  border: none;
+}
+
+.daterangepicker .calendar th, .daterangepicker .calendar td {
+  font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+  white-space: nowrap;
+  text-align: center;
+  min-width: 32px;
+}
+
+.daterangepicker .daterangepicker_start_input label,
+.daterangepicker .daterangepicker_end_input label {
+  color: #333;
+  display: block;
+  font-size: 11px;
+  font-weight: normal;
+  height: 20px;
+  line-height: 20px;
+  margin-bottom: 2px;
+  text-shadow: #fff 1px 1px 0px;
+  text-transform: uppercase;
+  width: 74px;
+}
+
+.daterangepicker .ranges input {
+  font-size: 11px;
+}
+
+.daterangepicker .ranges .input-mini {
+  background-color: #eee;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  color: #555;
+  display: block;
+  font-size: 11px;
+  height: 30px;
+  line-height: 30px;
+  vertical-align: middle;
+  margin: 0 0 10px 0;
+  padding: 0 6px;
+  width: 74px;
+}
+
+.daterangepicker .ranges ul {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+}
+
+.daterangepicker .ranges li {
+  font-size: 13px;
+  background: #f5f5f5;
+  border: 1px solid #f5f5f5;
+  color: #08c;
+  padding: 3px 12px;
+  margin-bottom: 8px;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  cursor: pointer;
+}
+
+.daterangepicker .ranges li.active, .daterangepicker .ranges li:hover {
+  background: #08c;
+  border: 1px solid #08c;
+  color: #fff;
+}
+
+.daterangepicker .calendar-date {
+  border: 1px solid #ddd;
+  padding: 4px;
+  border-radius: 4px;
+  background: #fff;
+}
+
+.daterangepicker .calendar-time {
+  text-align: center;
+  margin: 8px auto 0 auto;
+  line-height: 30px;
+}
+
+.daterangepicker {
+  position: absolute;
+  background: #fff;
+  top: 100px;
+  left: 20px;
+  padding: 4px;
+  margin-top: 1px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+
+.daterangepicker.opensleft:before {
+  position: absolute;
+  top: -7px;
+  right: 9px;
+  display: inline-block;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-left: 7px solid transparent;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  content: '';
+}
+
+.daterangepicker.opensleft:after {
+  position: absolute;
+  top: -6px;
+  right: 10px;
+  display: inline-block;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #fff;
+  border-left: 6px solid transparent;
+  content: '';
+}
+
+.daterangepicker.opensright:before {
+  position: absolute;
+  top: -7px;
+  left: 9px;
+  display: inline-block;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-left: 7px solid transparent;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  content: '';
+}
+
+.daterangepicker.opensright:after {
+  position: absolute;
+  top: -6px;
+  left: 10px;
+  display: inline-block;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #fff;
+  border-left: 6px solid transparent;
+  content: '';
+}
+
+.daterangepicker table {
+  width: 100%;
+  margin: 0;
+}
+
+.daterangepicker td, .daterangepicker th {
+  text-align: center;
+  width: 20px;
+  height: 20px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  cursor: pointer;
+  white-space: nowrap;
+}
+
+.daterangepicker td.off {
+  color: #999;
+}
+
+.daterangepicker td.disabled {
+  color: #999;
+}
+
+.daterangepicker td.available:hover, .daterangepicker th.available:hover {
+  background: #eee;
+}
+
+.daterangepicker td.in-range {
+  background: #ebf4f8;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+
+.daterangepicker td.active, .daterangepicker td.active:hover {
+  background-color: #357ebd;
+  border-color: #3071a9;
+  color: #fff;
+}
+
+.daterangepicker td.week, .daterangepicker th.week {
+  font-size: 80%;
+  color: #ccc;
+}
+
+.daterangepicker select.monthselect, .daterangepicker select.yearselect {
+  font-size: 12px;
+  padding: 1px;
+  height: auto;
+  margin: 0;
+  cursor: default;
+}
+
+.daterangepicker select.monthselect {
+  margin-right: 2%;
+  width: 56%;
+}
+
+.daterangepicker select.yearselect {
+  width: 40%;
+}
+
+.daterangepicker select.hourselect, .daterangepicker select.minuteselect, .daterangepicker select.ampmselect {
+  width: 50px;
+  margin-bottom: 0;
+}
+
+.daterangepicker_start_input {
+  float: left;
+}
+
+.daterangepicker_end_input {
+  float: left; 
+  padding-left: 11px
+}
+
+.daterangepicker th.month {
+  width: auto;
+}

src/main/webapp/static/plugins/bootstrap/3.3.5/css/bootstrap-notify.css

+.notifications {
+  position: fixed;
+  z-index: 9999;
+}
+
+/* Positioning */ 
+.notifications.top-right {
+  right: 10px;
+  top: 25px;
+}
+
+.notifications.top-left {
+  left: 10px;
+  top: 25px;
+}
+
+.notifications.bottom-left {
+  left: 10px;
+  bottom: 25px;
+}
+
+.notifications.bottom-right {
+  right: 10px;
+  bottom: 25px;
+}
+
+/* Notification Element */
+.notifications > div {
+  position: relative;
+  margin: 5px 0px;
+}

src/main/webapp/static/plugins/bootstrap/3.3.5/css/bootstrapValidator.css

+/**
+ * BootstrapValidator (http://bootstrapvalidator.com)
+ * The best jQuery plugin to validate form fields. Designed to use with Bootstrap 3
+ *
+ * @author      http://twitter.com/nghuuphuoc
+ * @copyright   (c) 2013 - 2014 Nguyen Huu Phuoc
+ * @license     Commercial: http://bootstrapvalidator.com/license/
+ *              Non-commercial: http://creativecommons.org/licenses/by-nc-nd/3.0/
+ */
+
+.bv-form .help-block {
+    margin-bottom: 0;
+}
+.bv-form .tooltip-inner {
+    text-align: left;
+}
+.nav-tabs li.bv-tab-success > a {
+    color: #3c763d;
+}
+.nav-tabs li.bv-tab-error > a {
+    color: #a94442;
+}
+
+.bv-form .bv-icon-no-label {
+	top: 0;
+}
+
+.bv-form .bv-icon-input-group {
+	top: 0;
+	z-index: 100;
+}
\ No newline at end of file

src/main/webapp/static/plugins/iconfont/1.0.0/iconfont.css

+@font-face {
+  font-family: 'iconfont';
+  src: url('http://at.alicdn.com/t/font_1421490211_4230533.eot'); /* IE9*/
+  src: url('http://at.alicdn.com/t/font_1421490211_4230533.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+  url('http://at.alicdn.com/t/font_1421490211_4230533.woff') format('woff'), /* chrome、firefox */
+  url('http://at.alicdn.com/t/font_1421490211_4230533.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/
+  url('http://at.alicdn.com/t/font_1421490211_4230533.svg#iconfont') format('svg'); /* iOS 4.1- */
+}
+
+.iconfont {
+  font-family:"iconfont" !important;
+  font-size:2rem;
+  font-style:normal;
+  -webkit-font-smoothing: antialiased;
+  -webkit-text-stroke-width: 0.2px;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+
+
+.icon_lists li{
+  float:left;
+  width: 100px;
+  height:150px;
+  text-align: center;
+} 
+.icon_lists .icon{
+  font-size: 42px;
+  line-height: 100px;
+  margin: 10px 0;
+  color:#333;
+  -webkit-transition: font-size 0.25s ease-out 0s;
+  -moz-transition: font-size 0.25s ease-out 0s;
+  transition: font-size 0.25s ease-out 0s;
+
+}