diff --git a/app/assets/javascripts/orbit-1.0.js b/app/assets/javascripts/orbit-1.0.js index fcf30d12..30e8fbe3 100644 --- a/app/assets/javascripts/orbit-1.0.js +++ b/app/assets/javascripts/orbit-1.0.js @@ -1,5 +1,6 @@ var viewportwidth, viewportheight; + console.log($(window).height()) function resize() { viewportheight=$(window).height(); viewportwidth=$(window).width(); @@ -49,14 +50,20 @@ $(document).ready(function(){ resize(); var $mainWrapMarginLeft = parseInt($('#main-wrap').css("margin-left"))-2, $subWiget = $('#sub-wiget').width()+18; - $('#main-sidebar').css("height", viewportheight-30); - $('#main-sidebar .viewport').css("height", viewportheight-30); + $orbitBar = $('#orbit-bar').height(), + $mainSidebar = $('#main-sidebar').width()+5, + $formActionPadding = parseInt($('.form-fixed').css("padding-left"))+parseInt($('.form-fixed').css("padding-right")); + console.log($orbitBar); + console.log("ready"+$(window).height()); + $('#main-sidebar').css("height", viewportheight-$orbitBar); + $('#main-sidebar .viewport').css("height", viewportheight-$orbitBar); $('#post-body').css("width", viewportwidth-$mainWrapMarginLeft-$subWiget); $('.post-title').css("width", viewportwidth-$mainWrapMarginLeft-$subWiget-16); $('#main-wrap .subnav').css("width", viewportwidth-$mainWrapMarginLeft); - $('#main-sidebar').tinyscrollbar(); + $('.form-fixed').css("width", viewportwidth-$mainWrapMarginLeft-$formActionPadding); + $('#bulletin_pagination').css("width", viewportwidth-$mainSidebar); + $('#main-sidebar').tinyscrollbar({size:(viewportheight-$orbitBar-4)}); $('.detal-list').tinyscrollbar(); - $('#main-sidebar').tinyscrollbar({size:(viewportheight-34)}); mainTablePosition(); /*isotope*/ @@ -72,12 +79,18 @@ $(window).resize(function(){ resize(); var $mainWrapMarginLeft = parseInt($('#main-wrap').css("margin-left"))-2, $subWiget = $('#sub-wiget').width()+18; - $('#main-sidebar').css("height", viewportheight-30); - $('#main-sidebar .viewport').css("height", viewportheight-30); + $orbitBar = $('#orbit-bar').height(), + $mainSidebar = $('#main-sidebar').width()+5, + $formActionPadding = parseInt($('.form-fixed').css("padding-left"))+parseInt($('.form-fixed').css("padding-right")); + console.log(viewportheight); + $('#main-sidebar').css("height", viewportheight-$orbitBar); + $('#main-sidebar .viewport').css("height", viewportheight-$orbitBar); $('#post-body').css("width", viewportwidth-$mainWrapMarginLeft-$subWiget); $('.post-title').css("width", viewportwidth-$mainWrapMarginLeft-$subWiget-16); - $('#main-wrap .subnav').css("width", viewportwidth-$mainWrapMarginLeft) - $('#main-sidebar').tinyscrollbar({size:(viewportheight-34)}); + $('#main-wrap .subnav').css("width", viewportwidth-$mainWrapMarginLeft); + $('.form-fixed').css("width", viewportwidth-$mainWrapMarginLeft-$formActionPadding); + $('#bulletin_pagination').css("width", viewportwidth-$mainSidebar); + $('#main-sidebar').tinyscrollbar({size:(viewportheight-$orbitBar-4)}); mainTablePosition(); }); /*main-table position*/ diff --git a/app/assets/stylesheets/bootstrap-orbit.css b/app/assets/stylesheets/bootstrap-orbit.css index 2c78b00e..2ce9bc9c 100644 --- a/app/assets/stylesheets/bootstrap-orbit.css +++ b/app/assets/stylesheets/bootstrap-orbit.css @@ -1,5 +1,5 @@ -/*bootstrap-orbit*/ - +/*bootstrap-orbit*/ + h1, h2, h3, h4, h5, h6 { font-weight:normal ; } @@ -112,6 +112,18 @@ table .span1-3 { .qe-block .form-horizontal .form-actions { text-align:right; } +.form-actions form { + margin-bottom: 0; +} +.form-actions form input { + margin-bottom: 0; +} .modal.fade { top: -50%; +} +.form-search button { + margin-bottom: 0; +} +.modal form { + margin-bottom: 0; } \ No newline at end of file diff --git a/app/assets/stylesheets/isotope.css b/app/assets/stylesheets/isotope.css index adf7cdfa..3e7bf739 100644 --- a/app/assets/stylesheets/isotope.css +++ b/app/assets/stylesheets/isotope.css @@ -1,18 +1,11 @@ -/*isotope*/ - +/*isotope*/ + #isotope { margin-top: 2px; - background-color:#f4f4f4; } .isotope-item { z-index: 2; } - -.isotope-hidden.isotope-item { - pointer-events: none; - z-index: 1; -} - /**** Isotope CSS3 transitions ****/ .isotope, @@ -48,28 +41,27 @@ transition-duration: 0s; } .w-a { - width: 388px; + width: 398px; } .w-b { - width: 802px; + width: 812px; } .h-a { height: 315px; } .h-b { - height: 699px; + height: 703px; } .item { margin: 5px 0 15px 15px; } .item h3 { - margin: 5px 0; + margin: 20px 0 5px; } .item h3 [class^="icons-"] { - margin: 3px 5px 0 3px; + margin: 1px 5px 0 3px; } .item .detail { - padding: 5px; border: 1px solid rgba(0, 0, 0, 0.1); background-color: #FFFFFF; border-radius: 5px; @@ -77,12 +69,11 @@ -moz-border-radius: 5px; box-shadow: 0 3px 3px rgba(0, 0, 0, 0.1); -webkit-box-shadow: 0 3px 3px rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 3px 3px rgba(0, 0, 0, 0.1); } .item .detail .totle { font-size: 50px; - padding:10px 5px 20px 0; - margin: 0px; + padding:10px 5px 30px 0; + margin: 0; text-align: right; border-bottom:1px solid #d9d9d9; } @@ -92,20 +83,60 @@ color: #333; padding-left: 5px; text-align:left; + margin-bottom: -7px; +} +.item .detail .table { + margin-bottom: 0; } .item .detail .table th, .item .detail .table td { border-top: none; border-bottom: 1px solid #DDDDDD; } +.item .detail .table tr th { + background-color: #F2F2F2; + border-bottom: 1px solid #AAAAAA; +} .item .detail .table tr td:first-child { color: #666;; } -.item .detail .table tr td:last-child { +.item .detail .table tr td:last-child, .item .detail .table tr th:last-child { text-align:right; + padding-right: 15px; } .item .h-a .my_scroll .viewport { - height: 248px; + height: 210px; } .item .h-b .my_scroll .viewport { - height: 632px; + height: 594px; +} +.item .isotope-hidden.isotope-item { + pointer-events: none; + z-index: 1; +} +.item .my_scroll { + position: relative; +} +.item .my_scroll .scrollbar { + right: 3px; + top: 0; + position: absolute; + z-index: 10; +} +.item .my_scroll .track { + background-color: transparent; +} +.detail.noStatistics { + overflow: hidden; +} +.detail.noStatistics.h-a { + height: 315px; +} +.detail.noStatistics.h-a .my_scroll .viewport { + height: 280px; +} +.detail.noStatistics.h-b { + height: 704px; +} +.detail.noStatistics.h-b .my_scroll .viewport { + height: 670px; } \ No newline at end of file diff --git a/app/assets/stylesheets/list.css b/app/assets/stylesheets/list.css index eb9be54c..b7748291 100644 --- a/app/assets/stylesheets/list.css +++ b/app/assets/stylesheets/list.css @@ -22,7 +22,7 @@ .main-list .nav-pills > li > a { border-radius: 5px 5px 5px 5px; margin: 2px; - padding:5px + padding:5px; } .main-list tbody .quick-edit { position:relative; @@ -54,6 +54,11 @@ position: relative; height: 40px; } +.main-list .label-group .label { + margin-bottom: 1px; + display: inline-block; + padding: 0 3px; +} .main-list .label-td { background-color: rgba(255, 255, 255, 1); height: 40px; @@ -99,6 +104,7 @@ .qe-block td { height:auto; padding: 0; + /*background-color: #dedede;*/ } .qe-block legend { padding-left: 8px; @@ -174,11 +180,18 @@ legend { .sort-header th a:hover { text-decoration: none; } -#check_all_bulletins { +.list-remove { position: absolute; - top: 10px; - left: 5px; + top: 0; + padding-top: 9px !important; + left: 25px; } -#sort_headers .list-remove { - padding: 8px 0 8px 16px !important; +.form-fixed { + position: fixed; + margin-bottom: 0; + bottom: 0; + z-index: 10; +} +.paginationFixed { + margin-bottom: 25px; } \ No newline at end of file diff --git a/app/assets/stylesheets/style.css.erb b/app/assets/stylesheets/style.css.erb index 8fdc3923..b1f3d582 100644 --- a/app/assets/stylesheets/style.css.erb +++ b/app/assets/stylesheets/style.css.erb @@ -243,7 +243,7 @@ padding-right: 4px; border-right: 1px solid rgba(0,0,0,.2); position:fixed; - top: 32px; + top: 31px; z-index: 88; } #main-sidebar .nav { @@ -286,17 +286,18 @@ background-color: #FFF; margin-left:160px; padding-top: 32px; - padding-bottom: 18px; + /*padding-bottom: 18px;*/ position: relative; - min-height: 100%; + padding-bottom: 45px; + /*min-height: 100%;*/ } -#main-wrap > .form-actions { +/*#main-wrap > .form-actions { background-color: #FFF; text-align: center; padding: 17px 20px 0; margin: 0; border-top: none; -} +}*/ #main-wrap .subnav { height: auto; min-height: 36px; @@ -345,7 +346,7 @@ text-align: right; padding-left: 10px; padding-right: 10px; - margin-bottom: 0; + margin-bottom: -50px; clear: both; } #poststuff form { @@ -634,9 +635,6 @@ .adbanner-action { margin-bottom: 20px; } -#bulletin_link_qe form { - margin: 0; -} [class^="icons-"] { display: inline-block; width: 16px; @@ -925,5 +923,5 @@ } /*21*/ .icons- { - background-position: -0px -640px; -} \ No newline at end of file + background-position: -0px -640px +} diff --git a/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb b/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb index cac5f1a1..4a3f2db4 100644 --- a/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb +++ b/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb @@ -1,5 +1,5 @@ - +
+ <%= f.submit t('submit'), :class=>'btn btn-primary',:remote=>true %> + <%= t('cancel')%> +
<% end %> - diff --git a/app/views/admin/ad_banners/index.html.erb b/app/views/admin/ad_banners/index.html.erb index 9a5d438b..d70afab3 100644 --- a/app/views/admin/ad_banners/index.html.erb +++ b/app/views/admin/ad_banners/index.html.erb @@ -8,17 +8,17 @@
-
diff --git a/app/views/admin/dashboards/index.html.erb b/app/views/admin/dashboards/index.html.erb index d038b63d..e22d7dac 100644 --- a/app/views/admin/dashboards/index.html.erb +++ b/app/views/admin/dashboards/index.html.erb @@ -1,197 +1,16 @@
-

Member

-
-

Quantity9,517

-
-
-
-
-
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
University2,304
Master783
Doctor45
Staff62
Teacher52
Professor20
Assistant Professor41
Substitute teacher37
Lecturer41
Part-time teacher20
-
-
-
-
-
-
-

Content

-
-

Quantity9,517

-
-
-
-
-
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
University2,304
Master783
Doctor45
Staff62
Teacher52
Professor20
Assistant Professor41
Substitute teacher37
Lecturer41
Part-time teacher20
-
-
-
-
-
-
-

Asset

-
-

Quantity9,517

-
-
-
-
-
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
University2,304
Master783
Doctor45
Staff62
Teacher52
Professor20
Assistant Professor41
Substitute teacher37
Lecturer41
Part-time teacher20
-
-
-
-
-
-
-

Traffic

+

<%= t(:content) %>

-

Quantity9,517

+

<%= t(:all_content) %>9,517

+ + + + + + + +
<%= t(:module) %><%= t(:quantity) %>
@@ -205,128 +24,44 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +
University2,304公告2,304
Master783新聞783
Doctor45連結45
Staff62連結62
Teacher52連結52
Professor20新聞20
Assistant Professor41公告41
Substitute teacher37公告37
Lecturer41公告41
Part-time teacher20
Staff62
Teacher52
Professor20
Assistant Professor41
Substitute teacher37
Lecturer41
Part-time teacher20
Staff62
Teacher52
Professor20
Assistant Professor41
Substitute teacher37
Lecturer41
Part-time teacher20
Staff62
Teacher52
Professor20
Assistant Professor41
Substitute teacher37
Lecturer41
Part-time teacher20公告20
@@ -336,72 +71,17 @@
-

Site info

-
-

Quantity9,517

-
-
-
-
-
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
University2,304
Master783
Doctor45
Staff62
Teacher52
Professor20
Assistant Professor41
Substitute teacher37
Lecturer41
Part-time teacher20
-
-
-
-
-
-
-

Connection

+

<%= t(:member) %>

-

Quantity9,517

+

<%= t(:all_member) %>2,217

+ + + + + + + +
<%= t(:role) %><%= t(:quantity) %>
@@ -461,4 +141,450 @@
+
+

<%= t(:file) %>

+
+

<%= t(:all_file) %>3,422

+ + + + + + + +
<%= t(:file_type) %><%= t(:quantity) %>
+
+
+
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Word304
PDF783
PowerPoint45
Excel62
Jpeg52
Gif20
Png41
Avi37
Txt41
Zip20
+
+
+
+
+
+
+

<%= t(:referral_in_links) %>

+
+

<%= t(:statistics) %>517

+ + + + + + + +
<%= t(:site_name) %><%= t(:statistics) %>
+
+
+
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Ruling36
Yahoo31
Google3,187
facebook公告
Title5公告
Title6頁面
Title7頁面
Title8公告
Title9頁面
Title10公告
+
+
+
+
+
+
+

<%= t(:most_visited_page) %>

+
+ + + + + + + + +
<%= t(:title) %><%= t(:module) %><%= t(:hits) %>
+
+
+
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Title1公告2,549
Title2頁面1,022
Title3頁面928
Title4公告904
Title5公告867
Title6頁面830
Title7頁面749
Title8公告702
Title9頁面639
Title10公告549
Title1公告2,549
Title2頁面1,022
Title3頁面928
Title4公告904
Title5公告867
Title6頁面830
Title7頁面749
Title8公告702
Title9頁面639
Title10公告549
+
+
+
+
+
+
+

<%= t(:traffic) %>

+
+

<%= t(:total_visitors) %>438,913

+ + + + + + + +
<%= t(:item) %><%= t(:data) %>
+
+
+
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + + +
Visitors Today2,304
Visitors This Month783
Visitor This Tear45
+
+
+
+
+
+
+

<%= t(:site_info) %>

+
+ + + + + + + + +
<%= t(:item) %><%= t(:content) %>
+
+
+
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Title:National Chengchi University
Description:......
Keywords.....
Online Date:2012/04/30
WedID:nccu
Softwave Version:R4 beta
Warranty:Valid
+
+
+
+
+
+
+

<%= t(:recent_update) %>

+
+ + + + + + + + +
<%= t(:title) %><%= t(:module) %>
+
+
+
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Title1公告
Title2頁面
Title3頁面
Title4公告
Title5公告
Title6頁面
Title7頁面
Title8公告
Title9頁面
Title10公告
+
+
+
+
+
\ No newline at end of file diff --git a/app/views/admin/designs/index.html.erb b/app/views/admin/designs/index.html.erb index 6195afd5..13837003 100644 --- a/app/views/admin/designs/index.html.erb +++ b/app/views/admin/designs/index.html.erb @@ -1,24 +1,41 @@ <%= flash_messages %> + + - - - - + + + + <% @designs.each do |design| %> - +
- - - <%= t('admin.title') %><%= t('admin.author') %><%= t('admin.intro') %>
<%= design.title %>
-
    +
    • <%= link_to t(:edit), edit_admin_design_path(design), :class => 'edit' %>
    • <%= link_to t(:delete), admin_design_path(design), :confirm => t('sure?'), :method => :delete, :class => 'delete' %>
    @@ -30,6 +47,6 @@ <% end %>
-
+
<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_admin_design_path, :class => 'btn btn-primary' %>
\ No newline at end of file diff --git a/app/views/admin/tags/index.html.erb b/app/views/admin/tags/index.html.erb index cca4b6af..2056bdd8 100644 --- a/app/views/admin/tags/index.html.erb +++ b/app/views/admin/tags/index.html.erb @@ -1,4 +1,4 @@ -
+
<%= render :partial => 'tag', :collection => @tags %>
-
+
<%= render 'add' %>
\ No newline at end of file diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb index 75aa6130..137c5de9 100644 --- a/app/views/layouts/_side_bar.html.erb +++ b/app/views/layouts/_side_bar.html.erb @@ -20,9 +20,9 @@ <%= content_tag :li, :class => active_for_controllers('page_contexts') do -%> <%= link_to content_tag(:i, nil, :class => 'icons-page') + t('admin.page'), panel_page_content_back_end_page_contexts_path %> - <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('page_contexts')) do -%> - <%= content_tag :li, link_to(t('admin.all_articles'), panel_page_content_back_end_page_contexts_path), :class => active_for_action('page_context', 'index') %> - <% end -%> + <%#= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('page_contexts')) do -%> + <%#= content_tag :li, link_to(t('admin.all_articles'), panel_page_content_back_end_page_contexts_path), :class => active_for_action('page_context', 'index') %> + <%# end -%> <% end -%> <%= content_tag :li, :class => active_for_controllers('designs') do -%> @@ -31,11 +31,11 @@ <%= content_tag :li, :class => active_for_controllers('ad_banners', 'ad_images') do -%> <%= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.ad_banner'), admin_ad_banners_path %> - <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('ad_banners', 'ad_images')) do -%> - <%= content_tag :li, link_to(t('admin.ad.all_banners'), admin_ad_banners_path), :class => active_for_action('ad_banners', 'index') %> + <%#= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('ad_banners', 'ad_images')) do -%> + <%#= content_tag :li, link_to(t('admin.ad.all_banners'), admin_ad_banners_path), :class => active_for_action('ad_banners', 'index') %> <%#= content_tag :li, link_to(t('admin.ad.new_banner'), new_admin_ad_banner_path), :class => active_for_action('ad_banners', 'new') %> <%#= content_tag :li, link_to(t('admin.ad.new_image'), new_ad_image_admin_ad_banners_path), :class => active_for_action('ad_images', 'new') %> - <% end %> + <%# end %> <% end %> <%= content_tag :li, :class => active_for_controllers('web_links', '/panel/web_resource/back_end/tags', 'web_link_categorys') do -%> diff --git a/config/locales/en.yml b/config/locales/en.yml index f33b2598..d25c8cc1 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -41,6 +41,29 @@ en: view: View yes_: "Yes" + all_content: All Content + all_file: All File + all_member: All Member + content: Content + data: Data + file: File + file_type: File Type + hits: Hits + item: Item + member: Member + module: Module + most_visited_page: Most Visited Page + quantity: Quantity + recent_update: Recent Update + referral_in_links: Referral in Links + role: Role + site_info: Site Info + site_name: Site Name + statistics: Statistics + title: Title + total_visitors: Total Visitors + traffic: Traffic + admin: action: Action ad_banner: AD Banner diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index 753f41f1..7e3155f8 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -37,7 +37,30 @@ zh_tw: update: 更新 view: 檢視 yes_: "Yes" - + + all_content: 全部內容有： + all_file: 全部檔案有： + all_member: 成員總數： + content: 內容 + data: 數據 + file: 檔案 + file_type: 檔案類型 + hits: 點擊率 + item: 項目 + member: 成員 + module: 模組 + most_visited_page: 熱門頁面 + quantity: 數量 + recent_update: 近期更新 + referral_in_links: 外部推薦連結 + role: 角色 + site_info: 網站資訊 + site_name: 網站名稱 + statistics: 統計 + title: 標題 + total_visitors: 造訪次數： + traffic: 流量 + admin: action: 操作 ad_banner: 廣告輪播 diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/setting.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/setting.html.erb index 8bb86ad0..6bcd7a59 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/setting.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/setting.html.erb @@ -23,8 +23,8 @@ <%= content_tag :div do -%> <% form_tag :action => "update_setting" do %> <%= render :partial => "privilege_user", :locals => {:users => @users_array} %> -
- <%= submit_tag "Update", :class => 'btn' %> +
+ <%= submit_tag "Update", :class => 'btn btn-primary' %>
<% end -%> <% end -%> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_form.html.erb index df0dc38c..1fbf5e2e 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_form.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_form.html.erb @@ -29,7 +29,7 @@ <%#
顯示方式是設定在前台頁面時，資訊所呈現的樣式 %>
-
+
<%= f.submit t('submit'), :class=>'btn btn-primary' %>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/index.html.erb index 28d2fde0..4d31464f 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/index.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/index.html.erb @@ -1,12 +1,30 @@ <%= flash_messages %> + + + - + <% @site_valid_locales.each do |locale| %> - + <% end %> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb index 89872e5e..1e46b994 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb @@ -5,7 +5,7 @@
<%= t('bulletin_category.key') %><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %>
<% end %> -
+
<%= paginate @bulletins, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
@@ -14,14 +14,8 @@ <%= render :partial => "bulletin_link_qe" %>
- -
- -
-
+
<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_panel_announcement_back_end_bulletin_path, :class => 'btn btn-primary' %>
diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb index 4e76abf8..835b0511 100644 --- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb +++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb @@ -3,41 +3,40 @@ <%= f.error_messages %>
+
+
+ <%= f.label :name %> + <%= @page_context.page.i18n_variable[I18n.locale] %> +
-
- <%= f.label :name %> - <%= @page_context.page.i18n_variable[I18n.locale] %> -
- - - -
- - <% @site_valid_locales.each_with_index do |locale, i| %> + + +
-
"> + <% @site_valid_locales.each_with_index do |locale, i| %> + +
"> -
- <%= f.label :context %> - <%= f.fields_for :context, (@page_context.new_record? ? @page_context.build_context : @page_context.context ) do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_area locale, :style=>"width:100%", :class => 'tinymce_textarea' %> - <% end %> +
+ <%= f.label :context %> + <%= f.fields_for :context, (@page_context.new_record? ? @page_context.build_context : @page_context.context ) do |f| %> + <%= I18nVariable.from_locale(locale) %> + <%= f.text_area locale, :style=>"width:100%", :class => 'tinymce_textarea' %> + <% end %> +
+
+ <% end %>
- <% end %> -
- - -
- <%= f.submit t('submit'), :class=>'btn btn-primary' %> - <%= link_to t('cancel'), get_go_back, :class=>"btn" %> -
- +
+ +
+ <%= f.submit t('submit'), :class=>'btn btn-primary' %> + <%= link_to t('cancel'), get_go_back, :class=>"btn" %>
diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/edit.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/edit.html.erb index 7b969d4e..ee295706 100644 --- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/edit.html.erb +++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/edit.html.erb @@ -1,8 +1,8 @@ - +

<%= t('page_content.editing_page_content') %>

<%= form_for @page_context, :url => panel_page_content_back_end_page_context_path(@page_context), :html => {:class => 'clear'} do |f| %> <%= render :partial => 'form', :locals => {:f => f} %> <% end %> - +
<%#= link_back %> \ No newline at end of file diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.html.erb index 852697c7..a71c45eb 100644 --- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.html.erb +++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.html.erb @@ -1,13 +1,30 @@ <%= flash_messages %> + + - - - - + + + + diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/index.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/index.html.erb index 7cc5bd5e..87defb11 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/index.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/index.html.erb @@ -27,7 +27,7 @@ <% end %> - + <%= render :partial => 'web_link_category', :collection => @web_link_categorys %> diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb index 22c20688..03d11db1 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb @@ -13,9 +13,18 @@

Status

- <%= f.check_box :is_top %><%= t('top') %> - <%= f.check_box :is_hot %><%= t('hot') %> - <%= f.check_box :is_hidden %><%= t('hide') %> + <%= content_tag :label,:class => "checkbox inline" do -%> + <%= f.check_box :is_top %> + <%= t('top') %> + <% end -%> + <%= content_tag :label,:class => "checkbox inline" do -%> + <%= f.check_box :is_hot %> + <%= t('hot') %> + <% end -%> + <%= content_tag :label,:class => "checkbox inline" do -%> + <%= f.check_box :is_hidden %> + <%= t('hide') %> + <% end -%>
@@ -27,8 +36,10 @@

Tags

<% @tags.each do |tag| %> - <%= check_box_tag 'web_link[tag_ids][]', tag.id, @web_link.tag_ids.include?(tag.id)%> - <%= tag[I18n.locale] %> + <%= content_tag :label,:class => "checkbox inline" do -%> + <%= check_box_tag 'web_link[tag_ids][]', tag.id, @web_link.tag_ids.include?(tag.id)%> + <%= tag[I18n.locale] %> + <% end %> <% end %>
@@ -86,12 +97,10 @@ - - -
- <%= f.submit t('submit'), :class=>'btn btn-primary' %> - <%= link_to t('cancel'), get_go_back, :class=>"btn" %> -
- - \ No newline at end of file + + +
+ <%= f.submit t('submit'), :class=>'btn btn-primary' %> + <%= link_to t('cancel'), get_go_back, :class=>"btn" %> +
\ No newline at end of file diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb index 632eb4a1..67c54719 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb @@ -3,7 +3,7 @@ - + @@ -13,6 +13,9 @@
<%= t('page_context.name') %><%= t('page_context.version') %><%= t('page_context.update_time') %><%= t('page_context.last_modified') %>
-