From 3ec8bb7be67041bcd96f75a83a1e8a6aa1e3d2d4 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Wed, 25 Apr 2012 15:10:28 +0800 Subject: [PATCH 01/28] Fix assets bug: when having a '.' in the name, the extension must be specified --- .gitignore | 3 +-- app/views/admin/ad_images/_form.html.erb | 4 ++-- .../panel/announcement/back_end/bulletins/_form.html.erb | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 71494e30..b57fdb65 100644 --- a/.gitignore +++ b/.gitignore @@ -10,8 +10,7 @@ uploads/**/* *.swp -public/javascripts -public/stylesheets +public/assets config/application.rb .rvmrc diff --git a/app/views/admin/ad_images/_form.html.erb b/app/views/admin/ad_images/_form.html.erb index ea30634c..8fbefb33 100644 --- a/app/views/admin/ad_images/_form.html.erb +++ b/app/views/admin/ad_images/_form.html.erb @@ -3,10 +3,10 @@ <% end %> <% content_for :page_specific_javascript do %> <%= javascript_include_tag "lib/datepicker" %> - <%= javascript_include_tag "lib/date.format" %> + <%= javascript_include_tag "lib/date.format.js" %> <%= javascript_include_tag "inc/modal-preview" %> <%= javascript_include_tag "/static/jquery.cycle.all.latest.js" %> - <%= javascript_include_tag "inc/jquery.imagesloaded" %> + <%= javascript_include_tag "inc/jquery.imagesloaded.js" %> <% end %> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb index b8aa5d2a..df86f221 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb @@ -293,7 +293,7 @@ <% content_for :page_specific_javascript do %> <%= javascript_include_tag "bulletin_form" %> - <%= javascript_include_tag "inc/jquery.imagesloaded" %> + <%= javascript_include_tag "inc/jquery.imagesloaded.js" %> + + -<% end -%> - - + +<% end -%> diff --git a/config/routes.rb b/config/routes.rb index 3b48f300..e8695f0a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -25,7 +25,7 @@ Orbit::Application.routes.draw do end - match 'ad_banner/:title/preview' => 'ad_banners#realtime_preview',:as => :realtime_preview_ad_banner,:via => :put + match 'ad_banner/:id/preview' => 'ad_banners#realtime_preview',:as => :realtime_preview_ad_banner,:via => :put resources :ad_banners do collection do match 'new_ad_image' => 'ad_images#new',:as => :new_ad_image,:via => :get From a704a054cc42167088f2154cf86e885c1754cfbe Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Wed, 25 Apr 2012 11:43:24 +0800 Subject: [PATCH 05/28] Remove useless files --- .../back_end/fact_checks_controller.rb | 75 ------------------- .../approvals/_list_table.html.erb.can_del | 2 +- .../fact_checks/_list_table.html.erb.can_del | 15 ---- .../fact_checks/_privilege_user.html.erb | 26 ------- .../fact_checks/index.html.erb.can_del | 50 ------------- .../back_end/fact_checks/setting.js.erb | 1 - 6 files changed, 1 insertion(+), 168 deletions(-) delete mode 100644 vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/fact_checks_controller.rb delete mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_list_table.html.erb.can_del delete mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb delete mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/index.html.erb.can_del delete mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.js.erb diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/fact_checks_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/fact_checks_controller.rb deleted file mode 100644 index 606225e9..00000000 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/fact_checks_controller.rb +++ /dev/null @@ -1,75 +0,0 @@ -class Panel::Announcement::BackEnd::FactChecksController < OrbitBackendController - before_filter :authenticate_user! - include AdminHelper - # layout 'admin' - - def setting - @bulletin_categorys = BulletinCategory.all - if params.has_key?(:category_id) - first_category = BulletinCategory.find params[:category_id] - if params[:commit] == 'Update' - privilege_users = params[:users].collect{|key,value| User.find key } rescue [] - preload_object_auth_ary = first_category.object_auths.where(title: 'fact_check') || (first_category.object_auths.create :title=> 'fact_check') - preload_object_auth = preload_object_auth_ary.first - preload_object_auth.privilege_users = privilege_users - preload_object_auth.save! - end - else - first_category = @bulletin_categorys.first - end - preload_object_auth = first_category.object_auths.where(title: 'fact_check').empty?? (first_category.object_auths.create! :title=> 'fact_check') : first_category.object_auths.where(title: 'fact_check') - @users_array = preload_object_auth.first.privilege_users rescue [] - respond_to do |format| - format.html - format.js - end - end - - def update_setting - - end - # def index - # get_categorys(params[:bulletin_category_id]) - # - # @bulletins = params[:sort] ? get_sorted_bulletins : Bulletin.all - # @bulletin_categories = BulletinCategory.all - # - # module_app = ModuleApp.first(:conditions => {:key => 'announcement'}) - # @tags = Tag.all(:conditions => {:module_app_id => module_app.id}).order_by(I18n.locale, :asc) - # - # respond_to do |format| - # format.html # index.html.erb - # format.js - # format.xml { render :xml => @bulletins } - # end - # end - # - # def new - # - # end - # - # def create - # - # end - # - # def update - # - # end - # - # def edit - # - # end - # - # def destroy - # - # end - protected - def get_categorys(id = nil) - @bulletin_categorys = [] - if(is_manager? || is_admin?) - @bulletin_categorys = (id ? BulletinCategory.find(id).to_a : BulletinCategory.excludes('disabled' => true)) - elsif is_sub_manager? - @bulletin_categorys = BulletinCategory.authed_for_user(current_user,'submit_new') - end - end -end diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/_list_table.html.erb.can_del b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/_list_table.html.erb.can_del index 59bac03a..edb738d3 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/_list_table.html.erb.can_del +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/_list_table.html.erb.can_del @@ -10,6 +10,6 @@ <% bulletin_category.bulletins.each do |post| %> - <%= render :partial => 'panel/announcement/back_end/bulletins/bulletins', :locals => {:post => post,:fact_check_allow=>true} %> + <%= render :partial => 'panel/announcement/back_end/bulletins/bulletins', :locals => {:post => post,:approval_allow=>true} %> <% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_list_table.html.erb.can_del b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_list_table.html.erb.can_del deleted file mode 100644 index 59bac03a..00000000 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_list_table.html.erb.can_del +++ /dev/null @@ -1,15 +0,0 @@ -

<%= bulletin_category.key %>

- - - - - - - - - - -<% bulletin_category.bulletins.each do |post| %> - <%= render :partial => 'panel/announcement/back_end/bulletins/bulletins', :locals => {:post => post,:fact_check_allow=>true} %> -<% end %> -
<%= t('bulletin.status') %><%= t('bulletin.category') %><%= t('bulletin.title') %><%= t('bulletin.postdate') %><%= t('bulletin.deadline') %><%= t('bulletin.action') %>
\ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb deleted file mode 100644 index 759e941d..00000000 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb +++ /dev/null @@ -1,26 +0,0 @@ -<%= content_tag :div ,:id => "users_checkbox_ary",:class => 'clear' do -%> -<% sys_users = User.all -%> - <% sys_users.each do |user| -%> - -
- - <% user.sub_roles.each do |sr| %> - - <% end %> - <%= content_tag :div,:data=>{'original-title'=>t('announcement.bulletin.fact_check_setting_window_title'),:content => "#{user.sub_roles.collect{|sr| sr.key}.join(',')}"},:class=>"checkbox clear" do %> -
-
-
- <% if user.avatar? %> - <%= image_tag(user.avatar.thumb.url,:class => "member-img") %> - <% else %> - <%= image_tag "person.png",:class => "member-img" %> - <% end %> -
- <%= label_tag "lab-user-#{user.id}", (user.name rescue ''),:class=>"member-name",:id=>nil -%> - <%= check_box_tag "[users][#{user.id}]", 'true',users.include?(user),:class => "check" -%> - <%end -%> -
- - <% end -%> -<% end -%> \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/index.html.erb.can_del b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/index.html.erb.can_del deleted file mode 100644 index 32f3d820..00000000 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/index.html.erb.can_del +++ /dev/null @@ -1,50 +0,0 @@ -<%= render 'panel/announcement/back_end/bulletins/filter' %> - - <%= render 'panel/announcement/back_end/bulletins/bulletins' %> -
-
- <%= 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' %> -
- - \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.js.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.js.erb deleted file mode 100644 index a01c9d6a..00000000 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.js.erb +++ /dev/null @@ -1 +0,0 @@ -$("#users_checkbox_ary").replaceWith('<%= (render :partial => 'privilege_user', :locals => {:users => @users_array}).html_safe%>'); \ No newline at end of file From a3a109fb8b1cd6b71dabb6299796acf361946ba2 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Wed, 25 Apr 2012 13:58:03 +0800 Subject: [PATCH 06/28] Remove JS debug msg. --- app/views/admin/ad_banners/_modal_preview.html.erb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/views/admin/ad_banners/_modal_preview.html.erb b/app/views/admin/ad_banners/_modal_preview.html.erb index 12e95020..a79dc56e 100644 --- a/app/views/admin/ad_banners/_modal_preview.html.erb +++ b/app/views/admin/ad_banners/_modal_preview.html.erb @@ -21,7 +21,6 @@ $(document).ready(function() { $("#slideshow-<%=ad_banner.title.dehumanize%>").on("show", function () { - console.info("<%= ad_banner.ad_fx.nil?? "fade": ad_banner.ad_fx %>"+" <%= ad_banner.transition_msec %>"); $("#slideshow-<%=ad_banner.title.dehumanize%>").find(".ad_banner_slideshow").cycle({delay: -1000, fx: "<%= ad_banner.ad_fx.nil?? "fade": ad_banner.ad_fx %>", timeoutFn: getTimeout }); }); $(".modal").on("hidden", function () { From 65a6f9c4166f428bc934279ad230be169844db05 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Wed, 25 Apr 2012 16:26:27 +0800 Subject: [PATCH 07/28] Ray's css fix for quick edit --- app/assets/stylesheets/list.css | 18 +++++++ app/assets/stylesheets/style.css.erb | 54 +++++++++++-------- app/assets/stylesheets/widgets.css | 22 +++++--- .../admin/ad_banners/_ad_banner_tab.html.erb | 38 +++++++------ app/views/admin/ad_images/_form.html.erb | 2 +- .../bulletins/_bulletin_link_qe.html.erb | 5 +- .../bulletins/_quick_edit_picture.html.erb | 35 ++++++------ .../bulletins/_quick_edit_tags.html.erb | 16 +++--- 8 files changed, 117 insertions(+), 73 deletions(-) diff --git a/app/assets/stylesheets/list.css b/app/assets/stylesheets/list.css index 6808e533..eb9be54c 100644 --- a/app/assets/stylesheets/list.css +++ b/app/assets/stylesheets/list.css @@ -35,6 +35,9 @@ width: 350px; left: -8px; } +.main-list tr:first-child td { + border-top: 1px solid #DDDDDD; +} .main-list td { background-color: #FFFFFF; border-bottom: 1px solid #DDDDDD; @@ -75,6 +78,9 @@ -moz-border-radius: 3px; z-index: 5; } +.qe-edit-div .table-condensed { + background-color: #F2F2F2; +} .table-label { background-color: #F2F2F2; position: relative; @@ -94,6 +100,18 @@ height:auto; padding: 0; } +.qe-block legend { + padding-left: 8px; + margin-bottom: 0; + padding-bottom: 0; +} +.qe-block .control-group { + margin-bottom: 0; +} +.qe-block .controls, .qe-block .control-label { + margin-top: 10px; + margin-bottom: 10px; +} .qe-block .table td, .qe-block .table th { padding: 8px; } diff --git a/app/assets/stylesheets/style.css.erb b/app/assets/stylesheets/style.css.erb index ac151e90..e832fa8a 100644 --- a/app/assets/stylesheets/style.css.erb +++ b/app/assets/stylesheets/style.css.erb @@ -1,5 +1,5 @@ -/*style*/ - +/*style*/ + @font-face{ font-family: 'WebSymbolsRegular'; src: url(<%= asset_path 'websymbols-regular-webfont.eot' %>); @@ -109,7 +109,7 @@ text-indent: -9999px; padding:6px; } -#orbit-bar .nav > li.search { +#orbit-bar .nav > li.search { background-image: none; overflow: hidden; width: 28px; @@ -323,9 +323,9 @@ #main-wrap .breadcrumb li { font-size: 12px; color: #999; -} -.form-actions .btn { - margin-bottom: 0; +} +.form-actions .btn { + margin-bottom: 0; } #sub-wiget { clear: right; @@ -569,8 +569,8 @@ padding: 5px; } .popover-content { - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; border-radius: 0 0 3px 3px; padding: 5px; } @@ -612,20 +612,32 @@ } .text-green { color: #39b54a !important; +} +.adbanner-setup { + margin-right: 10px; + margin-bottom: 30px !important; +} +.adbanner-list { + border-top: 1px solid #AAA; + margin-right: 10px; + padding-top: 10px; + position: relative; +} +.adbanner-list ul { + margin: 0px; +} +.adbanner-list ul li { + list-style: none; + margin-left: 0; + margin-right: 20px; +} +.adbanner-action { + position: absolute; + top: -32px; + right: 0; } -.adbanner-list { - margin-top: 20px; -} -.adbanner-list ul { - margin: 0px; -} -.adbanner-list ul li { - list-style: none; - margin-left: 0; - margin-right: 20px; -} -.adbanner-action { - margin-bottom: 20px; +#bulletin_link_qe form { + margin: 0; } [class^="icons-"] { display: inline-block; diff --git a/app/assets/stylesheets/widgets.css b/app/assets/stylesheets/widgets.css index 80756ecb..04273d5b 100644 --- a/app/assets/stylesheets/widgets.css +++ b/app/assets/stylesheets/widgets.css @@ -1,5 +1,5 @@ -/*Widget*/ - +/*Widget*/ + .widget-size-300 { width:298px; @@ -100,6 +100,18 @@ } .file-upload .upload:focus { position:absolute; +} +.file-upload .input-medium { + border-radius: 3px 3px 3px 3px !important; + width: 267px; + position: relative; + z-index: 5; + display: block; + clear: both; +} +.file-upload .control-label { + margin-top: 0; + margin-bottom: 5px; } .upload-picture { margin-bottom: 5px; @@ -120,12 +132,6 @@ margin : 0px 0 5px; padding: 5px 10px; } -.file-upload .input-medium { - border-radius: 3px 3px 3px 3px !important; - width: 267px; - position: relative; - z-index: 5; -} #widget-link table { margin-bottom:0 } diff --git a/app/views/admin/ad_banners/_ad_banner_tab.html.erb b/app/views/admin/ad_banners/_ad_banner_tab.html.erb index c1e406db..c60bf0e2 100644 --- a/app/views/admin/ad_banners/_ad_banner_tab.html.erb +++ b/app/views/admin/ad_banners/_ad_banner_tab.html.erb @@ -1,23 +1,27 @@ -
" id=<%= ad_banner_tab.title %>> -

<%= t("admin.ad.banner_best_size") %>：

+
" id=<%= ad_banner_tab.title %>> <%= form_for ad_banner_tab,:url=> admin_ad_banner_path(ad_banner_tab),:method => :put,:class=>"input-medium" do |f| -%> - <%= f.label :ad_fx, t('admin.ad.ab_fx') %> - <%= f.select :ad_fx ,AdBanner::FX_TYPES %> - <%= f.label :transition_sec, t('admin.ad.transition_sec') %> - <%= f.text_field :transition_sec,:placeholder=>t('admin.ad.sec_place_holder'),:class=> "span3" %> <%= t("admin.ad.trans_unit_sec") %> - <%= f.submit t("admin.ad.update_banner") %> - <%= f.submit t("cancel"),:type=>'reset' %> -
-
- <%= link_to t("admin.ad.new_image"),new_admin_ad_banner_ad_image_path(ad_banner_tab) ,:class => "btn btn-primary"%> - <%= link_to t("modal.preview"), admin_realtime_preview_ad_banner_path(ad_banner_tab.title) , :class=>'preview_trigger btn btn-success'%> +
+ + <%= f.label :ad_fx, t('admin.ad.ab_fx') %> + <%= f.select :ad_fx ,AdBanner::FX_TYPES %> + <%= f.label :transition_sec, t('admin.ad.transition_sec') %> + <%= f.text_field :transition_sec,:placeholder=>"3秒請輸入3000",:class=> "span3" %> <%= t("admin.ad.trans_unit_sec") %> +
+ <%= f.submit t("admin.ad.update_banner"), :class => 'btn' %> + <%= f.submit t("cancel"),:type=>'reset', :class => 'btn' %> +
+

圖片列表

+
+
+ <%= link_to t("admin.ad.new_image"),new_admin_ad_banner_ad_image_path(ad_banner_tab) ,:class => "btn btn-primary"%> + <%= link_to t("modal.preview"), admin_realtime_preview_ad_banner_path(ad_banner_tab.title) , :class=>'preview_trigger btn btn-success'%> +
+
    + <%= render :partial => "ad_image_update", :collection => ad_banner_tab.ad_images,:as => :ad_image,:locals=>{:ad_banner => ad_banner_tab} %> +
+ <%#= render :partial => 'new_add_banner_file', :object => ad_banner_tab.ad_images.build, :locals => { :field_name => "new_ad_images[]", :f => f, :classes => "r_destroy" } %>
-
    - <%= render :partial => "ad_image_update", :collection => ad_banner_tab.ad_images,:as => :ad_image,:locals=>{:ad_banner => ad_banner_tab} %> -
- <%#= render :partial => 'new_add_banner_file', :object => ad_banner_tab.ad_images.build, :locals => { :field_name => "new_ad_images[]", :f => f, :classes => "r_destroy" } %> -
<% end -%> <%#= render :partial => 'preview_block',:locals=> {:ad_banner =>ad_banner_tab} %>
diff --git a/app/views/admin/ad_images/_form.html.erb b/app/views/admin/ad_images/_form.html.erb index ea30634c..4a759f52 100644 --- a/app/views/admin/ad_images/_form.html.erb +++ b/app/views/admin/ad_images/_form.html.erb @@ -83,7 +83,7 @@ 此區塊圖片尺寸請使用580px × 225px
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link_qe.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link_qe.html.erb index c146da48..fd013f56 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link_qe.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link_qe.html.erb @@ -25,12 +25,11 @@
<% end %> <% end %> - +
<%= hidden_field_tag 'bulletin_link[bulletin_id]', @bulletin_link.bulletin_id %> <%= f.submit t('submit'), :class=>'btn btn-primary' %> - <%= t('cancel')%> + <%= t('cancel')%> <% end %> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_picture.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_picture.html.erb index a1ee68fd..ae40b18f 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_picture.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_picture.html.erb @@ -1,24 +1,25 @@
-
+
- +
- -
- - -
- -
- <% if bulletin.image.file %> - <%= f.check_box :remove_image %> - <%= t('announcement.刪除已上傳檔案') %> - <% end %> +
+ +
+
+ + + +
+ <% if bulletin.image.file %> + <%= f.check_box :remove_image %> + <%= t('announcement.刪除已上傳檔案') %> + <% end %>
-
+
\ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_tags.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_tags.html.erb index d28c24e3..0e302be3 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_tags.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_tags.html.erb @@ -34,11 +34,15 @@
-
- <% @tags.each do |tag| %> - <%= check_box_tag 'bulletin[tag_ids][]', tag.id, bulletin.tag_ids.include?(tag.id)%> - <%= tag[I18n.locale] %> - <% end %> -
+
+
+ <% @tags.each do |tag| %> + + <% end %> +
+
\ No newline at end of file From 55c0c95e14807a542013bb1ec074eb762f486a18 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Wed, 25 Apr 2012 17:17:04 +0800 Subject: [PATCH 08/28] Remove unless sidebar links. --- app/views/admin/ad_banners/_ad_banner_tab.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admin/ad_banners/_ad_banner_tab.html.erb b/app/views/admin/ad_banners/_ad_banner_tab.html.erb index 79dc647c..08404815 100644 --- a/app/views/admin/ad_banners/_ad_banner_tab.html.erb +++ b/app/views/admin/ad_banners/_ad_banner_tab.html.erb @@ -1,4 +1,4 @@ -
" id=<%= ad_banner_tab.title %>> +
" id=<%= ad_banner_tab.title.dehumanize %>>

<%= t("admin.ad.banner_best_size") %>：

<%= form_for ad_banner_tab,:url=> admin_ad_banner_path(ad_banner_tab),:method => :put,:class=>"input-medium" do |f| -%> From 7a42ef9193e482ca6beb45763406b3bb7652287a Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Wed, 25 Apr 2012 17:17:42 +0800 Subject: [PATCH 09/28] dehumanize ad banner --- app/views/admin/ad_banners/index.html.erb | 2 +- app/views/layouts/_side_bar.html.erb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/admin/ad_banners/index.html.erb b/app/views/admin/ad_banners/index.html.erb index 8307885a..9a5d438b 100644 --- a/app/views/admin/ad_banners/index.html.erb +++ b/app/views/admin/ad_banners/index.html.erb @@ -10,7 +10,7 @@
    <% @ad_banners.each do |ab| %> - <%= content_tag :li,link_to(ab.title,"##{ab.title}",:data=>{:toggle=>"tab"}),:class => (ab == @active ? 'active' : nil ) %> + <%= content_tag :li,link_to(ab.title,"##{ab.title.dehumanize}",:data=>{:toggle=>"tab"}),:class => (ab == @active ? 'active' : nil ) %> <% end -%> <%= content_tag :li,link_to(t("admin.ad.new_banner"),"#new-a-banner",:data=>{:toggle=>"tab"}),:id=>'new_ad_banner_tab_but',:class => (@active.nil? ? 'active' : nil ) %> diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb index e740fe7b..51a35bf9 100644 --- a/app/views/layouts/_side_bar.html.erb +++ b/app/views/layouts/_side_bar.html.erb @@ -33,8 +33,8 @@ <%= 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 :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') %> + <%#= 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 %> From 0fcafc2418690b547d0f88bb851186c9cc1cadd0 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Wed, 25 Apr 2012 18:03:30 +0800 Subject: [PATCH 10/28] Fix ad_banner sec and msec --- app/views/admin/ad_banners/_modal_preview.html.erb | 2 +- app/views/admin/ad_banners/_preview_block.html.erb | 2 +- app/views/admin/ad_images/_form.html.erb | 2 +- lib/parsers/parser_common.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/admin/ad_banners/_modal_preview.html.erb b/app/views/admin/ad_banners/_modal_preview.html.erb index a79dc56e..ffc84107 100644 --- a/app/views/admin/ad_banners/_modal_preview.html.erb +++ b/app/views/admin/ad_banners/_modal_preview.html.erb @@ -8,7 +8,7 @@

    <% preview_block_ad_images_helper(ad_banner).each do |ad_image| -%> - <%= image_tag ad_image.file,:alt => (ad_image.title[locale] || " "),:time_to_next => ad_banner.transition_sec,:link_open=> ad_image.link_open, :link_url =>((ad_image.out_link || ad_banner.context || " ")) %> + <%= image_tag ad_image.file,:alt => (ad_image.title[locale] || " "),:time_to_next => ad_banner.transition_msec,:link_open=> ad_image.link_open, :link_url =>((ad_image.out_link || ad_banner.context || " ")) %> <% end -%>

    diff --git a/app/views/admin/ad_banners/_preview_block.html.erb b/app/views/admin/ad_banners/_preview_block.html.erb index f71b3cd3..47646f6f 100644 --- a/app/views/admin/ad_banners/_preview_block.html.erb +++ b/app/views/admin/ad_banners/_preview_block.html.erb @@ -9,7 +9,7 @@

    <% preview_block_ad_images_helper(ad_banner).each do |ad_image| -%> - <%= image_tag ad_image.file,:alt => (ad_image.title[locale] || ' '),:time_to_next => ad_banner.transition_sec,:link_open=> ad_image.link_open, :link_url =>((ad_image.out_link || ad_banner.context || ' ')) %> + <%= image_tag ad_image.file,:alt => (ad_image.title[locale] || ' '),:time_to_next => ad_banner.transition_msec,:link_open=> ad_image.link_open, :link_url =>((ad_image.out_link || ad_banner.context || ' ')) %> <% end -%>

    diff --git a/app/views/admin/ad_images/_form.html.erb b/app/views/admin/ad_images/_form.html.erb index ea30634c..3fe1bec4 100644 --- a/app/views/admin/ad_images/_form.html.erb +++ b/app/views/admin/ad_images/_form.html.erb @@ -157,7 +157,7 @@
- <%= link_to t("modal.preview"), admin_realtime_preview_ad_banner_path(@ad_image.ad_banner.title) ,:class=>"preview_trigger btn btn-success" rescue nil%> + <%#= link_to t("modal.preview"), admin_realtime_preview_ad_banner_path(@ad_image.ad_banner.title) ,:class=>"preview_trigger btn btn-success" rescue nil%> <%= f.submit t("submit"),:class=>"btn btn-primary" %> <%= f.submit t("cancel"),:class=>"btn ",:type => 'reset' %>
diff --git a/lib/parsers/parser_common.rb b/lib/parsers/parser_common.rb index 403c05e4..f60c4a51 100644 --- a/lib/parsers/parser_common.rb +++ b/lib/parsers/parser_common.rb @@ -66,7 +66,7 @@ module ParserCommon printable_ad_images.each do |ad_image| #TODO Need Reflact res << " Date: Wed, 25 Apr 2012 18:17:58 +0800 Subject: [PATCH 11/28] Fix for structure: restore js and change manifests --- app/assets/javascripts/side_bar_history.js | 42 +++++++++++----------- app/assets/javascripts/site_editor.js | 7 ++-- app/assets/stylesheets/site_editor.css.erb | 4 +-- app/views/layouts/site_editor.html.erb | 37 ++++++++++--------- 4 files changed, 42 insertions(+), 48 deletions(-) diff --git a/app/assets/javascripts/side_bar_history.js b/app/assets/javascripts/side_bar_history.js index 4b5da1d4..ad29b497 100644 --- a/app/assets/javascripts/side_bar_history.js +++ b/app/assets/javascripts/side_bar_history.js @@ -1,28 +1,28 @@ var history_edited = false; -// $('#back_sidebar a, #back_main a.nav').live('click', -// function () { -// $.getScript(this.href); -// history.pushState(null, document.title, this.href); -// history_edited = true; -// return false; -// } -// ); +$('#back_sidebar a, #back_main a.nav').live('click', + function () { + $.getScript(this.href); + history.pushState(null, document.title, this.href); + history_edited = true; + return false; + } +); -// $('#back_main a.reload').live('click', -// function () { -// $.getScript(this.href); -// history.replaceState(null, document.title, this.href); -// history_edited = true; -// return false; -// } -// ); +$('#back_main a.reload').live('click', + function () { + $.getScript(this.href); + history.replaceState(null, document.title, this.href); + history_edited = true; + return false; + } +); -// $('.form').live('submit', function () { -// $.post(this.action, $(this).serialize(), null, 'script'); -// history_edited = true; -// return false; -// }); +$('#back_main .form').live('submit', function () { + $.post(this.action, $(this).serialize(), null, 'script'); + history_edited = true; + return false; +}); $(document).on('click', '.js_history', function () { diff --git a/app/assets/javascripts/site_editor.js b/app/assets/javascripts/site_editor.js index 1eb5e3f1..4c22acbd 100644 --- a/app/assets/javascripts/site_editor.js +++ b/app/assets/javascripts/site_editor.js @@ -4,8 +4,5 @@ // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the // the compiled file. // -//= require jquery -//= require jquery_ujs -//= require page_edit -//= require side_bar_history -//= require new_admin \ No newline at end of file +//= require new_admin +//= require page_edit \ No newline at end of file diff --git a/app/assets/stylesheets/site_editor.css.erb b/app/assets/stylesheets/site_editor.css.erb index 1e16ea3f..fa439d09 100644 --- a/app/assets/stylesheets/site_editor.css.erb +++ b/app/assets/stylesheets/site_editor.css.erb @@ -2,9 +2,7 @@ *This is a manifest file that'll automatically include all the stylesheets available in this directory *and any sub-directories. You're free to add application-wide styles to this file and they'll appear at *the top of the compiled file, but it's generally better to create a new file per style scope. - *= require reset - *= require_self - *= require message + *= require new_admin *= require site_items *= require sidebar */ \ No newline at end of file diff --git a/app/views/layouts/site_editor.html.erb b/app/views/layouts/site_editor.html.erb index e5ed9bb9..158c9f80 100644 --- a/app/views/layouts/site_editor.html.erb +++ b/app/views/layouts/site_editor.html.erb @@ -9,31 +9,30 @@ <%= stylesheet_link_tag "site_editor" %> <%= javascript_include_tag "site_editor" %> - <%= yield :page_specific_css %> - <%= yield :page_specific_javascript %> <%= csrf_meta_tag %> - +
+
+
    + <%= yield :sidebar %> +
+
+
+
-
<%= yield :sidebar %>
-
+
<%= yield %> -
-
<%= yield :tertiary %>
- +
- From 6f1eb97ace60caa97c2563818c919b53e20921eb Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Wed, 25 Apr 2012 18:41:38 +0800 Subject: [PATCH 12/28] Fix for structure js and css --- app/assets/javascripts/site_editor.js | 9 ++++++++- app/assets/stylesheets/site_editor.css.erb | 8 +++++++- app/helpers/application_helper.rb | 7 ------- app/views/admin/pages/show.html.erb | 4 ---- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/app/assets/javascripts/site_editor.js b/app/assets/javascripts/site_editor.js index 4c22acbd..4451accb 100644 --- a/app/assets/javascripts/site_editor.js +++ b/app/assets/javascripts/site_editor.js @@ -4,5 +4,12 @@ // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the // the compiled file. // -//= require new_admin +//= require jquery +//= require jquery_ujs +//= require bootstrap +//= require jquery.isotope.min +//= require jquery.tinyscrollbar.min +//= require orbit-1.0 +//= require orbit-bar-search +//= require side_bar_history //= require page_edit \ No newline at end of file diff --git a/app/assets/stylesheets/site_editor.css.erb b/app/assets/stylesheets/site_editor.css.erb index fa439d09..e36d0b7b 100644 --- a/app/assets/stylesheets/site_editor.css.erb +++ b/app/assets/stylesheets/site_editor.css.erb @@ -2,7 +2,13 @@ *This is a manifest file that'll automatically include all the stylesheets available in this directory *and any sub-directories. You're free to add application-wide styles to this file and they'll appear at *the top of the compiled file, but it's generally better to create a new file per style scope. - *= require new_admin + *= require reset + *= require_self + *= require message + *= require bootstrap + *= require style + *= require bootstrap-orbit + *= require scroll_style *= require site_items *= require sidebar */ \ No newline at end of file diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 7337b274..b1d190ec 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -138,15 +138,8 @@ module ApplicationHelper def page_javascripts(page) javascripts = '' - javascripts << "\n" javascripts << "\n" javascripts << "\n" - javascripts << "\n" - javascripts << "\n" - javascripts << "\n" - javascripts << "\n" - javascripts << "\n" - javascripts << "\n" javascripts << "\n" page.design.javascripts.each do |js| # javascripts << "" diff --git a/app/views/admin/pages/show.html.erb b/app/views/admin/pages/show.html.erb index d6b6a8a2..3e1160c7 100644 --- a/app/views/admin/pages/show.html.erb +++ b/app/views/admin/pages/show.html.erb @@ -1,5 +1 @@ -<% content_for :sidebar do %> - <%= render 'admin/items/site_map_left_bar' %> -<% end -%> - <%= render 'show' %> \ No newline at end of file From 6bf4c60d458104de36c0ba3805508014b2f506cf Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Thu, 26 Apr 2012 01:49:02 +0800 Subject: [PATCH 13/28] Changes for js and ccs load for site's pages --- app/helpers/application_helper.rb | 23 +++++++++++++++++------ app/views/admin/pages/_show.html.erb | 4 ++-- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index b1d190ec..52ad71c0 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -124,11 +124,13 @@ module ApplicationHelper "#{page.title ? page.title[I18n.locale] : page.i18n_variable[I18n.locale]}\n" end - def page_stylesheets(page) + def page_stylesheets(page, edit=nil) stylesheets = '' - stylesheets << "\n" - stylesheets << "\n" - stylesheets << "\n" + unless edit + stylesheets << "\n" + stylesheets << "\n" + stylesheets << "\n" + end stylesheets << "\n" if page.design.reset_css stylesheets << "\n" if page.design.default_css theme = page.design.themes.detect{ |d| d.id == page.theme_id } @@ -136,9 +138,18 @@ module ApplicationHelper stylesheets end - def page_javascripts(page) + def page_javascripts(page, edit=nil) javascripts = '' - javascripts << "\n" + unless edit + javascripts << "\n" + javascripts << "\n" + javascripts << "\n" + javascripts << "\n" + javascripts << "\n" + javascripts << "\n" + javascripts << "\n" + javascripts << "\n" + end javascripts << "\n" javascripts << "\n" page.design.javascripts.each do |js| diff --git a/app/views/admin/pages/_show.html.erb b/app/views/admin/pages/_show.html.erb index ba9bcf48..29d532fb 100644 --- a/app/views/admin/pages/_show.html.erb +++ b/app/views/admin/pages/_show.html.erb @@ -1,7 +1,7 @@ <%= flash_messages %> -<%= page_stylesheets(@item).html_safe %> -<%= page_javascripts(@item).html_safe %> +<%= page_stylesheets(@item, true).html_safe %> +<%= page_javascripts(@item, true).html_safe %> <%= parse_page_edit_noko(@item).html_safe %> \ No newline at end of file From 3d293f64199d5130c154d46beef750fa2cf40acc Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Thu, 26 Apr 2012 16:42:28 +0800 Subject: [PATCH 14/28] Fix for quick edit file and link in announcement Change submit_button into ajax_for_submit --- app/assets/javascripts/ajax_form.js | 2 +- app/assets/javascripts/bulletin_form.js.erb | 5 ++- app/assets/javascripts/new_admin.js | 4 ++- app/views/admin/assets/_edit.html.erb | 2 +- app/views/admin/assets/_new.html.erb | 2 +- .../bulletins/_bulletin_file_qe.html.erb | 8 ++--- .../bulletins/_list_bulletin_file.html.erb | 29 ++++++++-------- .../bulletins/_list_bulletin_link.html.erb | 34 ++++++++----------- .../bulletins/_quick_edit_files.html.erb | 2 +- .../back_end/bulletins/index.html.erb | 6 ++++ 10 files changed, 49 insertions(+), 45 deletions(-) diff --git a/app/assets/javascripts/ajax_form.js b/app/assets/javascripts/ajax_form.js index c026e518..d9b5abfe 100644 --- a/app/assets/javascripts/ajax_form.js +++ b/app/assets/javascripts/ajax_form.js @@ -1,4 +1,4 @@ -$('#submit_button').live('click', function(){ +$(document).on('click', '#ajax_form_submit', function(){ $('#ajaxForm').ajaxSubmit({ beforeSubmit: function(a,f,o) { o.dataType = 'script'; diff --git a/app/assets/javascripts/bulletin_form.js.erb b/app/assets/javascripts/bulletin_form.js.erb index abb908b4..01685c3d 100644 --- a/app/assets/javascripts/bulletin_form.js.erb +++ b/app/assets/javascripts/bulletin_form.js.erb @@ -6,10 +6,9 @@ $('.bulletin_files_block a.delete').live('click', function(){ $(this).parents('.list_item').remove(); }); -$('.action a.remove_existing_record').live('click', function(){ +$(document).on('click', '.action a.remove_existing_record', function(){ $(this).next('.should_destroy').attr('value', 1); - //$("#bulletin_" + $(this).prev().attr('value')).hide(); - $("tr#bulletin_" + $(this).prev().attr('value')).hide(); + $("tr #" + $(this).prev().attr('value')).hide(); }); $('.quick_edit_cancel').live('click', function(){ diff --git a/app/assets/javascripts/new_admin.js b/app/assets/javascripts/new_admin.js index 45bfcbbc..f20267cd 100644 --- a/app/assets/javascripts/new_admin.js +++ b/app/assets/javascripts/new_admin.js @@ -6,6 +6,7 @@ // //= require jquery //= require jquery_ujs +//= require jquery.form //= require bootstrap //= require jquery.isotope.min //= require jquery.tinyscrollbar.min @@ -13,4 +14,5 @@ //= require tinymce-jquery //= require tinymce_orbit //= require orbit-bar-search -//= require side_bar_history \ No newline at end of file +//= require side_bar_history +//= require ajax_form \ No newline at end of file diff --git a/app/views/admin/assets/_edit.html.erb b/app/views/admin/assets/_edit.html.erb index 33f8131c..a747d4f2 100644 --- a/app/views/admin/assets/_edit.html.erb +++ b/app/views/admin/assets/_edit.html.erb @@ -9,7 +9,7 @@ <%= link_back %> <%= f.submit t(:edit) %> <% else %> - <%= t(:edit) %> + <%= t(:edit) %> <% end %>
<% end %> diff --git a/app/views/admin/assets/_new.html.erb b/app/views/admin/assets/_new.html.erb index 49e638c8..85d3c2e5 100644 --- a/app/views/admin/assets/_new.html.erb +++ b/app/views/admin/assets/_new.html.erb @@ -9,7 +9,7 @@ <%= link_back %> <%= f.submit t(:create) %> <% else %> - <%= t(:create) %> + <%= t(:create) %> <% end %>
<% end %> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_file_qe.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_file_qe.html.erb index 4e47024c..23229b5d 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_file_qe.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_file_qe.html.erb @@ -1,6 +1,6 @@ <% # encoding: utf-8 %> - <%= form_for(@bulletin_file, :remote => true, :url => @file_url) do |f| %> + <%= form_for @bulletin_file, :url => @file_url, :html => {:id => 'ajaxForm', :multipart => true} do |f| %>
× @@ -38,9 +38,9 @@
- <%= hidden_field_tag 'bulletin_file[bulletin_id]', @bulletin_file.bulletin_id %> - <%= f.submit t('submit'), :class=>'btn btn-primary' %> - <%= t('cancel')%> + <%= hidden_field_tag 'bulletin_file[bulletin_id]', @bulletin_file.bulletin_id %> + <%= t('submit')%> + <%= t('cancel')%>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_list_bulletin_file.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_list_bulletin_file.html.erb index c884d0ad..f340b00f 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_list_bulletin_file.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_list_bulletin_file.html.erb @@ -1,18 +1,19 @@ - - <%= list_bulletin_file.file.file ? ( link_to list_bulletin_file.filetitle.zh_tw, list_bulletin_file.file.url, {:target => '_blank', :title => list_bulletin_file.description.zh_tw} ) : list_bulletin_file.filetitle.zh_tw %> - <%= list_bulletin_file.file.file ? ( link_to list_bulletin_file.filetitle.en, list_bulletin_file.file.url, {:target => '_blank', :title => list_bulletin_file.description.en} ) : list_bulletin_file.filetitle.en %> - - - - <%= fields_for "bulletin[bulletin_files_attributes][]", list_bulletin_file, :index => list_bulletin_file_counter do |f| %> - <%= f.hidden_field :id %> - - <%= f.hidden_field :should_destroy, :value => nil , :class => 'should_destroy' %> - <% end %> - - - + + <%= list_bulletin_file.file.file ? ( link_to list_bulletin_file.filetitle.zh_tw, list_bulletin_file.file.url, {:target => '_blank', :title => list_bulletin_file.description.zh_tw} ) : list_bulletin_file.filetitle.zh_tw %> + <%= list_bulletin_file.file.file ? ( link_to list_bulletin_file.filetitle.en, list_bulletin_file.file.url, {:target => '_blank', :title => list_bulletin_file.description.en} ) : list_bulletin_file.filetitle.en %> + + + + <%= fields_for "bulletin[bulletin_files_attributes][]", list_bulletin_file, :index => list_bulletin_file_counter do |f| %> + <%= f.hidden_field :id %> + <%= hidden_field_tag :tr, (dom_id list_bulletin_file) %> + + <%= f.hidden_field :_destroy, :value => nil , :class => 'should_destroy' %> + <% end %> + + + diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_list_bulletin_link.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_list_bulletin_link.html.erb index 33cb9498..462d357b 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_list_bulletin_link.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_list_bulletin_link.html.erb @@ -1,19 +1,15 @@ - - - <%= link_to list_bulletin_link.i18n_variable.zh_tw, list_bulletin_link.url, :target => '_blank' %> - <%= link_to list_bulletin_link.i18n_variable.en, list_bulletin_link.url, :target => '_blank' %> - - - - <%= fields_for "bulletin[bulletin_links_attributes][]", list_bulletin_link, :index => list_bulletin_link_counter do |f| %> - <%= f.hidden_field :id %> - - <%= f.hidden_field :should_destroy, :value => nil , :class => 'should_destroy' %> - <% end %> - - - - - - - \ No newline at end of file + + <%= link_to list_bulletin_link.i18n_variable.zh_tw, list_bulletin_link.url, :target => '_blank' %> + <%= link_to list_bulletin_link.i18n_variable.en, list_bulletin_link.url, :target => '_blank' %> + + + + <%= fields_for "bulletin[bulletin_links_attributes][]", list_bulletin_link, :index => list_bulletin_link_counter do |f| %> + <%= f.hidden_field :id %> + <%= hidden_field_tag :tr, (dom_id list_bulletin_link) %> + + <%= f.hidden_field :_destroy, :value => nil, :class => 'should_destroy' %> + <% end %> + + + diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_files.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_files.html.erb index 8360ad42..8daa6a26 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_files.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_files.html.erb @@ -1,7 +1,7 @@
- +
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 78532f00..89872e5e 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 @@ -14,6 +14,12 @@ <%= 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' %> From 9a5ce5f5125b8dae31e790e2fc04a8939ab1174f Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Wed, 25 Apr 2012 17:17:04 +0800 Subject: [PATCH 15/28] Remove unless sidebar links. --- app/views/admin/ad_banners/_ad_banner_tab.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admin/ad_banners/_ad_banner_tab.html.erb b/app/views/admin/ad_banners/_ad_banner_tab.html.erb index 76c55376..d2149f81 100644 --- a/app/views/admin/ad_banners/_ad_banner_tab.html.erb +++ b/app/views/admin/ad_banners/_ad_banner_tab.html.erb @@ -1,4 +1,4 @@ -
" id=<%= ad_banner_tab.title %>> +
" id=<%= ad_banner_tab.title.dehumanize %>> <%= form_for ad_banner_tab,:url=> admin_ad_banner_path(ad_banner_tab),:method => :put,:class=>"input-medium" do |f| -%>
From faace9893a20ea3a3f5d2d8bd20d767f95622f7d Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Wed, 25 Apr 2012 17:17:42 +0800 Subject: [PATCH 16/28] dehumanize ad banner --- app/views/admin/ad_banners/index.html.erb | 2 +- app/views/layouts/_side_bar.html.erb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/admin/ad_banners/index.html.erb b/app/views/admin/ad_banners/index.html.erb index 8307885a..9a5d438b 100644 --- a/app/views/admin/ad_banners/index.html.erb +++ b/app/views/admin/ad_banners/index.html.erb @@ -10,7 +10,7 @@
    <% @ad_banners.each do |ab| %> - <%= content_tag :li,link_to(ab.title,"##{ab.title}",:data=>{:toggle=>"tab"}),:class => (ab == @active ? 'active' : nil ) %> + <%= content_tag :li,link_to(ab.title,"##{ab.title.dehumanize}",:data=>{:toggle=>"tab"}),:class => (ab == @active ? 'active' : nil ) %> <% end -%> <%= content_tag :li,link_to(t("admin.ad.new_banner"),"#new-a-banner",:data=>{:toggle=>"tab"}),:id=>'new_ad_banner_tab_but',:class => (@active.nil? ? 'active' : nil ) %> diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb index e740fe7b..51a35bf9 100644 --- a/app/views/layouts/_side_bar.html.erb +++ b/app/views/layouts/_side_bar.html.erb @@ -33,8 +33,8 @@ <%= 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 :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') %> + <%#= 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 %> From 4af2068c1f2734df57f9723c4e92a86d69037677 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Wed, 25 Apr 2012 18:03:30 +0800 Subject: [PATCH 17/28] Fix ad_banner sec and msec --- app/views/admin/ad_banners/_modal_preview.html.erb | 2 +- app/views/admin/ad_banners/_preview_block.html.erb | 2 +- app/views/admin/ad_images/_form.html.erb | 2 +- lib/parsers/parser_common.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/admin/ad_banners/_modal_preview.html.erb b/app/views/admin/ad_banners/_modal_preview.html.erb index a79dc56e..ffc84107 100644 --- a/app/views/admin/ad_banners/_modal_preview.html.erb +++ b/app/views/admin/ad_banners/_modal_preview.html.erb @@ -8,7 +8,7 @@

    <% preview_block_ad_images_helper(ad_banner).each do |ad_image| -%> - <%= image_tag ad_image.file,:alt => (ad_image.title[locale] || " "),:time_to_next => ad_banner.transition_sec,:link_open=> ad_image.link_open, :link_url =>((ad_image.out_link || ad_banner.context || " ")) %> + <%= image_tag ad_image.file,:alt => (ad_image.title[locale] || " "),:time_to_next => ad_banner.transition_msec,:link_open=> ad_image.link_open, :link_url =>((ad_image.out_link || ad_banner.context || " ")) %> <% end -%>

    diff --git a/app/views/admin/ad_banners/_preview_block.html.erb b/app/views/admin/ad_banners/_preview_block.html.erb index f71b3cd3..47646f6f 100644 --- a/app/views/admin/ad_banners/_preview_block.html.erb +++ b/app/views/admin/ad_banners/_preview_block.html.erb @@ -9,7 +9,7 @@

    <% preview_block_ad_images_helper(ad_banner).each do |ad_image| -%> - <%= image_tag ad_image.file,:alt => (ad_image.title[locale] || ' '),:time_to_next => ad_banner.transition_sec,:link_open=> ad_image.link_open, :link_url =>((ad_image.out_link || ad_banner.context || ' ')) %> + <%= image_tag ad_image.file,:alt => (ad_image.title[locale] || ' '),:time_to_next => ad_banner.transition_msec,:link_open=> ad_image.link_open, :link_url =>((ad_image.out_link || ad_banner.context || ' ')) %> <% end -%>

    diff --git a/app/views/admin/ad_images/_form.html.erb b/app/views/admin/ad_images/_form.html.erb index 6324675e..cd04b4fe 100644 --- a/app/views/admin/ad_images/_form.html.erb +++ b/app/views/admin/ad_images/_form.html.erb @@ -157,7 +157,7 @@
- <%= link_to t("modal.preview"), admin_realtime_preview_ad_banner_path(@ad_image.ad_banner.title) ,:class=>"preview_trigger btn btn-success" rescue nil%> + <%#= link_to t("modal.preview"), admin_realtime_preview_ad_banner_path(@ad_image.ad_banner.title) ,:class=>"preview_trigger btn btn-success" rescue nil%> <%= f.submit t("submit"),:class=>"btn btn-primary" %> <%= f.submit t("cancel"),:class=>"btn ",:type => 'reset' %>
diff --git a/lib/parsers/parser_common.rb b/lib/parsers/parser_common.rb index 403c05e4..f60c4a51 100644 --- a/lib/parsers/parser_common.rb +++ b/lib/parsers/parser_common.rb @@ -66,7 +66,7 @@ module ParserCommon printable_ad_images.each do |ad_image| #TODO Need Reflact res << " Date: Fri, 27 Apr 2012 11:02:56 +0800 Subject: [PATCH 18/28] Ray's changes for structure and web_links --- .../javascripts/jquery.tinyscrollbar.min.js | 119 +++- app/assets/stylesheets/sidebar.css.erb | 68 +- app/assets/stylesheets/style.css.erb | 10 +- app/helpers/admin/item_helper.rb | 10 +- app/helpers/application_helper.rb | 2 +- .../admin/ad_banners/_ad_banner_tab.html.erb | 2 +- .../admin/items/_site_map_left_bar.html.erb | 4 +- app/views/devise/sessions/new.html.erb | 2 +- app/views/layouts/_orbit_bar.html.erb | 8 +- config/locales/en.yml | 1 + config/locales/zh_tw.yml | 1 + lib/parsers/parser_common.rb | 1 + public/static/Other.xml | 662 +++++++++++++++--- .../bulletins/_form_bulletin_file.html.erb | 2 +- .../bulletins/_quick_edit_tags.html.erb | 34 - .../web_link_categorys/index.html.erb | 20 +- .../back_end/web_links/_web_links.html.erb | 14 +- .../back_end/web_links/index.html.erb | 25 +- 18 files changed, 803 insertions(+), 182 deletions(-) diff --git a/app/assets/javascripts/jquery.tinyscrollbar.min.js b/app/assets/javascripts/jquery.tinyscrollbar.min.js index 98786a77..e385ff8e 100644 --- a/app/assets/javascripts/jquery.tinyscrollbar.min.js +++ b/app/assets/javascripts/jquery.tinyscrollbar.min.js @@ -1 +1,118 @@ -(function(a){function b(b,c){function w(a){if(!(g.ratio>=1)){o.now=Math.min(i[c.axis]-j[c.axis],Math.max(0,o.start+((k?a.pageX:a.pageY)-p.start)));n=o.now*h.ratio;g.obj.css(l,-n);j.obj.css(l,o.now)}return false}function v(b){a(document).unbind("mousemove",w);a(document).unbind("mouseup",v);j.obj.unbind("mouseup",v);document.ontouchmove=j.obj[0].ontouchend=document.ontouchend=null;return false}function u(b){if(!(g.ratio>=1)){var b=b||window.event;var d=b.wheelDelta?b.wheelDelta/120:-b.detail/3;n-=d*c.wheel;n=Math.min(g[c.axis]-f[c.axis],Math.max(0,n));j.obj.css(l,n/h.ratio);g.obj.css(l,-n);b=a.event.fix(b);b.preventDefault()}}function t(b){p.start=k?b.pageX:b.pageY;var c=parseInt(j.obj.css(l));o.start=c=="auto"?0:c;a(document).bind("mousemove",w);document.ontouchmove=function(b){a(document).unbind("mousemove");w(b.touches[0])};a(document).bind("mouseup",v);j.obj.bind("mouseup",v);j.obj[0].ontouchend=document.ontouchend=function(b){a(document).unbind("mouseup");j.obj.unbind("mouseup");v(b.touches[0])};return false}function s(){j.obj.bind("mousedown",t);j.obj[0].ontouchstart=function(a){a.preventDefault();j.obj.unbind("mousedown");t(a.touches[0]);return false};i.obj.bind("mouseup",w);if(c.scroll&&this.addEventListener){e[0].addEventListener("DOMMouseScroll",u,false);e[0].addEventListener("mousewheel",u,false)}else if(c.scroll){e[0].onmousewheel=u}}function r(){j.obj.css(l,n/h.ratio);g.obj.css(l,-n);p["start"]=j.obj.offset()[l];var a=m.toLowerCase();h.obj.css(a,i[c.axis]);i.obj.css(a,i[c.axis]);j.obj.css(a,j[c.axis])}function q(){d.update();s();return d}var d=this;var e=b;var f={obj:a(".viewport",b)};var g={obj:a(".overview",b)};var h={obj:a(".scrollbar",b)};var i={obj:a(".track",h.obj)};var j={obj:a(".thumb",h.obj)};var k=c.axis=="x",l=k?"left":"top",m=k?"Width":"Height";var n,o={start:0,now:0},p={};this.update=function(a){f[c.axis]=f.obj[0]["offset"+m];g[c.axis]=g.obj[0]["scroll"+m];g.ratio=f[c.axis]/g[c.axis];h.obj.toggleClass("disable",g.ratio>=1);i[c.axis]=c.size=="auto"?f[c.axis]:c.size;j[c.axis]=Math.min(i[c.axis],Math.max(0,c.sizethumb=="auto"?i[c.axis]*g.ratio:c.sizethumb));h.ratio=c.sizethumb=="auto"?g[c.axis]/i[c.axis]:(g[c.axis]-f[c.axis])/(i[c.axis]-j[c.axis]);n=a=="relative"&&g.ratio<=1?Math.min(g[c.axis]-f[c.axis],Math.max(0,n)):0;n=a=="bottom"&&g.ratio<=1?g[c.axis]-f[c.axis]:isNaN(parseInt(a))?n:parseInt(a);r()};return q()}a.tiny=a.tiny||{};a.tiny.scrollbar={options:{axis:"y",wheel:40,scroll:true,size:"auto",sizethumb:"auto"}};a.fn.tinyscrollbar=function(c){var c=a.extend({},a.tiny.scrollbar.options,c);this.each(function(){a(this).data("tsb",new b(a(this),c))});return this};a.fn.tinyscrollbar_update=function(b){return a(this).data("tsb").update(b)};})(jQuery) \ No newline at end of file +(function(a){ + function b(b,c){ + function w(a){ + if(!(g.ratio>=1)){ + o.now=Math.min(i[c.axis]-j[c.axis],Math.max(0,o.start+((k?a.pageX:a.pageY)-p.start))); + n=o.now*h.ratio;g.obj.css(l,-n); + j.obj.css(l,o.now) + } + return false + } + function v(b){ + a(document).unbind("mousemove",w); + a(document).unbind("mouseup",v); + j.obj.unbind("mouseup",v); + document.ontouchmove=j.obj[0].ontouchend=document.ontouchend=null; + return false + } + function u(b){ + if(!(g.ratio>=1)){ + var b=b||window.event; + var d=b.wheelDelta?b.wheelDelta/120:-b.detail/3; + n-=d*c.wheel; + n=Math.min(g[c.axis]-f[c.axis],Math.max(0,n)); + j.obj.css(l,n/h.ratio); + g.obj.css(l,-n); + b=a.event.fix(b); + b.preventDefault() + } + } + function t(b){ + p.start=k?b.pageX:b.pageY; + var c=parseInt(j.obj.css(l)); + o.start=c=="auto"?0:c; + a(document).bind("mousemove",w); + document.ontouchmove=function(b){ + a(document).unbind("mousemove"); + w(b.touches[0]) + }; + a(document).bind("mouseup",v); + j.obj.bind("mouseup",v); + j.obj[0].ontouchend=document.ontouchend=function(b){ + a(document).unbind("mouseup"); + j.obj.unbind("mouseup"); + v(b.touches[0]) + }; + return false + } + function s(){ + j.obj.bind("mousedown",t); + j.obj[0].ontouchstart=function(a){ + a.preventDefault(); + j.obj.unbind("mousedown"); + t(a.touches[0]); + return false + }; + i.obj.bind("mouseup",w); + if(c.scroll&&this.addEventListener){ + e[0].addEventListener("DOMMouseScroll",u,false); + e[0].addEventListener("mousewheel",u,false) + }else if(c.scroll){ + e[0].onmousewheel=u + } + } + function r(){ + j.obj.css(l,n/h.ratio); + g.obj.css(l,-n); + p["start"]=j.obj.offset()[l]; + var a=m.toLowerCase(); + h.obj.css(a,i[c.axis]); + i.obj.css(a,i[c.axis]); + j.obj.css(a,j[c.axis]) + } + function q(){ + d.update(); + s(); + return d + } + var d=this; + var e=b; + var f={obj:a(".viewport",b)}; + var g={obj:a(".overview",b)}; + var h={obj:a(".scrollbar",b)}; + var i={obj:a(".track",h.obj)}; + var j={obj:a(".thumb",h.obj)}; + var k=c.axis=="x", + l=k?"left":"top", + m=k?"Width":"Height"; + var n, + o={start:0,now:0}, + p={}; + this.update=function(a){ + f[c.axis]=f.obj[0]["offset"+m]; + g[c.axis]=g.obj[0]["scroll"+m]; + g.ratio=f[c.axis]/g[c.axis]; + h.obj.toggleClass("disable",g.ratio>=1); + i[c.axis]=c.size=="auto"?f[c.axis]:c.size; + j[c.axis]=Math.min(i[c.axis],Math.max(0,c.sizethumb=="auto"?i[c.axis]*g.ratio:c.sizethumb)); + h.ratio=c.sizethumb=="auto"?g[c.axis]/i[c.axis]:(g[c.axis]-f[c.axis])/(i[c.axis]-j[c.axis]); + n=a=="relative"&&g.ratio<=1?Math.min(g[c.axis]-f[c.axis],Math.max(0,n)):0; + n=a=="bottom"&&g.ratio<=1?g[c.axis]-f[c.axis]:isNaN(parseInt(a))?n:parseInt(a); + r() + }; + return q() + } + a.tiny=a.tiny||{}; + a.tiny.scrollbar={options:{axis:"y",wheel:40,scroll:true,size:"auto",sizethumb:"auto"}}; + a.fn.tinyscrollbar=function(c){ + var c=a.extend({},a.tiny.scrollbar.options,c); + this.each(function(){ + a(this).data("tsb",new b(a(this),c)) + }); + return this + }; + a.fn.tinyscrollbar_update=function(b){ + return a(this).data("tsb").update(b) + }; +}) +(jQuery) \ No newline at end of file diff --git a/app/assets/stylesheets/sidebar.css.erb b/app/assets/stylesheets/sidebar.css.erb index 5554b25a..4231d0bf 100644 --- a/app/assets/stylesheets/sidebar.css.erb +++ b/app/assets/stylesheets/sidebar.css.erb @@ -1,12 +1,23 @@ /*sidebar*/ -#back_sidebar { - left: 0; - position: fixed; - top: 0; - width: 160px; +.nav-list { + padding: 0px 0px 100px 5px; } - +.nav-list li { + position: relative; +} +.nav-list ul { + margin-left: 10px; +} +.nav-list ul li { + padding: 5px 0; +} +.nav-list ul li a { + font-size: 13px; + padding: 3px 0px; + display: block; +} +/* #back_sidebar h1 { background: url(<%= asset_path "h1_bg.png" %>) repeat-x scroll left top transparent; border-bottom: 1px solid #1B1B1B; @@ -106,36 +117,35 @@ } #main-sidebar ul ul li a{ padding: 10px 0 10px 20px; +}*/ +.with_action:hover .hide { + display: block; } -#main-sidebar li:hover .quick-edit{ - display:block; -} -#main-sidebar .quick-edit{ +#main-sidebar .quick-edit { background: none repeat scroll 0 0 #FFFFFF; border: 1px solid #DDDDDD; border-radius: 5px 5px 5px 5px; - display: none; - margin:-3px 0 0 3px; - padding: 3px; + margin: 0 0 0 3px; + padding: 0; z-index:1; + position: absolute; + left: -3px; + width: 70px; } -#main-sidebar .quick-edit:after{ - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; -} -#main-sidebar .quick-edit a{ +#main-sidebar .quick-edit a { + display: block; + line-height: 22px; border-bottom: medium none; - border-radius: 5px 5px 5px 5px; font-size:12px; - float: left; - margin: 0 3px 0 0; - padding: 3px; + margin: 0; + padding: 3px 5px; } - -#main-sidebar .quick-edit a:hover{ - background: none repeat scroll 0 0 #EEEEEE; - border-bottom:none; +#main-sidebar .quick-edit a:first-child { + border-radius: 5px 5px 0px 0px; +} +#main-sidebar .quick-edit a:last-child { + border-radius: 0px 0px 5px 5px; +} +#main-sidebar .quick-edit a:hover { + background-color: #DDDDDD; } \ No newline at end of file diff --git a/app/assets/stylesheets/style.css.erb b/app/assets/stylesheets/style.css.erb index e832fa8a..8fdc3923 100644 --- a/app/assets/stylesheets/style.css.erb +++ b/app/assets/stylesheets/style.css.erb @@ -632,12 +632,10 @@ margin-right: 20px; } .adbanner-action { - position: absolute; - top: -32px; - right: 0; -} -#bulletin_link_qe form { - margin: 0; + margin-bottom: 20px; +} +#bulletin_link_qe form { + margin: 0; } [class^="icons-"] { display: inline-block; diff --git a/app/helpers/admin/item_helper.rb b/app/helpers/admin/item_helper.rb index c9715a71..d1025c55 100644 --- a/app/helpers/admin/item_helper.rb +++ b/app/helpers/admin/item_helper.rb @@ -9,18 +9,20 @@ module Admin::ItemHelper when 'Link' dest = admin_link_path(node) end - ret << "
    " + ret << "
      " unless node.parent.nil? ret << "
    • " + ret << "
      " ret << (link_to node.i18n_variable[I18n.locale], dest) - ret << "
      " + ret << "
      " ret << (link_to t('admin.edit'), eval("edit_admin_#{node._type.downcase}_path(node)")) if node._type.eql?('Page') ret << (link_to t('admin.new_page'), new_admin_page_path(:parent_id => node.id), :class => 'new_page') if node._type.eql?('Page') ret << (link_to t('admin.new_link'), new_admin_link_path(:parent_id => node.id), :class => 'new_link') if node._type.eql?('Page') ret << (link_to t(:delete), eval("delete_admin_#{node._type.downcase}_path(node, :authenticity_token => form_authenticity_token)"), :confirm => t('sure?'), :class => 'delete') ret << "
      " - ret << "
      • " + ret << "
" ret << render_children(node) - ret << "" + ret << "" + ret << "" unless node.parent.nil? end ret.html_safe end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 52ad71c0..258000be 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -142,7 +142,6 @@ module ApplicationHelper javascripts = '' unless edit javascripts << "\n" - javascripts << "\n" javascripts << "\n" javascripts << "\n" javascripts << "\n" @@ -150,6 +149,7 @@ module ApplicationHelper javascripts << "\n" javascripts << "\n" end + javascripts << "\n" javascripts << "\n" javascripts << "\n" page.design.javascripts.each do |js| diff --git a/app/views/admin/ad_banners/_ad_banner_tab.html.erb b/app/views/admin/ad_banners/_ad_banner_tab.html.erb index 76c55376..fa12572d 100644 --- a/app/views/admin/ad_banners/_ad_banner_tab.html.erb +++ b/app/views/admin/ad_banners/_ad_banner_tab.html.erb @@ -13,7 +13,7 @@

圖片列表

-
+
<%= link_to t("admin.ad.new_image"),new_admin_ad_banner_ad_image_path(ad_banner_tab) ,:class => "btn btn-primary"%> <%= link_to t("modal.preview"), admin_realtime_preview_ad_banner_path(ad_banner_tab.title) , :class=>'preview_trigger btn btn-success'%>
diff --git a/app/views/admin/items/_site_map_left_bar.html.erb b/app/views/admin/items/_site_map_left_bar.html.erb index b2a48a19..e82b4988 100644 --- a/app/views/admin/items/_site_map_left_bar.html.erb +++ b/app/views/admin/items/_site_map_left_bar.html.erb @@ -1,3 +1 @@ -
- <%= render_node_and_children(Item.first(:conditions => {:parent_id => nil})) %> -
\ No newline at end of file +<%= render_node_and_children(Item.first(:conditions => {:parent_id => nil})) %> \ No newline at end of file diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 96840bf5..8d9cbfb8 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -16,10 +16,10 @@ Please correct the error
- <%= link_to t(:forgot_password), new_user_password_path, :class => 'pull-right forgot' %> <%= f.label :password %> <%= f.password_field :password, :placeholder => t(:dots), :style => "width: 330px;" %> Please correct the error + <%= link_to t(:forgot_password), new_user_password_path, :class => 'pull-right forgot hide' %>
diff --git a/app/views/layouts/_orbit_bar.html.erb b/app/views/layouts/_orbit_bar.html.erb index 4017e24e..d8d0ae32 100644 --- a/app/views/layouts/_orbit_bar.html.erb +++ b/app/views/layouts/_orbit_bar.html.erb @@ -69,7 +69,7 @@ <%= t(:login) %>
    -
  • +
  • <%= form_for :user, :url => user_session_path do |f| %>
  • @@ -84,7 +84,7 @@ <%= f.password_field :password, :class => 'span2', :placeholder => t(:password), :size => 16 %>
-
  • +
  • <%= link_to t(:forgot_password), new_user_password_path, :class => 'forgot' %>
  • @@ -94,10 +94,10 @@ <%= t(:remember_me) %>
    • -
  • <%= t(:or_lower) %>
    • +
  • <%= t(:or_lower) %>
    • <% end %> - <%= link_to t(:register), new_user_registration_path, :class => 'btn btn-danger register' %> + <%#= link_to t(:register), new_user_registration_path, :class => 'btn btn-danger register' %> <% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 8564c364..f33b2598 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -38,6 +38,7 @@ en: submit: Submit sure?: Are you sure? update: Update + view: View yes_: "Yes" admin: diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index af36d7bc..753f41f1 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -35,6 +35,7 @@ zh_tw: submit: 送出 sure?: 您肯定嗎? update: 更新 + view: 檢視 yes_: "Yes" admin: diff --git a/lib/parsers/parser_common.rb b/lib/parsers/parser_common.rb index 403c05e4..a642d6f2 100644 --- a/lib/parsers/parser_common.rb +++ b/lib/parsers/parser_common.rb @@ -29,6 +29,7 @@ module ParserCommon res << '' end end + res end def menu_li(page, current, menu, i, edit) diff --git a/public/static/Other.xml b/public/static/Other.xml index 22c41bbb..859cfafc 100644 --- a/public/static/Other.xml +++ b/public/static/Other.xml @@ -5,140 +5,636 @@ 其他類別-最新活動zh-tw - 國立政治大學101學年度碩士班暨碩士在職專班招生考試 - + IEEE Computer Society與ACM資料庫教育訓練 + - + - 101/02/25-101/02/26 07:00-17:00 - - - 國立中正大學101學年度碩士班招生考試 - - - - - 101/03/10 07:00-17:00 - - - 「樂活飲食•健康之鑰」系列活動--膳食纖維的功用及食物來源 - - - - - 101/02/29 12:00-14:00 - - - 「樂活飲食•健康之鑰」系列活動-美味的代價與健康問題之探討 - - - - - 101/03/08 12:00-14:00 - - - 「樂活飲食•健康之鑰」系列活動--代謝症候群與檢康飲食 - - - - - 101/03/22 12:00-14:00 + 101/04/26 13:00-15:00 「學生健康體位控制班」 - + - + 101/03/01-101/05/03 18:00-20:30 - 學生大使志工團- 2012 Field Trip-Must Sea+ FUN舟趣 - + 傳播沙龍：從南加大電影藝術學院看美國電影創作教育 + - - - 101/03/17-101/03/18 08:00-20:00 + + + 101/04/26 12:30-14:00 - 職場勞資關係講座－你知道自己的權益嗎？ - + 傳播沙龍：從南加大電影藝術學院看美國電影創作教育 + - + - 101/03/05 18:30-21:00 + 101/04/26 12:30-14:00 - 職場「面面」觀 - 談職場趨勢與面試 - + IEEE Computer Society與ACM資料庫教育訓練 + - + - 101/03/06 18:30-21:00 + 101/04/26 13:00-15:00 - 「自」銷不要「滯」銷~一窺自我行銷術的秘密 - + ScienceDirect Online資料庫教育訓練 + - + - 101/03/07 18:30-21:00 + 101/04/27 12:30-14:00 - 職涯經驗談-開創職涯的一片天 - + 傳播沙龍：心健的心劍--新媒體藝術創作與教學 + - + - 101/03/08 18:30-21:00 + 101/04/27 12:30-14:00 + + + 智財論壇：智財生態變革及研發創新經營 + + + + + 101/04/30 10:10-11:50 - 2012徵政好企業說明會--花旗銀行 - + EICP東方線上資料庫教育訓練 + - + - 101/03/05 12:15-14:00 + 101/04/30 13:00-15:00 - 2012徵政好企業說明會--日商野村總合研究所 - + 職場講座「數位文本實務課程」 + - + - 101/03/09 12:15-14:00 + 101/04/24-101/05/15 12:20-13:50 - 2012徵政好企業說明會--渣打銀行 - + EBSCO教育心理資料庫教育訓練 + - + - 101/03/06 12:15-14:00 + 101/05/02 12:30-14:00 - 2012徵政好企業說明會--台新金控 - + 傳播沙龍：建制內的多元解讀：諜戰劇迷群體、文化表徵與中國語境 + - + - 101/03/07 12:15-14:00 + 101/05/03 12:30-14:00 - 2012徵政好企業說明會--第一銀行 - + 職場講座「數位文本實務課程」 + - + - 101/03/08 12:15-14:00 + 101/04/24-101/05/15 12:20-13:50 - 101年生命教育師資培訓課程研習會 - + 教發中心五月份數位教材製作工作坊_錄影後製與剪輯 05/09 + - + - 101/03/24-101/03/25 07:30-17:40 + 101/05/09 12:00-14:00 + + 文獻蒐集與報告撰寫入門 + + + + + 101/05/11 13:00-15:00 + + + 「2012台北-莫斯科論壇:新政展望」國際學術研討會 + + + + + 101/05/12-101/05/13 08:30-17:30 + + + 「2012台北-莫斯科論壇:新政展望」國際學術研討會 + + + + + 101/05/12-101/05/13 08:30-17:30 + + + 職場講座「數位文本實務課程」 + + + + + 101/04/24-101/05/15 12:20-13:50 + + + 文化講座「破戒：關於『色•戒』的實與虛」 + + + + + 101/05/24 12:20-14:00 + + + John,我愛你-Suming彈唱會-跨國現場獨立音樂表演系列 + + + + + 101/04/27 19:00-21:00 + + + 藝文中心【電影】2012國際民族誌影展巡演-《牛糞》 + + + + + 101/04/30 19:00-20:20 + + + 波蘭前衛流行女聲-噶芭．庫爾卡（跨國現場獨立音樂表演系列） + + + + + 101/05/04 19:00-20:00 + + + Bleuel 雙重奏--薩克斯風與鋼琴 + + + + + 101/05/10 19:30-20:30 + + + 「東張西望」林語堂生活展，政大校園站開幕茶會 + + + + + 101/05/02 11:00-12:00 + + + 文化參訪「故宮特展：西方神話與傳說—羅浮宮珍藏展」 + + + + + 101/05/07 08:30-12:00 + + +「學生健康體位控制班」 + + + + +101/03/01-101/05/03 18:00-20:30 + + +心靈陪伴工作坊 + + + + +101/04/28 09:30-16:30 + + +2012年福祿貝爾恩物親子戲遊成長團體(下午) + + + + +101/04/07-101/06/09 14:00-16:00 + + +2012年福祿貝爾恩物親子戲遊成長團體(上午) + + + + +101/04/07-101/06/02 09:00-11:00 + + +2012年世界狂歡節-環友世界 + + + + +101/05/01-101/05/10 00:00-23:59 + + +2012年世界狂歡節-「框」住瞬間「框」住世界 + + + + +101/05/01-101/05/08 00:00-23:59 + + +2012年世界狂歡節-從政大看台灣 + + + + +101/05/01-101/05/10 08:00-22:00 + + +2012年世界狂歡節-環友世界 + + + + +101/05/01-101/05/10 00:00-23:59 + + +2012年世界狂歡節-「框」住瞬間「框」住世界 + + + + +101/05/01-101/05/08 00:00-23:59 + + +2012年世界狂歡節-從政大看台灣 + + + + +101/05/01-101/05/10 08:00-22:00 + + +2012年世界狂歡節-「框」住瞬間「框」住世界 + + + + +101/05/01-101/05/08 00:00-23:59 + + +2012年世界狂歡節-環友世界 + + + + +101/05/01-101/05/10 00:00-23:59 + + +2012年世界狂歡節-從政大看台灣 + + + + +101/05/01-101/05/10 08:00-22:00 + + +校外租屋法律座談會 + + + + +101/05/03 12:00-14:00 + + +紅紙廊期中工作坊-帶遊戲的言談藝術 + + + + +101/05/03 12:10-14:00 + + +「學生健康體位控制班」 + + + + +101/03/01-101/05/03 18:00-20:30 + + +2012年世界狂歡節-「框」住瞬間「框」住世界 + + + + +101/05/01-101/05/08 00:00-23:59 + + +2012年世界狂歡節-環友世界 + + + + +101/05/01-101/05/10 00:00-23:59 + + +2012年世界狂歡節-從政大看台灣 + + + + +101/05/01-101/05/10 08:00-22:00 + + +身心放輕鬆 (教職員工心靈SPA講座) + + + + +101/05/04 12:00-13:30 + + +2012年世界狂歡節- 五粵天粵語歌唱比賽『光輝歲月』 + + + + +101/05/04 18:00-22:00 + + +2012年世界狂歡節-環友世界 + + + + +101/05/01-101/05/10 00:00-23:59 + + +2012年世界狂歡節-「框」住瞬間「框」住世界 + + + + +101/05/01-101/05/08 00:00-23:59 + + +2012年世界狂歡節-從政大看台灣 + + + + +101/05/01-101/05/10 08:00-22:00 + + +2012年福祿貝爾恩物親子戲遊成長團體(上午) + + + + +101/04/07-101/06/02 09:00-11:00 + + +2012年福祿貝爾恩物親子戲遊成長團體(下午) + + + + +101/04/07-101/06/09 14:00-16:00 + + +2012年世界狂歡節-「框」住瞬間「框」住世界 + + + + +101/05/01-101/05/08 00:00-23:59 + + +2012年世界狂歡節-環友世界 + + + + +101/05/01-101/05/10 00:00-23:59 + + +2012年世界狂歡節-從政大看台灣 + + + + +101/05/01-101/05/10 08:00-22:00 + + +2012年世界狂歡節-「框」住瞬間「框」住世界 + + + + +101/05/01-101/05/08 00:00-23:59 + + +2012年世界狂歡節-環友世界 + + + + +101/05/01-101/05/10 00:00-23:59 + + +2012年世界狂歡節-從政大看台灣 + + + + +101/05/01-101/05/10 08:00-22:00 + + +2012年世界狂歡節-世界服裝大遊行 + + + + +101/05/07 12:00-13:00 + + +2012年世界狂歡節-環友世界 + + + + +101/05/01-101/05/10 00:00-23:59 + + +2012年世界狂歡節-「框」住瞬間「框」住世界 + + + + +101/05/01-101/05/08 00:00-23:59 + + +2012年世界狂歡節-從政大看台灣 + + + + +101/05/01-101/05/10 08:00-22:00 + + +2012年世界狂歡節-美食嘉年華 + + + + +101/05/08-101/05/10 12:00-14:00 + + +2012年世界狂歡節-開幕式 + + + + +101/05/08 12:10-13:30 + + +2012年世界狂歡節-「原，夜」晚會 + + + + +101/05/08 19:00-21:00 + + +2012年世界狂歡節-環友世界 + + + + +101/05/01-101/05/10 00:00-23:59 + + +2012年世界狂歡節-從政大看台灣 + + + + +101/05/01-101/05/10 08:00-22:00 + + +2012年世界狂歡節-美食嘉年華 + + + + +101/05/08-101/05/10 12:00-14:00 + + +2012年世界狂歡節-環友世界 + + + + +101/05/01-101/05/10 00:00-23:59 + + +2012年世界狂歡節-從政大看台灣 + + + + +101/05/01-101/05/10 08:00-22:00 + + +2012年世界狂歡節-美食嘉年華 + + + + +101/05/08-101/05/10 12:00-14:00 + + +2012年世界狂歡節-閉幕式 + + + + +101/05/10 12:00-13:20 + + +國立政治大學101學年度博士班招生考試 + + + + +101/05/12 07:00-17:00 + + +2012年福祿貝爾恩物親子戲遊成長團體(上午) + + + + +101/04/07-101/06/02 09:00-11:00 + + +2012年福祿貝爾恩物親子戲遊成長團體(下午) + + + + +101/04/07-101/06/09 14:00-16:00 + + +2012年福祿貝爾恩物親子戲遊成長團體(上午) + + + + +101/04/07-101/06/02 09:00-11:00 + + +2012年福祿貝爾恩物親子戲遊成長團體(下午) + + + + +101/04/07-101/06/09 14:00-16:00 + + +2012年福祿貝爾恩物親子戲遊成長團體(上午) + + + + +101/04/07-101/06/02 09:00-11:00 + + +TOEIC英語測驗校園考 + + + + +101/05/26 09:30-12:00 + + +2012年福祿貝爾恩物親子戲遊成長團體(下午) + + + + +101/04/07-101/06/09 14:00-16:00 + diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb index d391c80c..38ab1edb 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb @@ -4,7 +4,7 @@
    <%= f.file_field :file %> - <%= form_bulletin_file.file.file ? ( link_to t(:view), form_bulletin_file.file.url, {:target => '_blank', :title => t(:view)} ) : '' %> + <%= form_bulletin_file.file.file ? ( link_to t(:view), form_bulletin_file.file.url, {:class => 'btn', :target => '_blank', :title => t(:view)} ) : '' %>
    diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_tags.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_tags.html.erb index 0e302be3..3887a671 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_tags.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_tags.html.erb @@ -1,37 +1,3 @@ - -
    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 762da9e7..7cc5bd5e 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 @@ -1,13 +1,29 @@ <%= flash_messages %> +
    Chinese
    + + + + <% @site_valid_locales.each do |locale| %> + + <% end %> + + +
    <%= t('web_link_category.key') %><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %>
    +
    +
    +
    - + <% @site_valid_locales.each do |locale| %> - + <% end %> diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_links.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_links.html.erb index c58f15e4..e4212569 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_links.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_links.html.erb @@ -9,17 +9,17 @@ <% end %> <% if post.is_hidden? %> <%= t(:hidden) %> - <% end %> -
    -
      -
    • <%= link_to t('web_link.edit'), edit_panel_web_resource_back_end_web_link_path(post) %>
      • -
    • <%= link_to t('web_link.delete'), panel_web_resource_back_end_web_link_path(post), :confirm => t('sure?'), :method => :delete, :remote => true %>
      • -
    -
    + <% end %> diff --git a/vendor/built_in_modules/announcement/config/locales/en.yml b/vendor/built_in_modules/announcement/config/locales/en.yml index 6adcbd66..3e781823 100644 --- a/vendor/built_in_modules/announcement/config/locales/en.yml +++ b/vendor/built_in_modules/announcement/config/locales/en.yml @@ -78,6 +78,7 @@ en: approval_pass: 'Pass' approval_setting_window_title: 'Unit' approval_user_list: 'Approval Users' + cate_auth: Category Authorization # admin: # action: Action # add_language: Add language diff --git a/vendor/built_in_modules/announcement/config/locales/zh_tw.yml b/vendor/built_in_modules/announcement/config/locales/zh_tw.yml index 9cfcf1a3..dfe9e55f 100644 --- a/vendor/built_in_modules/announcement/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/announcement/config/locales/zh_tw.yml @@ -60,6 +60,8 @@ zh_tw: approval_not_pass_reason: '不通過原因' approval_setting_window_title: '單位' approval_user_list: '審核者' + cate_auth: '分類授權' + bulletin: last_modified: 最後修改於 tags: 標籤