ck

张宗朋
1 parent 3167dc80
Showing 35 changed files with 17 additions and 16 deletions
.classpath
.settings/org.eclipse.wst.common.component
src/main/resources/smart.properties
src/main/webapp/pages/common/left.jsp
src/main/webapp/static/assets/ckplayer/share/kaixin001.png → src/main/webapp/static/assets/ck/ckplayer/share/kaixin001.png
src/main/webapp/static/assets/ckplayer/share/msn.png → src/main/webapp/static/assets/ck/ckplayer/share/msn.png
src/main/webapp/static/assets/ckplayer/share/qq.png → src/main/webapp/static/assets/ck/ckplayer/share/qq.png
src/main/webapp/static/assets/ckplayer/share/qq2.png → src/main/webapp/static/assets/ck/ckplayer/share/qq2.png
src/main/webapp/static/assets/ckplayer/share/qzone.png → src/main/webapp/static/assets/ck/ckplayer/share/qzone.png
src/main/webapp/static/assets/ckplayer/share/rr.png → src/main/webapp/static/assets/ck/ckplayer/share/rr.png
src/main/webapp/static/assets/ckplayer/share/sina.png → src/main/webapp/static/assets/ck/ckplayer/share/sina.png
src/main/webapp/static/assets/ckplayer/share/sohu.png → src/main/webapp/static/assets/ck/ckplayer/share/sohu.png
src/main/webapp/static/assets/ckplayer/share/tianya.png → src/main/webapp/static/assets/ck/ckplayer/share/tianya.png
src/main/webapp/static/assets/ckplayer/ckplayer.js → src/main/webapp/static/assets/ckplayer_back/ckplayer.js
src/main/webapp/static/assets/ckplayer/ckplayer.swf → src/main/webapp/static/assets/ckplayer_back/ckplayer.swf
src/main/webapp/static/assets/ckplayer/ckplayer.xml → src/main/webapp/static/assets/ckplayer_back/ckplayer.xml
src/main/webapp/static/assets/ckplayer/language.xml → src/main/webapp/static/assets/ckplayer_back/language.xml
src/main/webapp/static/assets/ckplayer/m3u8.swf → src/main/webapp/static/assets/ckplayer_back/m3u8.swf
src/main/webapp/static/assets/ckplayer/related.xml → src/main/webapp/static/assets/ckplayer_back/related.xml
src/main/webapp/static/assets/ckplayer/share.xml → src/main/webapp/static/assets/ckplayer_back/share.xml
@@ -12,7 +12,11 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry including="**/*.java" kind="src" path="src/main/resources"/>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="src" path="src/main/resources/i18n"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
@@ -8,12 +8,6 @@
         <dependent-module archiveName="cnlive_live_model-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/cnlive_live_model/cnlive_live_model">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="smart-framework-4.0.1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/smart-framework/smart-framework">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="smart-plugin-job-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/smart-plugin-job/smart-plugin-job">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
         <dependent-module archiveName="smart-plugin-dbcp-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/smart-plugin-dbcp/smart-plugin-dbcp">
             <dependency-type>uses</dependency-type>
         </dependent-module>
@@ -25,7 +25,7 @@ sample.upload_path=/www/upload/
 mail.template_path=D:/apache-tomcat-7.0.61/webapps/cnlive_live_web/pages/mail.html
 website.url=http://localhost:8080/cnlive_live_web/
-auth.enable=true
+auth.enable=false
 auth.login.url=http://sso.staff.cnlive.com/CnliveSSO/login?from=mam-live&callbackUrl=
 auth.logout.url=http://sso.staff.cnlive.com/CnliveSSO/logOut?from=mam-live&callbackUrl=
 auth.userinfo.url=http://sso.staff.cnlive.com/CnliveSSO/getUserInfo?username=
@@ -18,7 +18,7 @@
 			</div>
 		</div>
 		<ul class="sidebar-menu">
-			<c:if test="${sessionScope.roleId=='1'}">
+			<c:if test="true">
 				<li class="header">导航栏</li>
 				<li>
 					<a href="${BASE}/switch"><i class="fa fa-circle-o text-blue"></i>全局切换</a>
@@ -59,6 +59,9 @@
 				<li>
 					<a href="${BASE}/video/check/1"><i class="fa fa-circle-o text-yellow"></i>点播审查</a>
 				</li>
+				<li>
+					<a href="${BASE}/live/alllive/1"><i class="fa fa-circle-o text-yellow"></i>直播管理</a>
+				</li>
 			</c:if>
 			<c:if test="${sessionScope.roleId=='0'}">
 				<li class="header">导航栏</li>
@@ -129,7 +129,8 @@ function ckstyle() { //定义总的风格
 		3、水平偏移量，举例说明，如果第1个参数设置成0左对齐，第3个偏移量设置成10，就是离左边10个像素，第一个参数设置成2，偏移量如果设置的是正值就会移到播放器外面，只有设置成负值才行，设置成-1，按钮就会跑到播放器外面
 		4、垂直偏移量 
 		*/
-        logo: 'cklogo.png',
+       /* logo: 'cklogo.png',*/
+        logo='null',
         /*
 		默认右上角一直显示的logo，不使用设置成null，即logo='null';
 		*/
@@ -25,7 +25,7 @@ sample.upload_path=/www/upload/
 mail.template_path=D:/apache-tomcat-7.0.61/webapps/cnlive_live_web/pages/mail.html
 website.url=http://localhost:8080/cnlive_live_web/
-auth.enable=true
+auth.enable=false
 auth.login.url=http://sso.staff.cnlive.com/CnliveSSO/login?from=mam-live&callbackUrl=
 auth.logout.url=http://sso.staff.cnlive.com/CnliveSSO/logOut?from=mam-live&callbackUrl=
 auth.userinfo.url=http://sso.staff.cnlive.com/CnliveSSO/getUserInfo?username=
 Manifest-Version: 1.0
-Build-Jdk: 1.7.0_79
-Built-By: liujicheng
+Build-Jdk: 1.7.0_13
+Built-By: Administrator
 Created-By: Maven Integration for Eclipse
 #Generated by Maven Integration for Eclipse
-#Tue Jun 14 14:04:42 CST 2016
-#Sun Jun 12 10:48:48 CST 2016
+#Fri Jun 17 09:20:43 CST 2016
 version=0.0.1-SNAPSHOT
 groupId=com.cnlive.mz.live.web
 m2e.projectName=cnlive_live_web
-m2e.projectLocation=D\:\\1_CNLIVE_JAVA_CODE\\cnlive_live_web
+m2e.projectLocation=C\:\\Users\\Administrator\\git\\cnlive_live_web
 artifactId=cnlive_live_web