devin's new branch

This commit is contained in:
devin authored and Matt K. Fu committed 2013-04-17 14:14:24 +08:00
1 parent dd10b3147c
commit e7bffe4c0f
16 files changed
+484 -836

No files matched your search

+4 -4
View File
@@ -2,10 +2,10 @@
<div class="overview" content-layout="simple" base-width="1000">
<div class="s_title hh2">Section Names</div>
<ul class="s_form" id="desktop_names">
<li class="s_grid_row"><label for="s_name1">Section 1</label><input id="s_name1" type="text" value=""></li>
<li class="s_grid_row"><label for="s_name2">Section 2</label><input id="s_name2" type="text" value=""></li>
<li class="s_grid_row"><label for="s_name3">Section 3</label><input id="s_name3" type="text" value=""></li>
<li class="s_grid_row"><label for="s_name4">Section 4</label><input id="s_name4" type="text" value=""></li>
<li class="s_grid_row"><label class="s_grid s_grid_4" for="s_name1">Section 1</label><input id="s_name1" class="s_grid s_grid_8" type="text" value=""></li>
<li class="s_grid_row"><label class="s_grid s_grid_4" for="s_name2">Section 2</label><input id="s_name2" class="s_grid s_grid_8" type="text" value=""></li>
<li class="s_grid_row"><label class="s_grid s_grid_4" for="s_name3">Section 3</label><input id="s_name3" class="s_grid s_grid_8" type="text" value=""></li>
<li class="s_grid_row"><label class="s_grid s_grid_4" for="s_name4">Section 4</label><input id="s_name4" class="s_grid s_grid_8" type="text" value=""></li>
</ul>
<div class="s_subtitle">sample desciption</div>
<div class="s_action">
+5 -5
View File
@@ -21,7 +21,7 @@
<div class="theme_preview vp thmbgc" style="background-color: #000;" id="theme_preview_area">
<div class="thmtxth hh1 hp" style="margin-left:108px;">Theme Text1</div>
<div class="theme_plate">
<div class="thmc4 h1 wh3"></div>
<div class="thmc4 h1 wh2"></div>
<div class="thmc1 h1 w1"><div class="thmtxt hp">Theme Text2</div></div>
<div class="g_sep h1 op07"></div>
<div class="thmc2 h1 w1"><div class="thmtxt hp">Theme Text</div></div>
@@ -30,10 +30,10 @@
<div>
<table id="color_input" cellpadding="0" cellspacing="0" border="0" width="528" >
<tr>
<th class="s_title hh2" width="190px">Theme Color</th>
<th class="s_title hh2">Line Color</th>
<th class="s_title hh2" width="120px">Text Color</th>
<th class="s_title hh2" width="120px">Background Color</th>
<th class="s_title size_small hh2" width="190px">Theme Color</th>
<th class="s_title size_small hh2">Line Color</th>
<th class="s_title size_small hh2" width="120px">Text Color</th>
<th class="s_title size_small hh2" width="120px">Background Color</th>
</tr>
<tr>
<td>
+12 -7
View File
@@ -2,17 +2,22 @@
<div class="s_title hh2">Password Managment</div>
<%= form_for(resource, :as => resource_name, :url => users_passwd_path(resource_name), :html => { :method => :put, "form-type"=>"ajax_form" ,"callback-method"=>"passwordUpdate" }) do |f| %>
<ul class="s_form">
<li class="s_grid_row"><%= f.label :current_password %>
<%= f.password_field :current_password %></li>
<li class="s_grid_row">
<%= f.label :current_password, :class => 's_grid s_grid_4' %>
<%= f.password_field :current_password, :class => 's_grid s_grid_8' %>
</li>
<li class="s_grid_row"><%= f.label :password %>
<%= f.password_field :password %></li>
<li class="s_grid_row">
<%= f.label :password, :class => 's_grid s_grid_4' %>
<%= f.password_field :password, :class => 's_grid s_grid_8' %>
</li>
<li class="s_grid_row"><%= f.label :password_confirmation %>
<%= f.password_field :password_confirmation %></li>
<li class="s_grid_row">
<%= f.label :password_confirmation, :class => 's_grid s_grid_4' %>
<%= f.password_field :password_confirmation, :class => 's_grid s_grid_8' %>
</li>
</ul>
<div class="s_action"><%= f.submit "Update", :class => "setting_btn thmc1 thmtxt w1 hh1 hp" %></div>
<% end %>
</div>