Merge commit '975523c8b2d886805a3622e3ef23b2f398722d45' into app_config

This commit is contained in:
Matthew K. Fu JuYuan committed 2012-09-24 14:14:13 +08:00
commit fb3364b28e
424 files changed
+11780 -83

No files matched your search

-27
View File
@@ -1,27 +0,0 @@
<div id="module-nav">
<div class="arrow_next pull-right"><i class="icon-chevron-right"></i></div>
<div class="arrow_prev pull-left"><i class="icon-chevron-left"></i></div>
<div class="module-nav-view">
<ul class="nav nav-pills">
<li class="active">
<a href="#">All</a>
</li>
<li><a href="#">學歷</a></li>
<li><a href="#">經歷</a></li>
<li><a href="#">研究計畫</a></li>
<li><a href="#">期刊論文</a></li>
<li><a href="#">學歷</a></li>
<li><a href="#">經歷</a></li>
<li><a href="#">研究計畫</a></li>
<li><a href="#">期刊論文</a></li>
<li><a href="#">學歷</a></li>
<li><a href="#">經歷</a></li>
<li><a href="#">研究計畫</a></li>
<li><a href="#">期刊論文</a></li>
<li><a href="#">學歷</a></li>
<li><a href="#">經歷</a></li>
<li><a href="#">期刊論文</a></li>
</ul>
</div>
</div>
+1 -3
View File
@@ -1,4 +1,2 @@
<div class="subnav">
<%= render :partial => 'plugin', :collection => @plugins %>
</div>
<%= render_plugin_list %>