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

Merge commit '72efdbd742d4f3ac8a910bd5c817cf5c74570ba5' into ldap

Browse Source
This commit is contained in:
Matthew K. Fu JuYuan committed 2012-04-19 14:09:37 +08:00
2 parents f55b3a4374 72efdbd742
commit ba0677a001
13 files changed
+473 -251
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/views/layouts/admin.html.erb
+37 -37
View File
@@ -1,37 +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">
<!--[if lt IE 9]>
<%= javascript_include_tag "html5" %>
<![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>
<!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]>
<%= javascript_include_tag "html5" %>
<![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
+39 -38
View File
@@ -1,38 +1,39 @@
<!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]>
<%= javascript_include_tag "html5" %>
<![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>
<!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]>
<%= javascript_include_tag "html5" %>
<![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="main-wrap">
<div id="main-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>