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

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

Browse Source
This commit is contained in:
Christophe Vilayphiou committed 2012-04-27 11:11:56 +08:00
2 parents 9717dd8fe7 5aca3db95f
commit 3beb035101
18 files changed
+803 -182
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/views/admin/ad_banners/_ad_banner_tab.html.erb
+1 -1
View File
@@ -13,7 +13,7 @@
</div>
<h3>圖片列表</h3>
<div class="adbanner-list">
<div class="adbanner-action pagination-right">
<div class="adbanner-action">
<%= link_to t("admin.ad.new_image"),new_admin_ad_banner_ad_image_path(ad_banner_tab) ,:class => "btn btn-primary"%>
<%= link_to t("modal.preview"), admin_realtime_preview_ad_banner_path(ad_banner_tab.title) , :class=>'preview_trigger btn btn-success'%>
</div>
app/views/admin/items/_site_map_left_bar.html.erb
+1 -3
View File
@@ -1,3 +1 @@
<div id="viewport">
<%= render_node_and_children(Item.first(:conditions => {:parent_id => nil})) %>
</div>
<%= render_node_and_children(Item.first(:conditions => {:parent_id => nil})) %>
app/views/devise/sessions/new.html.erb
+1 -1
View File
@@ -16,10 +16,10 @@
<span class="help-inline">Please correct the error</span>
</div>
<div class="control-group clear">
<%= link_to t(:forgot_password), new_user_password_path, :class => 'pull-right forgot' %>
<%= f.label :password %>
<%= f.password_field :password, :placeholder => t(:dots), :style => "width: 330px;" %>
<span class="help-inline">Please correct the error</span>
<%= link_to t(:forgot_password), new_user_password_path, :class => 'pull-right forgot hide' %>
</div>
</div>
</div>
app/views/layouts/_orbit_bar.html.erb
+4 -4
View File
@@ -69,7 +69,7 @@
<a class="dropdown-toggle orbit-bar-member" href="#"><%= t(:login) %></a>
<div class="dropdown-menu">
<ul class="log">
<li class="title"></li>
<li class="title hide"></li>
<%= form_for :user, :url => user_session_path do |f| %>
<li>
@@ -84,7 +84,7 @@
<%= f.password_field :password, :class => 'span2', :placeholder => t(:password), :size => 16 %>
</div>
</li>
<li class="clear">
<li class="clear hide">
<%= link_to t(:forgot_password), new_user_password_path, :class => 'forgot' %>
</li>
<li>
@@ -94,10 +94,10 @@
<span style="display: inline-block;height: 10px;"><%= t(:remember_me) %></span>
</label>
</li>
<li class="divider"><span><%= t(:or_lower) %></span></li>
<li class="divider hide"><span><%= t(:or_lower) %></span></li>
<% end %>
</ul>
<%= link_to t(:register), new_user_registration_path, :class => 'btn btn-danger register' %>
<%#= link_to t(:register), new_user_registration_path, :class => 'btn btn-danger register' %>
</div>
</li>
<% end %>