Merge pull request #13 from juniwang/dev

remove unexpected folder
kaiyuanshe · Oct 21, 2014 · 81b48d6 · 81b48d6
2 parents 937d987 + 1f2ac0b
commit 81b48d6
Show file tree

Hide file tree

Showing 12 changed files with 57 additions and 137 deletions.
diff --git a/frontend/app/templates/\ b/frontend/app/templates/\
diff --git a/frontend/app/templates/base.html b/frontend/app/templates/base.html
@@ -8,15 +8,15 @@
     <meta name="author" content="">
      <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
 
-    <link rel="icon" href="/pic/icon.jpg">
+    <link rel="icon" href="/static/pic/icon.jpg">
 
     <script type="text/javascript" src="https://ajax.aspnetcdn.com/ajax/jquery.ui/1.8.18/jquery-ui.min.js"></script>
     <script type="text/javascript" src="https://ajax.aspnetcdn.com/ajax/jquery.validate/1.9/jquery.validate.min.js"></script> 
     <title>OSSLAB - 开源软件实验室</title>
 
     <!-- Bootstrap core CSS -->
- <link href="/css/bootstrap.min.css" rel="stylesheet">
-  <script src="/js/bootstrap.min.js"></script>
+ <link href="/static/css/bootstrap.min.css" rel="stylesheet">
+  <script src="/static/js/bootstrap.min.js"></script>
   </head>
  <body>
 
@@ -29,7 +29,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="/"><img src = "/pic/icon.jpg" height = "30" width = "30"></img>开源软件实验室</a>
+          <a class="navbar-brand" href="/"><img src = "/static/pic/icon.jpg" height = "30" width = "30"></img>开源软件实验室</a>
         </div>
         <div class="navbar-collapse collapse">
           <form class="navbar-form navbar-right" role="form">

diff --git a/frontend/app/templates/course.html b/frontend/app/templates/course.html
@@ -59,6 +59,6 @@ <h3 id = "result-header"></h3>
 -->
 <iframe id = "document" width = "800" height = "600" scrolling = "yes"></iframe>
 </div>
-<script src = "/js/course.js">
+<script src = "/static/js/course.js">
 </script>
 {% endblock %}
diff --git a/frontend/app/templates/github.html b/frontend/app/templates/github.html
@@ -2,7 +2,7 @@
 
 {% block content %}
 
-<script src = "/js/github.js"></script>
+<script src = "/static/js/github.js"></script>
 
 {% endblock %}
 
diff --git a/frontend/app/templates/google.html b/frontend/app/templates/google.html
@@ -2,7 +2,7 @@
 
 {% block content %}
 
-<script src = "/js/google.js"></script>
+<script src = "/static/js/google.js"></script>
 
 {% endblock %}
 
diff --git a/frontend/app/templates/index.html b/frontend/app/templates/index.html
@@ -9,24 +9,24 @@
     <meta name="author" content="">
 `   <meta name="msvalidate.01" content="F0E64469AF0194886DAEE6798958E25A" />
     <meta property="qc:admins" content="772677337341263016134754100636" />
-    <link rel="icon" href="/pic/icon.jpg">
+    <link rel="icon" href="/static/pic/icon.jpg">
 
     <title>OSSLAB - 开源软件实验室</title>
 
-    <link href="/css/bootstrap.min.css" rel="stylesheet">
+    <link href="/static/css/bootstrap.min.css" rel="stylesheet">
 	<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
-    <script src="/js/bootstrap.min.js"></script>
+    <script src="/static/js/bootstrap.min.js"></script>
 	<script src="https://apis.google.com/js/client.js?onload=handleClientLoad"></script>
 	<script type="text/javascript" src="https://ajax.aspnetcdn.com/ajax/jquery.validate/1.9/jquery.validate.min.js"></script>
   	<script type="text/javascript" src="https://ajax.aspnetcdn.com/ajax/jquery.ui/1.8.18/jquery-ui.min.js"></script>
-	<script src = "/js/google.js"></script>
-    	<script src = "/js/renren.js"></script>
-    	<script src = "/js/github.js"></script>
-	<script src = "/js/qq.js"></script>
+	<script src = "/static/js/google.js"></script>
+    	<script src = "/static/js/renren.js"></script>
+    	<script src = "/static/js/github.js"></script>
+	<script src = "/static/js/qq.js"></script>
    <style type="text/css">
 	.ds-service-link{
 			display:block;
-			background:url("/pic/service-icons-color.png") no-repeat;	
+			background:url("/static/pic/service-icons-color.png") no-repeat;
 			_background-image:url("http://static.duoshuo.com/images/service-icons-color.gif");
 			overflow:hidden;
 
@@ -59,7 +59,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="#"><img src = "/pic/icon.jpg" height = "30" width = "30"></img>开源软件实验室</a>
+          <a class="navbar-brand" href="#"><img src = "/static/pic/icon.jpg" height = "30" width = "30"></img>开源软件实验室</a>
         </div>
       </div>
     </div>

diff --git a/frontend/app/templates/login.html b/frontend/app/templates/login.html
@@ -9,9 +9,9 @@
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
 	<script type="text/javascript" src="https://ajax.aspnetcdn.com/ajax/jquery.ui/1.8.18/jquery-ui.min.js"></script>
     <script type="text/javascript" src="https://ajax.aspnetcdn.com/ajax/jquery.validate/1.9/jquery.validate.min.js"></script> 
-    <link href="/css/bootstrap.min.css" rel="stylesheet">
-    <script src="/js/bootstrap.min.js"></script>
-	<link rel="icon" href="/pic/icon.jpg">
+    <link href="/static/css/bootstrap.min.css" rel="stylesheet">
+    <script src="/static/js/bootstrap.min.js"></script>
+	<link rel="icon" href="/static/pic/icon.jpg">
     <title>OSSLAB - 开源软件实验室</title>
 
 	<style>
@@ -76,15 +76,15 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="http://osslab.msopentech.cn/"><img src="/pic/icon.jpg" height="30" width="30">开源软件实验室</a>
+          <a class="navbar-brand" href="http://osslab.msopentech.cn/"><img src="/static/pic/icon.jpg" height="30" width="30">开源软件实验室</a>
         </div>
         <div class="navbar-collapse collapse">
           <form class="navbar-form navbar-right" role="form">
             <div class="form-group">
               <div id="name"><p style="color:white"></p></div>
             </div>
             <div class="form-group">
-              <div id="photo"><img height="30" width="30" src="/pic/women_tiny.gif"></div>
+              <div id="photo"><img height="30" width="30" src="/static/pic/women_tiny.gif"></div>
             </div>
           </form>
         </div><!--/.navbar-collapse -->
@@ -104,9 +104,9 @@ <h2>编程语言...</h2>
 				</div>
 				<div class="body">
 					<p class="content">Python, 是一种流行易学而强大的编程语言</p>
-					<p><img height="20" src="/pic/course.ico"><a id="image1">初级教程</a></p>
-					<p><img height="20" src="/pic/course.ico">中级教程</p>
-					<p><img height="20" src="/pic/course.ico">高级教程</p>
+					<p><img height="20" src="/static/pic/course.ico"><a id="image1">初级教程</a></p>
+					<p><img height="20" src="/static/pic/course.ico">中级教程</p>
+					<p><img height="20" src="/static/pic/course.ico">高级教程</p>
 				</div>
 				<div class="foot">
 					<p>更新时间：2014-10-01</p>
@@ -119,9 +119,9 @@ <h2>编程语言...</h2>
 				</div>
 				<div class="body">
 					<p class="content">Ruby, 是一种跨平台面向对象的动态类型编程语言</p>
-					<p><img height="20" src="/pic/course.ico"><a id="image2">初级教程</a></p>
-					<p><img height="20" src="/pic/course.ico">中级教程</p>
-					<p><img height="20" src="/pic/course.ico">高级教程</p>
+					<p><img height="20" src="/static/pic/course.ico"><a id="image2">初级教程</a></p>
+					<p><img height="20" src="/static/pic/course.ico">中级教程</p>
+					<p><img height="20" src="/static/pic/course.ico">高级教程</p>
 				</div>
 				<div class="foot">
 					<p>更新时间：2014-10-01</p>
@@ -134,9 +134,9 @@ <h2>编程语言...</h2>
 				</div>
 				<div class="body">
 					<p class="content">NodeJS, 是一种服务器端的JavaScript编程语言</p>
-					<p><img height="20" src="/pic/course.ico"><a id="image3">初级教程</a></p>
-					<p><img height="20" src="/pic/course.ico">中级教程</p>
-					<p><img height="20" src="/pic/course.ico">高级教程</p>
+					<p><img height="20" src="/static/pic/course.ico"><a id="image3">初级教程</a></p>
+					<p><img height="20" src="/static/pic/course.ico">中级教程</p>
+					<p><img height="20" src="/static/pic/course.ico">高级教程</p>
 				</div>
 				<div class="foot">
 					<p>更新时间：2014-10-01</p>
@@ -149,9 +149,9 @@ <h2>编程语言...</h2>
 				</div>
 				<div class="body">
 					<p class="content">Perl, 是一种文本和系统处理功能强大的脚本语言</p>
-					<p><img height="20" src="/pic/course.ico"><a id="image4">初级教程</a></p>
-					<p><img height="20" src="/pic/course.ico">中级教程</p>
-					<p><img height="20" src="/pic/course.ico">高级教程</p>
+					<p><img height="20" src="/static/pic/course.ico"><a id="image4">初级教程</a></p>
+					<p><img height="20" src="/static/pic/course.ico">中级教程</p>
+					<p><img height="20" src="/static/pic/course.ico">高级教程</p>
 				</div>
 				<div class="foot">
 					<p>更新时间：2014-10-01</p>
@@ -168,9 +168,9 @@ <h2>数据库...</h2>
                    </div>
                    <div class="body">
                        <p class="content">MySQL, 是一种流行的关系数据库系统</p>
-                       <p><img height="20" src="/pic/course.ico"><a id="image5">初级教程</a></p>
-                       <p><img height="20" src="/pic/course.ico">中级教程</p>
-                       <p><img height="20" src="/pic/course.ico">高级教程</p>
+                       <p><img height="20" src="/static/pic/course.ico"><a id="image5">初级教程</a></p>
+                       <p><img height="20" src="/static/pic/course.ico">中级教程</p>
+                       <p><img height="20" src="/static/pic/course.ico">高级教程</p>
                    </div>
                    <div class="foot">
                        <p>更新时间：2014-10-01</p>
@@ -182,9 +182,9 @@ <h2>数据库...</h2>
                    </div>
                    <div class="body">
                        <p class="content">MongoDB, 是一种NoSQL文本数据库系统</p>
-                       <p><img height="20" src="/pic/course.ico"><a id="image6">初级教程</a></p>
-                       <p><img height="20" src="/pic/course.ico">中级教程</p>
-                       <p><img height="20" src="/pic/course.ico">高级教程</p>
+                       <p><img height="20" src="/static/pic/course.ico"><a id="image6">初级教程</a></p>
+                       <p><img height="20" src="/static/pic/course.ico">中级教程</p>
+                       <p><img height="20" src="/static/pic/course.ico">高级教程</p>
                    </div>
                    <div class="foot">
                        <p>更新时间：2014-10-01</p>
@@ -196,9 +196,9 @@ <h2>数据库...</h2>
                    </div>
                    <div class="body">
                        <p class="content">Perl, 是一种流行的K-V NoSQL数据库</p>
-                       <p><img height="20" src="/pic/course.ico"><a id="image7">初级教程</a></p>
-                       <p><img height="20" src="/pic/course.ico">中级教程</p>
-                       <p><img height="20" src="/pic/course.ico">高级教程</p>
+                       <p><img height="20" src="/static/pic/course.ico"><a id="image7">初级教程</a></p>
+                       <p><img height="20" src="/static/pic/course.ico">中级教程</p>
+                       <p><img height="20" src="/static/pic/course.ico">高级教程</p>
                    </div>
                    <div class="foot">
                        <p>更新时间：2014-10-01</p>
@@ -214,9 +214,9 @@ <h2>Microsoft</h2>
                    </div>
                    <div class="body">
                        <p class="content">TypeScript，是微软开源的一种新型脚本语言</p>
-                       <p><img height="20" src="/pic/course.ico"><a id="image8">初级教程</a></p>
-                       <p><img height="20" src="/pic/course.ico">中级教程</p>
-                       <p><img height="20" src="/pic/course.ico">高级教程</p>
+                       <p><img height="20" src="/static/pic/course.ico"><a id="image8">初级教程</a></p>
+                       <p><img height="20" src="/static/pic/course.ico">中级教程</p>
+                       <p><img height="20" src="/static/pic/course.ico">高级教程</p>
                    </div>
                    <div class="foot">
                        <p>更新时间：2014-10-01</p>

diff --git a/frontend/app/templates/paper.html b/frontend/app/templates/paper.html
@@ -10,11 +10,11 @@
     <meta name="author" content="">
      <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
 
-    <link rel="icon" href="http://osslab.chinacloudapp.cn:5080/pic/icon.jpg">
+    <link rel="icon" href="/static/pic/icon.jpg">
     <script type="text/javascript" src="https://ajax.aspnetcdn.com/ajax/jquery.ui/1.8.18/jquery-ui.min.js"></script>
     <script type="text/javascript" src="https://ajax.aspnetcdn.com/ajax/jquery.validate/1.9/jquery.validate.min.js"></script>
-    <link rel="Stylesheet" type="text/css" href="http://osslab.chinacloudapp.cn:5080/css/core.css" />
-    <link rel="Stylesheet" type="text/css" href="http://osslab.chinacloudapp.cn:5080/css/presentation.css" />
+    <link rel="Stylesheet" type="text/css" href="/static/css/core.css" />
+    <link rel="Stylesheet" type="text/css" href="/static/css/presentation.css" />
     <script type="text/javascript" src="http://osslab.chinacloudapp.cn:5080/js/function.js"></script>
     <title>OSSLAB</title>
 

diff --git a/frontend/app/templates/paper2.html b/frontend/app/templates/paper2.html
@@ -10,12 +10,12 @@
     <meta name="author" content="">
      <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
 
-    <link rel="icon" href="http://osslab.chinacloudapp.cn:5080/pic/icon.jpg">
+    <link rel="icon" href="/static/pic/icon.jpg">
     <script type="text/javascript" src="https://ajax.aspnetcdn.com/ajax/jquery.ui/1.8.18/jquery-ui.min.js"></script>
     <script type="text/javascript" src="https://ajax.aspnetcdn.com/ajax/jquery.validate/1.9/jquery.validate.min.js"></script>
-    <link rel="Stylesheet" type="text/css" href="http://osslab.chinacloudapp.cn:5080/css/core.css" />
-    <link rel="Stylesheet" type="text/css" href="http://osslab.chinacloudapp.cn:5080/css/presentation.css" />
-    <script type="text/javascript" src="http://osslab.chinacloudapp.cn:5080/js/function.js"></script>
+    <link rel="Stylesheet" type="text/css" href="/static/css/core.css" />
+    <link rel="Stylesheet" type="text/css" href="/static/css/presentation.css" />
+    <script type="text/javascript" src="/static/js/function.js"></script>
     <title>OSSLAB</title>
 
     <!-- Bootstrap core CSS -->

diff --git a/frontend/app/templates/qq.html b/frontend/app/templates/qq.html
@@ -2,7 +2,7 @@
 
 {% block content %}
 
-<script src = "/js/qq.js"></script>
+<script src = "/static/js/qq.js"></script>
 
 {% endblock %}
 
diff --git a/frontend/app/templates/renren.html b/frontend/app/templates/renren.html
@@ -2,7 +2,7 @@
 
 {% block content %}
 
-<script src = "/js/renren.js"></script>
+<script src = "/static/js/renren.js"></script>
 
 {% endblock %}
 
diff --git a/frontend/app/templates/test.html b/frontend/app/templates/test.html
@@ -4,9 +4,9 @@
     <meta charset='utf-8' />
     <script src="http://ajax.aspnetcdn.com/ajax/jQuery/jquery-1.8.0.js">
 </script>
-    <script src = "/js/google.js"></script>
-    <script src = "/js/renren.js"></script>
-    <script src = "/js/github.js"></script>
+    <script src = "/static/js/google.js"></script>
+    <script src = "/static/js/renren.js"></script>
+    <script src = "/static/js/github.js"></script>
   </head>
   <body>
     <!--Add a button for the user to click to initiate auth sequence -->