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

Merge branch 'design_team' into ldap

Browse Source 
Conflicts:
	config/environments/development.rb
This commit is contained in:
Christophe Vilayphiou committed 2012-05-09 13:51:00 +08:00
2 parents 083963af65 f9f7ddc8ee
commit d88d4e58dc
48 files changed
+916 -246
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/views/admin/dashboards/index.html.erb
+23 -93
View File
@@ -1,8 +1,8 @@
<div id="isotope">
<div class="item element">
<h3><i class="icons-content"></i><a href=""><%= t(:content) %></a></h3>
<div class="detail w-a h-b">
<p class="totle"><span><%= t(:all_content) %></span>9,517</p>
<h3><i class="icons-content"></i><%= t(:content) %></h3>
<div class="detail w-a h-a">
<p class="totle"><span><%= t(:all_content) %></span><%= @module_app_contents_total %></p>
<table class="table table-striped">
<thead>
<tr>
@@ -23,46 +23,12 @@
<div class="overview">
<table class="table table-striped">
<tbody>
<tr>
<td>公告</td>
<td class="span2">2,304</td>
</tr>
<tr>
<td>新聞</td>
<td class="span2">783</td>
</tr>
<tr>
<td>連結</td>
<td class="span2">45</td>
</tr>
<tr>
<td>連結</td>
<td class="span2">62</td>
</tr>
<tr>
<td>連結</td>
<td class="span2">52</td>
</tr>
<tr>
<td>新聞</td>
<td class="span2">20</td>
</tr>
<tr>
<td>公告</td>
<td class="span2">41</td>
</tr>
<tr>
<td>公告</td>
<td class="span2">37</td>
</tr>
<tr>
<td>公告</td>
<td class="span2">41</td>
</tr>
<tr>
<td>公告</td>
<td class="span2">20</td>
</tr>
<% @module_app_contents.each do |module_app_content| %>
<tr>
<td><%= link_to t("dashboard.#{module_app_content[0]}"), get_link(module_app_content[0]) %></td>
<td class="span2"><%= module_app_content[1] %></td>
</tr>
<% end %>
</tbody>
</table>
</div>
@@ -70,7 +36,7 @@
</div>
</div>
</div>
<div class="item element">
<!-- <div class="item element">
<h3><i class="icons-member"></i><a href=""><%= t(:member) %></a></h3>
<div class="detail w-a h-a">
<p class="totle"><span><%= t(:all_member) %></span>2,217</p>
@@ -211,8 +177,8 @@
</div>
</div>
</div>
</div>
<div class="item element">
</div> -->
<!-- <div class="item element">
<h3><i class="icons-"></i><a href=""><%= t(:referral_in_links) %></a></h3>
<div class="detail w-a h-a">
<p class="totle"><span><%= t(:statistics) %></span>517</p>
@@ -282,8 +248,8 @@
</div>
</div>
</div>
</div>
<div class="item element">
</div> -->
<!-- <div class="item element">
<h3><i class="icons-"></i><a href=""><%= t(:most_visited_page) %></a></h3>
<div class="detail noStatistics w-b h-a">
<table class="table table-striped">
@@ -460,7 +426,6 @@
<div class="item element">
<h3><i class="icons-"></i><a href=""><%= t(:site_info) %></a></h3>
<div class="detail noStatistics w-b h-a">
<!--<p class="totle"><span><%= t(:statistics) %></span>9,517</p>-->
<table class="table table-striped">
<thead>
<tr>
@@ -515,11 +480,10 @@
</div>
</div>
</div>
</div>
</div> -->
<div class="item element">
<h3><i class="icons-"></i><a href=""><%= t(:recent_update) %></a></h3>
<div class="detail noStatistics w-a h-a">
<!--<p class="totle"><span><%= t(:statistics) %></span>9,517</p>-->
<h3><i class="icons-"></i><%= t(:recent_update) %></h3>
<div class="detail noStatistics w-b h-a">
<table class="table table-striped">
<thead>
<tr>
@@ -540,46 +504,12 @@
<div class="overview">
<table class="table table-striped">
<tbody>
<tr>
<td>Title1</td>
<td class="span2">公告</td>
</tr>
<tr>
<td>Title2</td>
<td class="span2">頁面</td>
</tr>
<tr>
<td>Title3</td>
<td class="span2">頁面</td>
</tr>
<tr>
<td>Title4</td>
<td class="span2">公告</td>
</tr>
<tr>
<td>Title5</td>
<td class="span2">公告</td>
</tr>
<tr>
<td>Title6</td>
<td class="span2">頁面</td>
</tr>
<tr>
<td>Title7</td>
<td class="span2">頁面</td>
</tr>
<tr>
<td>Title8</td>
<td class="span2">公告</td>
</tr>
<tr>
<td>Title9</td>
<td class="span2">頁面</td>
</tr>
<tr>
<td>Title10</td>
<td class="span2">公告</td>
</tr>
<% @recent_updated.each do |object| %>
<tr>
<td><%= link_to ((object[0].title[I18n.locale] rescue nil) || (object[0].page.i18n_variable[I18n.locale] rescue nil)), get_link_to_object(object[0]) %></td>
<td class="span2"><%= link_to t("dashboard.#{object[0]._type.underscore}"), get_link(object[0]._type.underscore) %></td>
</tr>
<% end %>
</tbody>
</table>
</div>
app/views/admin/page_parts/_public_r_tag.html.erb
+2 -1
View File
@@ -4,7 +4,8 @@
<span id='name_list'>
<% if @r_tag.eql?('sub_menu') %>
<%= f.select :public_r_tag_object_id, options_for_select([t(:horizontal), t(:vertical)], t(:horizontal)) %>
<%= f.hidden_field :public_r_tag_object_id, :value => @part.page.id %>
<%#= f.select :public_r_tag_object_id, options_for_select([t(:horizontal), t(:vertical)], t(:horizontal)) %>
<% else %>
<%= f.select :public_r_tag_object_id, options_from_collection_for_select(@tag_objects, :id, :title, :selected => @part.public_r_tag_object_id) %>
<% end %>
app/views/admin/page_parts/reload_r_tag_options.js.erb
+1 -1
View File
@@ -1,5 +1,5 @@
<% if @r_tag.eql?('sub_menu') %>
$('#name_list select').html("<%= j options_for_select(t(:horizontal) => :horizontal, t(:vertical) => :vertical) %>")
// $('#name_list select').html("<%= j options_for_select(t(:horizontal) => :horizontal, t(:vertical) => :vertical) %>")
<% else %>
$('#name_list select').html("<%= j options_from_collection_for_select(@tag_objects, :id, :title) %>")
<% end %>
app/views/admin/sites/_side_bar.html.erb
+12
View File
@@ -0,0 +1,12 @@
<%= content_tag :li, :class => active_for_controllers('sites') do -%>
<%= link_to content_tag(:i, nil, :class => 'icons-cog') + t('admin.site_settings'), admin_site_site_info_path(@site) %>
<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('sites')) do -%>
<%= content_tag :li, link_to(t('admin.site_info'), admin_site_site_info_path(@site)), :class => active_for_action('sites', 'site_info') %>
<%#= content_tag :li, link_to(t('admin.system_info'), admin_site_system_info_path(@site)), :class => active_for_action('sites', 'system_info') %>
<%#= content_tag :li, link_to(t('admin.site_language'), admin_site_language_path(@site)), :class => active_for_action('sites', 'language') %>
<%= content_tag :li, link_to(t('admin.mail_setting'), admin_site_mail_setting_path(@site)), :class => active_for_action('sites', 'mail_setting') %>
<%#= content_tag :li, link_to(t('admin.ui_theme'), admin_site_ui_theme_path(@site)), :class => active_for_action('sites', 'ui_theme') %>
<% end -%>
<% end -%>
app/views/admin/sites/language.html.erb
+4
View File
@@ -1 +1,5 @@
<% content_for :side_bar do %>
<%= render 'side_bar' %>
<% end %>
language.html.erb
app/views/admin/sites/mail_setting.html.erb
+76 -1
View File
@@ -1 +1,76 @@
mail_setting.html.erb
<% content_for :side_bar do %>
<%= render 'side_bar' %>
<% end %>
<div id="poststuff">
<%= form_for @site, :url => admin_site_path(@site), :html => {:class => "clear"} do |f| %>
<div id="post-body">
<div id="post-body-content" class="clear">
<%= f.fields_for :site_settings, @site['site_settings'] do |f| %>
<div class="form-horizontal">
<div class="control-group">
<label class="control-label"><%= t 'admin.mail_address' %></label>
<div class="controls">
<%= f.text_field :address, :value => (@site['site_settings']['address'] rescue nil) %>
<!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> -->
</div>
</div>
<div class="control-group">
<label class="control-label"><%= t 'admin.mail_port' %></label>
<div class="controls">
<%= f.text_field :port, :value => (@site['site_settings']['port'] rescue nil) %>
<!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> -->
</div>
</div>
<div class="control-group">
<label class="control-label"><%= t 'admin.mail_domain' %></label>
<div class="controls">
<%= f.text_field :domain, :value => (@site['site_settings']['domain'] rescue nil) %>
<!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> -->
</div>
</div>
<div class="control-group">
<label class="control-label"><%= t 'admin.mail_authentication' %></label>
<div class="controls">
<%= f.text_field :authentication, :value => (@site['site_settings']['authentication'] rescue nil) %>
<!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> -->
</div>
</div>
<div class="control-group">
<label class="control-label"><%= t 'admin.mail_user_name' %></label>
<div class="controls">
<%= f.text_field :user_name, :value => (@site['site_settings']['user_name'] rescue nil) %>
<!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> -->
</div>
</div>
<div class="control-group">
<label class="control-label"><%= t 'admin.mail_password' %></label>
<div class="controls">
<%= f.text_field :password, :value => (@site['site_settings']['password'] rescue nil) %>
<!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> -->
</div>
</div>
<div class="control-group">
<label class="control-label"><%= t 'admin.mail_tls' %></label>
<div class="controls">
<%= f.check_box :tls, :checked => (@site['site_settings']['tls'].eql?('1') rescue false) %>
<!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> -->
</div>
</div>
<div class="control-group">
<label class="control-label"><%= t 'admin.mail_enable_starttls_auto' %></label>
<div class="controls">
<%= f.check_box 'enable_starttls_auto', :checked => (@site['site_settings']['enable_starttls_auto'].eql?('1') rescue false) %>
<!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> -->
</div>
</div>
</div>
<% end %>
</div>
</div>
<div class="form-actions">
<%= f.submit t("submit"), :class => "btn btn-primary" %>
<%= f.submit t("cancel"), :class => "btn ", :type => 'reset' %>
</div>
<% end %>
</div>
app/views/admin/sites/site_info.html.erb
+22 -7
View File
@@ -1,3 +1,7 @@
<% content_for :side_bar do %>
<%= render 'side_bar' %>
<% end %>
<div id="poststuff">
<%= form_for @site, :url => admin_site_path(@site), :html => {:class => "clear"} do |f| %>
<div id="post-body">
@@ -9,20 +13,22 @@
<% end %>
</ul>
<div class="tab-content form-horizontal">
<div class="control-group">
<label class="control-label"><%= t 'admin.site_title' %></label>
<div class="control-group" style="margin-bottom: 0;">
<div class="controls">
<%= f.check_box :title_always_on %> <%= t 'admin.always_display_title' %>
<label class="checkbox">
<%= f.check_box :title_always_on %> <%= t 'admin.always_display_title' %>
</label>
</div>
</div>
<% @site_valid_locales.each do |locale|%>
<%= content_tag :div, :class => "tab-pane fade #{active_when_current_locale_eq locale} #{locale}" do %>
<div class="control-group">
<label class="control-label"><%= t 'admin.site_title' %></label>
<div class="controls">
<%= f.fields_for :title, @site.title do |f| %>
<%= f.text_field locale, :class => "input-xxlarge" %>
<% end %>
<p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p>
<p class="help-block"><%= (t 'admin.site_title_help').html_safe %></p>
</div>
</div>
<% end %>
@@ -30,12 +36,12 @@
<% @site_valid_locales.each do |locale|%>
<%= content_tag :div, :class => "tab-pane fade #{active_when_current_locale_eq locale} #{locale}" do %>
<div class="control-group">
<label class="control-label"><%= t 'admin.keywords' %></label>
<label class="control-label"><%= t 'admin.site_keywords' %></label>
<div class="controls">
<%= f.fields_for :keywords, @site.keywords do |f| %>
<%= f.text_area locale, :class => "input-xxlarge textarea-height-s" %>
<% end %>
<p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p>
<p class="help-block"><%= (t 'admin.site_keywords_help').html_safe %></p>
</div>
</div>
<div class="control-group">
@@ -44,7 +50,7 @@
<%= f.fields_for :description, @site.description do |f| %>
<%= f.text_area locale, :class => "input-xxlarge textarea-height-s" %>
<% end %>
<p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p>
<p class="help-block"><%= (t 'admin.site_description_help').html_safe %></p>
</div>
</div>
<div class="control-group">
@@ -53,6 +59,15 @@
<%= f.fields_for :footer, @site.footer do |f| %>
<%= f.text_area locale, :class => "tinymce_textarea input-xxlarge" %>
<% end %>
<p class="help-block"><%= (t 'admin.site_footer_help').html_safe %></p>
</div>
</div>
<div class="control-group">
<label class="control-label"><%= t 'admin.site_sub_menu' %></label>
<div class="controls">
<%= f.fields_for :sub_menu, @site.sub_menu do |f| %>
<%= f.text_area locale, :class => "tinymce_textarea input-xxlarge" %>
<% end %>
</div>
</div>
<% end %>
app/views/admin/sites/system_info.html.erb
+4
View File
@@ -1 +1,5 @@
<% content_for :side_bar do %>
<%= render 'side_bar' %>
<% end %>
system_info.html.erb
app/views/admin/sites/ui_theme.html.erb
+4
View File
@@ -1 +1,5 @@
<% content_for :side_bar do %>
<%= render 'side_bar' %>
<% end %>
ui_theme.html.erb
app/views/layouts/_orbit_bar.html.erb
+1
View File
@@ -10,6 +10,7 @@
<li><%#= link_to content_tag(:i, nil, :class => 'icons-asset') + t('admin.asset'), admin_assets_path %></li>
<li class="divider"></li>
<li><%= link_to content_tag(:i, nil, :class => 'icons-structure') + t('admin.structure'), admin_items_path %></li>
<li><%= link_to content_tag(:i, nil, :class => 'icons-cog') + t('admin.site_settings'), admin_site_site_info_path(@site) %></li>
<li><%#= link_to content_tag(:i, nil, :class => 'icons-plus-cube') + t('admin.add_item') %></li>
</ul>
</div>
app/views/layouts/_side_bar.html.erb
-11
View File
@@ -67,14 +67,3 @@
<%= content_tag :li, link_to(t('announcement.tags'), panel_web_resource_back_end_tags_path), :class => active_for_action('/panel/web_resource/back_end/tags', 'index') %>
<% end -%>
<% end -%>
<%= content_tag :li, :class => active_for_controllers('sites') do -%>
<%= link_to content_tag(:i, nil, :class => 'icons-cog') + t('admin.site_settings'), admin_site_site_info_path(@site) %>
<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('sites')) do -%>
<%= content_tag :li, link_to(t('admin.site_info'), admin_site_site_info_path(@site)), :class => active_for_action('sites', 'site_info') %>
<%= content_tag :li, link_to(t('admin.system_info'), admin_site_system_info_path(@site)), :class => active_for_action('sites', 'system_info') %>
<%= content_tag :li, link_to(t('admin.language'), admin_site_language_path(@site)), :class => active_for_action('sites', 'language') %>
<%= content_tag :li, link_to(t('admin.mail_setting'), admin_site_mail_setting_path(@site)), :class => active_for_action('sites', 'mail_setting') %>
<%= content_tag :li, link_to(t('admin.ui_theme'), admin_site_ui_theme_path(@site)), :class => active_for_action('sites', 'ui_theme') %>
<% end -%>
<% end -%>
app/views/layouts/new_admin.html.erb
+6 -1
View File
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<title><%= @title || APP_CONFIG['orbit'] %></title>
<link rel="shortcut icon" href="<%= asset_path "ncculogo.ico" %>">
<!--[if lt IE 9]>
<%= javascript_include_tag "html5" %>
<![endif]-->
@@ -25,7 +26,11 @@
<div class="viewport">
<div class="overview">
<ul class="nav nav-list">
<%= render 'layouts/side_bar' %>
<% if !(yield :side_bar).blank? %>
<%= yield :side_bar %>
<% else %>
<%= render 'layouts/side_bar' %>
<% end %>
</ul>
</div>
</div>
app/views/layouts/page_layout.html.erb
+1
View File
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<%= page_title(@item).html_safe %>
<link rel="shortcut icon" href="<%= asset_path "ncculogo.ico" %>">
<%= page_metas(@item).html_safe %>
<!--[if lt IE 9]>
<%= javascript_include_tag "html5" %>