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

Ray's modification before redesign

Browse Source
This commit is contained in:
Christophe Vilayphiou authored and Christophe Vilayphiou committed 2012-01-24 11:57:27 +08:00
1 parent bfd55277d7
commit 5518ae362d
21 files changed
+1000 -578
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/views/admin/assets/_asset.html.erb
+1 -1
View File
@@ -13,5 +13,5 @@
</td>
</tr>
<tr>
<td colspan="5"></td>
<td colspan="6"></td>
</tr>
app/views/admin/assets/_form.html.erb
+1 -1
View File
@@ -9,6 +9,6 @@
</p>
<p>
<%= f.label :data, t('admin.data') %>
<%= f.label :data, t('admin.data'), :class => 'file' %>
<%= f.file_field :data %>
</p>
app/views/admin/assets/_new.html.erb
+1 -1
View File
@@ -9,7 +9,7 @@
<%= link_back %>
<%= f.submit t(:create) %>
<% else %>
<a id='submit_button'><%= t(:create) %></a>
<a id='submit_button' class="new"><%= t(:create) %></a>
<% end %>
</div>
<% end %>
app/views/admin/users/_sub_role_selector.html.erb
+2 -2
View File
@@ -1,4 +1,4 @@
<% role.sub_roles.each do |sub_role| %>
<%= sub_role.i18n_variable[I18n.locale] %>
<%= check_box_tag "user[sub_role_ids][]", sub_role.id, @user.sub_role_ids.include?(sub_role.id), :class => 'sub_role_select' %>
<%= f.label sub_role.i18n_variable[I18n.locale], :for => "check_sub_role_#{sub_role.id}", :class => 'sub_role_select' %>
<%= check_box_tag "user[sub_role_ids][]", sub_role.id, @user.sub_role_ids.include?(sub_role.id), :id => "check_sub_role_#{sub_role.id}", :class => 'sub_role_select' %>
<% end %>
app/views/layouts/admin.html.erb
+37 -31
View File
@@ -1,31 +1,37 @@
<!DOCTYPE HTML>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title><%= @title || APP_CONFIG['orbit'] %></title>
<link rel="shortcut icon" href="/favicon.ico">
<%= stylesheet_link_tag "admin" %>
<%= javascript_include_tag "admin" %>
<%= yield :page_specific_css %>
<%= yield :page_specific_javascript %>
<%= csrf_meta_tag %>
</head>
<body>
<div id="back_banner_link" >
<div id="back_orbit"><%= render 'layouts/drop_down_menu' %></div>
<div class="hmenu">
<div class="lang"><%= render 'layouts/lang_menu' %></div>
<%= render 'devise/menu/login_items' %>
</div>
</div>
<div id="back_content">
<div id="back_sidebar"><%= yield :secondary %></div>
<div class="main">
<%= yield %>
</div>
<div class="tertiary"><%= yield :tertiary %></div>
<div id="back_footer"><p><%= APP_CONFIG['ruling_digital'] %></p></div>
</div>
</body>
</html>
<!DOCTYPE HTML>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title><%= @title || APP_CONFIG['orbit'] %></title>
<link rel="shortcut icon" href="/favicon.ico">
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<%= stylesheet_link_tag "admin" %>
<%= javascript_include_tag "admin" %>
<%= yield :page_specific_css %>
<%= yield :page_specific_javascript %>
<%= csrf_meta_tag %>
</head>
<body>
<header id="back_banner_link" class="fixed clear" >
<nav id="back_orbit">
<span>Orbit Icon</span>
<%= render 'layouts/drop_down_menu' %>
</nav>
<div class="hmenu">
<%= render 'devise/menu/login_items' %>
<div class="lang"><%= render 'layouts/lang_menu' %></div>
</div>
</header>
<div id="back_content">
<div id="back_sidebar"><%= yield :secondary %></div>
<div class="main">
<%= yield %>
</div>
<div class="tertiary"><%= yield :tertiary %></div>
<div id="back_footer"><p><%= APP_CONFIG['ruling_digital'] %></p></div>
</div>
</body>
</html>
app/views/layouts/site_editor.html.erb
+38 -32
View File
@@ -1,32 +1,38 @@
<!DOCTYPE HTML>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title><%= @title || APP_CONFIG['orbit'] %></title>
<link rel="shortcut icon" href="/favicon.ico">
<%= stylesheet_link_tag "site_editor" %>
<%= javascript_include_tag "site_editor" %>
<%= yield :page_specific_css %>
<%= yield :page_specific_javascript %>
<%= csrf_meta_tag %>
</head>
<body>
<div id="back_banner_link" >
<div id="back_orbit"><%= render 'layouts/drop_down_menu' %></div>
<div class="hmenu">
<div class="lang"><%= render 'layouts/lang_menu' %></div>
<%= render 'devise/menu/login_items' %>
</div>
</div>
<div id="back_content">
<div id="back_sidebar"><%= yield :sidebar %></div>
<div class="main"><div id='back_main' class="main2">
<%= yield %>
</div></div>
<div class="tertiary"><%= yield :tertiary %></div>
<div id="back_footer"><p><%= APP_CONFIG['ruling_digital'] %></p></div>
</div>
</body>
</html>
<!DOCTYPE HTML>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title><%= @title || APP_CONFIG['orbit'] %></title>
<link rel="shortcut icon" href="/favicon.ico">
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<%= stylesheet_link_tag "site_editor" %>
<%= javascript_include_tag "site_editor" %>
<%= yield :page_specific_css %>
<%= yield :page_specific_javascript %>
<%= csrf_meta_tag %>
</head>
<body>
<header id="back_banner_link" class="fixed clear" >
<nav id="back_orbit">
<span>Orbit Icon</span>
<%= render 'layouts/drop_down_menu' %>
</nav>
<div class="hmenu">
<%= render 'devise/menu/login_items' %>
<div class="lang"><%= render 'layouts/lang_menu' %></div>
</div>
</header>
<div id="back_content">
<div id="back_sidebar"><%= yield :sidebar %></div>
<div class="main"><div id='back_main' class="main2">
<%= yield %>
</div></div>
<div class="tertiary"><%= yield :tertiary %></div>
<div id="back_footer"><p><%= APP_CONFIG['ruling_digital'] %></p></div>
</div>
</body>
</html>