developers/orbit-basic
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member

Browse Source 
Conflicts:
	app/controllers/admin/users_new_interface_controller.rb
	app/views/admin/users_new_interface/show.html.erb
This commit is contained in:
Matthew K. Fu JuYuan committed 2012-10-12 18:17:05 +08:00
2 parents 1ce7f00084 189fa553c5
commit b5571dbc43
894 files changed
+23695 -2108
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/views/admin/plugins/_plugin.html.erb
-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>
app/views/admin/plugins/index.html.erb
+1 -3
View File
@@ -1,4 +1,2 @@
<div class="subnav">
<%= render :partial => 'plugin', :collection => @plugins %>
</div>
<%= render_plugin_list %>
app/views/admin/users_new_interface/plugin_dashbroad.html.erb
+6
View File
@@ -0,0 +1,6 @@
<div class="member-plugin">
<% #binding.pry%>
<%= render :partial=> 'plugin_summary'%>
<%= render :partial=> 'plugin_summary'%>
<%= render :partial=> 'plugin_summary'%>
</div>
app/views/admin/users_new_interface/show.html.erb
+10 -12
View File
@@ -6,22 +6,20 @@
<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="#"><%= t("admin.new_admin.users.all_plugin_summary")%></a>
</li>
<li><a href="#">學歷</a></li>
<li><a href="#">學歷</a></li>
<li><a href="#">學歷</a></li>
<li><a href="#">學歷</a></li>
<%= content_tag :li,:class=>(params[:show_plugin_profile].nil? ? "active" : nil) do %>
<%= link_to t("admin.new_admin.users.all_plugin_summary")%>
<%end -%>
<% @plugins.each do |plugin|%>
<%= content_tag :li,:class=>(params[:show_plugin_profile]==plugin.name ? "active" : nil) do %>
<%= link_to plugin.name,:show_plugin_profile=> plugin.name %>
<% end -%>
<%end -%>
</ul>
</div>
</div>
<div class="member-plugin">
<%= render :partial=> 'plugin_summary'%>
<%= render :partial=> 'plugin_summary'%>
<%= render :partial=> 'plugin_summary'%>
</div>
<%=render :partial=> @right_partial%>
</div>
<div class="user-info">
<div id="brand" class="clear">