周伟鹏 / cnlive_shenhe · Commits

Commit d29c1c772a39f87fd9aef62e15b87455e7f00d69

Authored by 王言钊
2 parents ed895398 b1afd417

Merge remote-tracking branch 'origin/dev' into dev 

# Conflicts:
#	src/main/java/com/cnlive/shenhe/controller/ShyActivityController.java
#	src/main/java/com/cnlive/shenhe/serviceImpl/ShyActivityImpl.java
#	src/main/resources/templates/page/activity.html
Inline Side-by-side
Showing 1 changed file with 20 additions and 16 deletions
src/main/resources/templates/common/frame.html
  View file @d29c1c7
@@ -11,15 +11,15 @@ @@ -11,15 +11,15 @@
11 </a> 11 </a>
12 <!-- Header Navbar: style can be found in header.less --> 12 <!-- Header Navbar: style can be found in header.less -->
13 <script> 13 <script>
14 - $(document).ready(function(){  
15 - $("#dropdown").click(function(){  
16 - $("#dropdown-menu").toggle();  
17 - });  
18 - });  
19 - $(document).bind("click",function(){  
20 - $('#dropdown-menu').hide();  
21 - });  
22 - </script> 14 + $(document).ready(function () {
  15 + $("#dropdown").click(function () {
  16 + $("#dropdown-menu").toggle();
  17 + });
  18 + });
  19 + $(document).bind("click", function () {
  20 + $('#dropdown-menu').hide();
  21 + });
  22 + </script>
23 <nav class="navbar navbar-static-top" role="navigation"> 23 <nav class="navbar navbar-static-top" role="navigation">
24 <!-- Sidebar toggle button--> 24 <!-- Sidebar toggle button-->
25 <a href="#" class="sidebar-toggle" data-toggle="offcanvas" role="button"> 25 <a href="#" class="sidebar-toggle" data-toggle="offcanvas" role="button">
@@ -29,7 +29,8 @@ @@ -29,7 +29,8 @@
29 <ul class="nav navbar-nav"> 29 <ul class="nav navbar-nav">
30 <li class="dropdown messages-menu" style="margin: 0 auto"> 30 <li class="dropdown messages-menu" style="margin: 0 auto">
31 <span class="label label-primary" style="height: 2em; 31 <span class="label label-primary" style="height: 2em;
32 -line-height: 2em; margin: 0 auto;font-size: 2em" th:text="${session.sessionUser.company}+'('+${session.sessionUser.spid}+')'"> 32 +line-height: 2em; margin: 0 auto;font-size: 2em"
  33 + th:text="${session.sessionUser.company}+'('+${session.sessionUser.spid}+')'">
33 </span> 34 </span>
34 </li> 35 </li>
35 <!-- User Account: style can be found in dropdown.less --> 36 <!-- User Account: style can be found in dropdown.less -->
@@ -40,19 +41,22 @@ line-height: 2em; margin: 0 auto;font-size: 2em&quot; th:text=&quot;${session.sessionUser. @@ -40,19 +41,22 @@ line-height: 2em; margin: 0 auto;font-size: 2em&quot; th:text=&quot;${session.sessionUser.
40 </span> 41 </span>
41 42
42 </a> 43 </a>
43 - <ul class="dropdown-menu" id="dropdown-menu" > 44 + <ul class="dropdown-menu" id="dropdown-menu">
44 <li class="user-header"> 45 <li class="user-header">
45 <img th:src="@{${session.sessionUser.logo}}" class="img-circle" alt="User Image"> 46 <img th:src="@{${session.sessionUser.logo}}" class="img-circle" alt="User Image">
46 <p th:text="${session.sessionUser.email}"> 47 <p th:text="${session.sessionUser.email}">
47 48
48 </p> 49 </p>
49 </li> 50 </li>
50 - <li class="user-footer" >  
51 - <div class="pull-left" th:if="${session.sessionUser.spid==0 }">  
52 - <a style="background:#3c8dbc" href="http://console.open.cnlive.com/open/console/user/info" target="black" class="btn btn-default btn-flat">账号管理</a> 51 + <li class="user-footer">
  52 + <div class="pull-left" th:if="${session.sessionUser.spid==0 }">
  53 + <a style="background:#3c8dbc"
  54 + href="http://console.open.cnlive.com/open/console/user/info" target="black"
  55 + class="btn btn-default btn-flat">账号管理</a>
53 </div> 56 </div>
54 <div class="pull-right"> 57 <div class="pull-right">
55 - <a style="background:#3c8dbc" href="/users/logout" class="btn btn-default btn-flat">注销</a> 58 + <a style="background:#3c8dbc" href="/users/logout"
  59 + class="btn btn-default btn-flat">注销</a>
56 </div> 60 </div>
57 </li> 61 </li>
58 </ul> 62 </ul>
@@ -82,9 +86,9 @@ line-height: 2em; margin: 0 auto;font-size: 2em&quot; th:text=&quot;${session.sessionUser. @@ -82,9 +86,9 @@ line-height: 2em; margin: 0 auto;font-size: 2em&quot; th:text=&quot;${session.sessionUser.
82 <li><a href="/topic/page?shenhe_status=0&receive=0" id="/topic/page"> 话题审核</a></li> 86 <li><a href="/topic/page?shenhe_status=0&receive=0" id="/topic/page"> 话题审核</a></li>
83 <li><a href="/channel/page?shenhe_status=0&receive=0" id="/channel/page"> 频道审核</a></li> 87 <li><a href="/channel/page?shenhe_status=0&receive=0" id="/channel/page"> 频道审核</a></li>
84 <li><a href="/liveApply/page?shenhe_state=0&receive=0" id="/liveApply/page">直播申请审核</a></li> 88 <li><a href="/liveApply/page?shenhe_state=0&receive=0" id="/liveApply/page">直播申请审核</a></li>
  89 + <li><a href="/activity/page?shenhe_state=0&receive=0" id="/activity/page"> 活动管理</a></li>
85 </ul> 90 </ul>
86 </li> 91 </li>
87 -<!-- <li class="treeview" th:if="${session.sessionUser.spid==0 or session.sessionUser.master}"> -->  
88 <li class="treeview" th:if="${session.sessionUser.spid==0 }"> 92 <li class="treeview" th:if="${session.sessionUser.spid==0 }">
89 <a href="#"> 93 <a href="#">
90 <span class="menu-item-top">系统管理</span> 94 <span class="menu-item-top">系统管理</span>