Modify assets
Each layout has a manifest for css and js
This commit is contained in:
1 parent
a0ec38ca99
commit
75a3c4d5b1
42 files changed
+571
-1488
No files matched your search
@@ -1,5 +1,8 @@
|
||||
<% content_for :page_specific_css do %>
|
||||
<%= stylesheet_link_tag "design_temp" %>
|
||||
<%= stylesheet_link_tag "design" %>
|
||||
<% end %>
|
||||
<% content_for :page_specific_javascript do %>
|
||||
<%= javascript_include_tag "design" %>
|
||||
<% end %>
|
||||
|
||||
<p>
|
||||
|
||||
Whitespace-only changes.
@@ -1,5 +1,3 @@
|
||||
<% content_for :body_id do %><%= "#{@attribute}s_list" %><% end -%>
|
||||
|
||||
<div id="porfile">
|
||||
<%= form_for @user_attribute_model, :url => eval("admin_user_#{@attribute}_model_path(@user_role_model)") do |f| %>
|
||||
<%= f.error_messages %>
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
<% content_for :body_id do %><%= "#{@attribute}s_list" %><% end -%>
|
||||
|
||||
<div class="main_list">
|
||||
<div id="add_new" class="buttom clear">
|
||||
<%= link_to t("admin.new_user_#{@attribute}"), eval("new_admin_user_#{@attribute}_model_path") %>
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
<% content_for :body_id do %><%= "#{@attribute}s_list" %><% end -%>
|
||||
|
||||
<div id="porfile">
|
||||
<%= form_for @user_attribute_model, :url => eval("admin_user_#{@attribute}_models_path") do |f| %>
|
||||
<%= f.error_messages %>
|
||||
|
||||
@@ -4,9 +4,8 @@
|
||||
<% else %>
|
||||
<%= image_tag "person.png" %>
|
||||
<% end %>
|
||||
<%#= file_field_tag 'file' %>
|
||||
<%#= hidden_field_tag :avatar_cache %>
|
||||
<a id="upload" href="#"><%= t('admin.choose_file') %></a>
|
||||
<%= file_field_tag 'file' %>
|
||||
<%= hidden_field_tag :avatar_cache %>
|
||||
<%= f.text_field :email, :onfocus => "this.value='';", :onblur => "if(this.value==''){this.value=#{t('admin.email')};}", :value => (@user.email.blank? ? t('admin.email') : @user.email), :class => 'user_mail' %>
|
||||
<label>
|
||||
<%= f.check_box :admin %><span><%= t('admin.admin') %></span>
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
<% content_for :body_id do %>user_list<% end -%>
|
||||
|
||||
<div id="porfile">
|
||||
<%= form_for @user, :url => admin_user_path(@user), :html => { :multipart => true } do |f| %>
|
||||
<%= f.error_messages %>
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
<% content_for :body_id do %>user_list<% end -%>
|
||||
|
||||
<div class="main_list">
|
||||
<%= flash_messages %>
|
||||
<div id="add_new" class="buttom clear">
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
<% content_for :body_id do %>user_list<% end -%>
|
||||
|
||||
<div id="porfile">
|
||||
<%= form_for @user, :url => admin_users_path, :html => { :multipart => true } do |f| %>
|
||||
<%= f.error_messages %>
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
<% content_for :body_id do %>user_list<% end -%>
|
||||
|
||||
<div id="porfile">
|
||||
|
||||
<div id="person">
|
||||
|
||||
@@ -1,57 +1,36 @@
|
||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
|
||||
<!DOCTYPE HTML>
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
<title>R4</title>
|
||||
<title><%= @title || APP_CONFIG['orbit'] %></title>
|
||||
<link rel="shortcut icon" href="/favicon.ico">
|
||||
<%= yield :page_specific_link %>
|
||||
<%= stylesheet_link_tag "admin", :media => "screen, projection" %>
|
||||
<%= stylesheet_link_tag "application" %>
|
||||
<%= javascript_include_tag "application" %>
|
||||
<%= stylesheet_link_tag "admin" %>
|
||||
<%= javascript_include_tag "admin" %>
|
||||
<%= yield :page_specific_css %>
|
||||
<%= yield :page_specific_javascript %>
|
||||
<%= csrf_meta_tag %>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<div id="panel_banner_link" >
|
||||
|
||||
<div id="orbit">
|
||||
<%= render 'layouts/drop_down_menu' %>
|
||||
</div>
|
||||
|
||||
<div id="orbit"><%= render 'layouts/drop_down_menu' %></div>
|
||||
<div class="hmenu">
|
||||
<div class="lang">
|
||||
<%= render 'layouts/lang_menu' %>
|
||||
</div>
|
||||
|
||||
<div class="lang"><%= render 'layouts/lang_menu' %></div>
|
||||
<%= render 'devise/menu/login_items' %>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div id="panel_container">
|
||||
|
||||
|
||||
|
||||
<div id="panel_content">
|
||||
<div class="secondary">
|
||||
<div class="secondary2">
|
||||
<%= yield :secondary %>
|
||||
</div>
|
||||
<div class="secondary2"><%= yield :secondary %></div>
|
||||
</div>
|
||||
|
||||
<div class="main">
|
||||
<div class="main2">
|
||||
<%= yield %>
|
||||
</div>
|
||||
<div class="main2"><%= yield %></div>
|
||||
</div>
|
||||
|
||||
<div class="tertiary"><%= yield :tertiary %></div>
|
||||
</div>
|
||||
|
||||
<div id="panel_footer">
|
||||
<p>Rulingcom</p>
|
||||
</div>
|
||||
<div id="panel_footer"><p><%= APP_CONFIG['ruling_digital'] %></p></div>
|
||||
</div>
|
||||
<%= yield :page_specific_javascript %>
|
||||
</body>
|
||||
</html>
|
||||
@@ -1,48 +0,0 @@
|
||||
<!DOCTYPE HTML>
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
<title><%= @title || 'R4 rescue title' %></title>
|
||||
<link rel="shortcut icon" href="/favicon.ico">
|
||||
<%= yield :page_specific_link %>
|
||||
<%= stylesheet_link_tag "content", :media => "screen, projection" %>
|
||||
<%#= javascript_include_tag :ckeditor %>
|
||||
|
||||
<%= stylesheet_link_tag "application" %>
|
||||
<%= javascript_include_tag "application" %>
|
||||
|
||||
<%#= javascript_include_tag "jquery", "jquery-ui", "rails", "easy", "application", :cache => 'all' %>
|
||||
<%= yield :page_specific_javascript %>
|
||||
<!--[if IE]>
|
||||
<%= stylesheet_link_tag "ie", :media => "screen, projection" %>
|
||||
<![endif]-->
|
||||
<%= yield :page_specific_css %>
|
||||
<%= csrf_meta_tag %>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<div id="panel_banner_link" >
|
||||
|
||||
<div id="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="panel_container">
|
||||
|
||||
<div id="panel_content">
|
||||
<div id="panel_sidebar2"><div id="panel_sidebar"><%= yield :sidebar %></div></div>
|
||||
<div id="panel_main2"><div id="panel_main"><%= yield %></div></div>
|
||||
</div>
|
||||
|
||||
<div id="panel_footer"><%= yield :footer %></div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
@@ -1,52 +0,0 @@
|
||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
<title>R4</title>
|
||||
<link rel="shortcut icon" href="/favicon.ico">
|
||||
<%= yield :page_specific_link %>
|
||||
<%= stylesheet_link_tag 'admin', "member", 'messy', :media => "screen, projection" %>
|
||||
<%#= stylesheet_link_tag "application" %>
|
||||
<%= javascript_include_tag "application" %>
|
||||
<%= yield :page_specific_css %>
|
||||
<%= csrf_meta_tag %>
|
||||
</head>
|
||||
|
||||
<body id="<%= yield :body_id %>">
|
||||
<div id="content">
|
||||
<div id="hmenu">
|
||||
<div id="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="sidebar">
|
||||
<div id="search">
|
||||
<input id="user_search" name="user[username]" size="30" type="text" />
|
||||
</div>
|
||||
<div class="member_setup">
|
||||
<h1><%= t('admin.setup_member') %></h1>
|
||||
<ul class="list">
|
||||
<li class="set_1"><%= link_to content_tag(:span, t('admin.list_users')), admin_users_path %></li>
|
||||
<li class="set_2"><%= link_to content_tag(:span, t('admin.list_user_roles')), admin_user_role_models_path %></li>
|
||||
<li class="set_3"><%= link_to content_tag(:span, t('admin.list_user_infos')), admin_user_info_models_path %></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="main">
|
||||
<%= yield %>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<%= yield :page_specific_javascript %>
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,36 @@
|
||||
<!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="panel_banner_link" >
|
||||
<div id="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="panel_container">
|
||||
<div id="panel_content">
|
||||
<div id="panel_sidebar2">
|
||||
<div id="panel_sidebar"><%= yield :sidebar %></div>
|
||||
</div>
|
||||
<div id="panel_main2">
|
||||
<div id="panel_main"><%= yield %></div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="panel_footer"><%= yield :footer %></div>
|
||||
</div>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
Reference in new issue
Block a user