From cfda81a546a8ef7f98745ac08e924ad6bdcb0d37 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Fri, 5 Jun 2015 18:55:28 +0800 Subject: [PATCH 1/2] added site bar settings for logo and title in frontend, fixed role status disbale enable and also added br to text area --- app/assets/images/default-site-logo.png | Bin 0 -> 928 bytes .../admin/role_statuses_controller.rb | 7 +++++-- app/helpers/application_helper.rb | 7 +++++-- app/models/attribute_value.rb | 2 +- app/models/member_profile_field_value.rb | 2 +- app/models/site.rb | 1 + app/views/admin/role_statuses/_index.html.erb | 19 +++++++++++++++++- .../admin/role_statuses/_role_status.html.erb | 4 ++-- app/views/admin/sites/site_info.html.erb | 9 +++++++++ config/locales/en.yml | 1 + config/locales/zh_tw.yml | 1 + lib/tasks/sync_personal_plugins.rake | 2 +- 12 files changed, 45 insertions(+), 10 deletions(-) create mode 100644 app/assets/images/default-site-logo.png diff --git a/app/assets/images/default-site-logo.png b/app/assets/images/default-site-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..56bef4b256f27d9e0d5fd83b6fdb712bdb4a9d97 GIT binary patch literal 928 zcmaJ=PjAyO9L< zj`%;i_vJ!N4|sdPPw0rJE+bOIr$Ykl&>fQ=asB!ES5lLt?Z-iXzz5DN5N;l$n?5|FkZ_>$*N7FVK8%Js3~e*QUP?F|3kxYjZS!v z+~oUD;iNy03G9)C&X^}IZnU3=icyOZms8fK^sMOO@q}`kOlS;Rt!3B1lhYvbX_`D; zavTTQQNrEGBQ~~Vp`rwVkE*y`Q8lxwHV<@7Ya0#y5O>sa+r*UyZsKym#nhXHB;p0v zzu_Kk7Q7*ThtUu$%SOTGT#Su+E3UsemxGO5D3XEs<^FZq#gTAOzFb>Z zY}V!{k#IZ{*1r63`;&MUcWvD0XWxcDudeFbFWzoRJHKxI{{G&%pT8Nq-Nhf9uiyOv DsNx&k literal 0 HcmV?d00001 diff --git a/app/controllers/admin/role_statuses_controller.rb b/app/controllers/admin/role_statuses_controller.rb index d18d00e..1c95e2b 100644 --- a/app/controllers/admin/role_statuses_controller.rb +++ b/app/controllers/admin/role_statuses_controller.rb @@ -42,8 +42,11 @@ class Admin::RoleStatusesController < OrbitMemberController end def toggle - @role_status.disable = @role_status.disable ? false : true - @role_status.save! + role_status = RoleStatus.find(params[:role_status_id]) rescue nil + if !role_status.nil? + role_status.disable = role_status.disable ? false : true + role_status.save! + end render action: :index end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index b64a895..193a990 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -20,10 +20,13 @@ module ApplicationHelper header_file = File.join('../templates', "#{@key}", "/home/header.html.erb") header_file_html = render :file => header_file header = Nokogiri::HTML(header_file_html, nil, "UTF-8") + site_logo = header.css("img[src='{{logo_url}}']")[0] + site_logo.remove if site.site_logo.url.nil? sub_menu_html = site.sub_menu html = header.to_s - html = html.gsub("{{site_name}}",(site.title rescue "")) - html = html.gsub("%7B%7Blogo_url%7D%7D",(site.site_logo.url.nil? ? "/assets/site-logo.png" : site.site_logo.url)) + t = site.title rescue "" + html = html.gsub("{{site_name}}",(site.display_title_in_frontend ? t : "")) + html = html.gsub("%7B%7Blogo_url%7D%7D",(site.site_logo.url.nil? ? "/assets/default-site-logo.png" : site.site_logo.url)) if site.sitemap_menu_in_header sitemap = Page.find_by_key(:sitemap).name rescue "Sitemap" sub_menu_html = sub_menu_html + "#{sitemap}" diff --git a/app/models/attribute_value.rb b/app/models/attribute_value.rb index 38316eb..dd6fbbf 100644 --- a/app/models/attribute_value.rb +++ b/app/models/attribute_value.rb @@ -46,7 +46,7 @@ class AttributeValue def get_field_value if (self.attribute_field.markup.eql?("text_field") || self.attribute_field.markup.eql?("text_area")) - field_value = self.value[I18n.locale] + field_value = self.value[I18n.locale].gsub("\r\n","
") elsif (self.attribute_field.markup.eql?("select") || self.attribute_field.markup.eql?("radio_button")) field_value = self.attribute_field.markup_value["#{self.value}"][I18n.locale] rescue nil elsif self.attribute_field.markup.eql?("address") diff --git a/app/models/member_profile_field_value.rb b/app/models/member_profile_field_value.rb index 4ae345f..0a72a2b 100644 --- a/app/models/member_profile_field_value.rb +++ b/app/models/member_profile_field_value.rb @@ -22,7 +22,7 @@ class MemberProfileFieldValue index.nil? ? self["val"] : self["val"][index] # self.member_profile_field.get_data[:cross_lang] ? Hash[VALID_LOCALES.collect{|lang| [lang,self[lang.to_sym]]}] : self["val"] #if !self.member_profile_field.get_data[:cross_lang] else - self.member_profile_field.get_data["cross_lang"] =="true" ? self["val"] : Hash[site.valid_locales.collect{|lang| [lang,self[lang.to_sym]]}] + self.member_profile_field.get_data["cross_lang"] =="true" ? self["val"].gsub("\r\n","
") : Hash[site.valid_locales.collect{|lang| [lang,self[lang.to_sym].gsub("\r\n","
")]}] end when 'select','radio_button','address' self["val"] diff --git a/app/models/site.rb b/app/models/site.rb index f58d7ba..7a54f66 100644 --- a/app/models/site.rb +++ b/app/models/site.rb @@ -31,6 +31,7 @@ class Site field :mobile_bar_color, :type => Array, :default=>[] field :phone_number, :type => Array,:default=>[] field :title_always_on, :type => Boolean, :default => false + field :display_title_in_frontend, :type => Boolean, :default => true field :sitemap_menu_in_header, :type => Boolean, :default => false field :enable_terms_of_use, :type => Boolean, :default => false field :search,:type => Hash diff --git a/app/views/admin/role_statuses/_index.html.erb b/app/views/admin/role_statuses/_index.html.erb index 9ef07b8..53e7bac 100644 --- a/app/views/admin/role_statuses/_index.html.erb +++ b/app/views/admin/role_statuses/_index.html.erb @@ -12,5 +12,22 @@ <%= render :partial => 'role_status', :collection => @role_statuses %> - + diff --git a/app/views/admin/role_statuses/_role_status.html.erb b/app/views/admin/role_statuses/_role_status.html.erb index 09e0925..56cb7a6 100644 --- a/app/views/admin/role_statuses/_role_status.html.erb +++ b/app/views/admin/role_statuses/_role_status.html.erb @@ -13,7 +13,7 @@ <% end %> - - <%= check_box_tag 'accept', role_status.disable ? 'false' : 'true', false ,{ :class => 'toggle-check role_status_checked', :data=>{:deploy=>"right"}, :data=>{:path=> eval("admin_role_status_toggle_path(role_status)")}, :checked=> role_status.disable} %> + + <%= check_box_tag 'accept', role_status.disable ? '0' : '1', false ,{ :class => 'toggle-check role_status_checked', :data=>{:deploy=>"right"}, :data=>{:path=> eval("admin_role_status_toggle_path(role_status)")}, :checked=> role_status.disable} %> \ No newline at end of file diff --git a/app/views/admin/sites/site_info.html.erb b/app/views/admin/sites/site_info.html.erb index 7681ed1..4979cd2 100644 --- a/app/views/admin/sites/site_info.html.erb +++ b/app/views/admin/sites/site_info.html.erb @@ -48,6 +48,15 @@ + + +
+ +
+ '); - // background-image: url('<%= asset_path 'orbit-logo.png' %>')\9; & + ul { left: 0; } @@ -420,7 +416,7 @@ $orbit-bar-bgc-lighter: lighten($orbit-bar-bgc, 20%) !default; } } -@media (max-width: 479px) { +@media (max-width: 540px) { #orbit-bar { .login-window { width: 90%; diff --git a/app/templates/orbit_bootstrap/assets/javascripts/app.js b/app/templates/orbit_bootstrap/assets/javascripts/app.js index a70b133..833d360 100644 --- a/app/templates/orbit_bootstrap/assets/javascripts/app.js +++ b/app/templates/orbit_bootstrap/assets/javascripts/app.js @@ -142,6 +142,27 @@ this.helpers.addClass(els[i], 'dropdown-menu'); } } + }, + + // Go back top button + goBackTop: function(txt, speed) { + var top = document.createElement('div'); + top.className = 'go-back-top'; + top.textContent = txt; + doc.body.appendChild(top); + + $(window).scroll(function() { + if($(this).scrollTop() != 0) { + $('.go-back-top').fadeIn(); + } else { + $('.go-back-top').fadeOut(); + } + }); + + $('.go-back-top').click(function() { + $('body, html').animate({scrollTop:0}, speed); + return false; + }); } }; @@ -156,6 +177,7 @@ // Functions that will be running on every page orbit.sitemenuDropdown(); + orbit.goBackTop('top', 800); orbit.plugins.bullEye(); } diff --git a/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_accesskey.scss b/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_accesskey.scss new file mode 100644 index 0000000..74f4241 --- /dev/null +++ b/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_accesskey.scss @@ -0,0 +1,7 @@ +@charset "utf-8"; + +a[accesskey] { + position: absolute; + margin-left: -15px; + color: transparent !important; +} \ No newline at end of file diff --git a/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_global.scss b/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_global.scss index 4898dbc..7727cce 100644 --- a/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_global.scss +++ b/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_global.scss @@ -1,54 +1,82 @@ @charset "utf-8"; + @import "../initial"; @import "variables"; html { - font-size: 100%; + font-size: 100%; } + body { - font-family: $sub-font; - font-size: inherit; - margin-top: 40px; + font-family: $sub-font; + font-size: inherit; + margin-top: 40px; } + +a:link, +a:visited { + color: $brand-primary; +} + a:hover, a:focus { - text-decoration: none; + color: lighten($brand-primary, 10%); + text-decoration: none; } + img { - max-width: 100%; - height: auto; + max-width: 100%; + height: auto; } + .admin-edit { - clear: both; + clear: both; } + // override bootsrap settings th, td { - padding: 8px .5rem; + padding: 8px .5rem; } -.borderless>tbody>tr>td, -.borderless>tbody>tr>th, -.borderless>tfoot>tr>td, -.borderless>tfoot>tr>th, -.borderless>thead>tr>td, -.borderless>thead>tr>th { - border: none !important; +.borderless > tbody > tr > td, +.borderless > tbody > tr > th, +.borderless > tfoot > tr > td, +.borderless > tfoot > tr > th, +.borderless > thead > tr > td, +.borderless > thead > tr > th { + border: none !important; } +a.btn-primary { + color: $theme-white; + border-color: $theme-color-main; + background-color: $theme-color-main; + font-size: 0.8125rem; + + &:hover { + background-color: darken($theme-color-main, 10%); + border-color: darken($theme-color-main, 10%); + } +} + + +// Page heading .page-module-title { - @extend .unity-title; - margin-bottom: 18px; + @extend .unity-title; + margin-bottom: 18px; } .view-count { - font-size: 0.75rem; -} -.view_count { - > i { font-size: 0.75rem; - &:before { - margin-right: 8px; +} + +.view_count { + > i { + font-size: 0.75rem; + + &:before { + margin-right: 8px; + } } - } } \ No newline at end of file diff --git a/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_go_back_top.scss b/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_go_back_top.scss new file mode 100644 index 0000000..102a030 --- /dev/null +++ b/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_go_back_top.scss @@ -0,0 +1,21 @@ +@charset "utf-8"; +@import "variables"; + +.go-back-top { + background: rgba($theme-color-main, .9); + text-align: center; + padding: 10px 12px; + position: fixed; + bottom: 15px; + right: 15px; + cursor: pointer; + display: none; + color: $theme-white; + font-size: 12px; + border-radius: 2px; + z-index: 1050; + + &:hover { + background: rgba($theme-color-main, 1); + } +} \ No newline at end of file diff --git a/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_orbitbar-override.scss b/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_orbitbar-override.scss index 14900e1..02d6298 100644 --- a/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_orbitbar-override.scss +++ b/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_orbitbar-override.scss @@ -35,7 +35,7 @@ body { } } -@media (max-width: 479px) { +@media (max-width: 540px) { body { #orbit-bar ul.orbit-bar-search-sign-language > li + li:hover > a, #orbit-bar ul.orbit-bar-search-sign-language > li + li:hover > span { diff --git a/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_pagination.scss b/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_pagination.scss index b1595ef..6673de4 100644 --- a/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_pagination.scss +++ b/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_pagination.scss @@ -1,10 +1,20 @@ @charset "utf-8"; + @import "variables"; + .pagination { li { a { font-size: 0.8125rem; margin: 0 0.2em; + color: $theme-color-main; + } + } + + .active { + a { + background-color: $theme-color-main; + border-color: $theme-color-main; } } } \ No newline at end of file diff --git a/app/templates/orbit_bootstrap/assets/stylesheets/template/layout/header.scss b/app/templates/orbit_bootstrap/assets/stylesheets/template/layout/header.scss index 8e022f4..aa8cc59 100644 --- a/app/templates/orbit_bootstrap/assets/stylesheets/template/layout/header.scss +++ b/app/templates/orbit_bootstrap/assets/stylesheets/template/layout/header.scss @@ -12,7 +12,7 @@ @extend .response-content; } .header-nav { - padding-top: 0.5rem; + padding: 16px 0; color: #FFF; & > * { display: inline-block; diff --git a/app/templates/orbit_bootstrap/assets/stylesheets/template/layout/slide.scss b/app/templates/orbit_bootstrap/assets/stylesheets/template/layout/slide.scss index 26d2dac..d7e4273 100644 --- a/app/templates/orbit_bootstrap/assets/stylesheets/template/layout/slide.scss +++ b/app/templates/orbit_bootstrap/assets/stylesheets/template/layout/slide.scss @@ -5,4 +5,9 @@ position: relative; margin-bottom: 2rem; z-index: 0; + background: $theme-gray; + .w-ad-banner { + max-width: 1200px; + margin: auto; + } } \ No newline at end of file diff --git a/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/member.scss b/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/member.scss index a42edf6..0839055 100644 --- a/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/member.scss +++ b/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/member.scss @@ -114,13 +114,6 @@ height: 125px; } .i-member-pic { - position: absolute; - top: -100%; - left: 0; - right: 0; - bottom: -100%; - margin: auto; - width: 100%; } } } diff --git a/app/templates/orbit_bootstrap/assets/stylesheets/template/template.scss b/app/templates/orbit_bootstrap/assets/stylesheets/template/template.scss index 24d175f..b7a7402 100644 --- a/app/templates/orbit_bootstrap/assets/stylesheets/template/template.scss +++ b/app/templates/orbit_bootstrap/assets/stylesheets/template/template.scss @@ -4,6 +4,8 @@ @import "base/pagination"; @import "base/orbitbar-override"; @import "base/global"; +@import "base/accesskey"; +@import "base/go_back_top"; // Layout @import "layout/header"; diff --git a/app/templates/orbit_bootstrap/assets/stylesheets/template/widget/breadcrumb.scss b/app/templates/orbit_bootstrap/assets/stylesheets/template/widget/breadcrumb.scss index cb80c3d..4b3ab99 100644 --- a/app/templates/orbit_bootstrap/assets/stylesheets/template/widget/breadcrumb.scss +++ b/app/templates/orbit_bootstrap/assets/stylesheets/template/widget/breadcrumb.scss @@ -1,16 +1,20 @@ @charset "utf-8"; + @import "../initial"; .widget-breadcrumb { - &.widget1 { - li { - &:last-child { - a { - color: $theme-gray-dark; - pointer-events: none; - } - } - } - } -} + &.widget1 { + li { + a { + font-size: 0.8125rem; + } + &:last-child { + a { + color: $theme-gray-dark; + pointer-events: none; + } + } + } + } +} \ No newline at end of file diff --git a/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget1.html.erb b/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget1.html.erb index 1d1d664..b4cb222 100644 --- a/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget1.html.erb +++ b/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget1.html.erb @@ -5,6 +5,7 @@ data-cycle-slides=".w-ad-banner__slide" data-cycle-log="false" data-overlay=".w-ad-banner__caption" + data-cycle-auto-height="calc" data-pager=".w-ad-banner__pager-1" data-pager-template="
    • " data-pager-active-class="active-slide" diff --git a/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget2.html.erb b/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget2.html.erb index b820dbd..c0f2b13 100644 --- a/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget2.html.erb +++ b/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget2.html.erb @@ -4,6 +4,7 @@ data-level="0" data-cycle-slides=".w-ad-banner__slide" data-cycle-log="false" + data-cycle-auto-height="calc" data-overlay=".w-ad-banner__caption" data-pager=".w-ad-banner__pager" data-pager-template="
    • " diff --git a/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget2_video.html.erb b/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget2_video.html.erb index 04ba74e..49e7470 100644 --- a/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget2_video.html.erb +++ b/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget2_video.html.erb @@ -7,6 +7,7 @@ data-cycle-log="false" data-overlay=".w-ad-banner__caption" data-cycle-auto-height="640:360" + data-cycle-auto-height="calc" data-pager=".w-ad-banner__pager-2" data-pager-template="
    • " data-pager-active-class="active-slide" diff --git a/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget3.html.erb b/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget3.html.erb index d052410..9d7a125 100644 --- a/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget3.html.erb +++ b/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget3.html.erb @@ -4,6 +4,7 @@ data-level="0" data-cycle-slides=".w-ad-banner__slide" data-cycle-log="false" + data-cycle-auto-height="calc" data-pager=".w-ad-banner__pager-3" data-pager-template="
    • " data-pager-active-class="active-slide" diff --git a/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget4.html.erb b/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget4.html.erb index f2129d1..f709c32 100644 --- a/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget4.html.erb +++ b/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget4.html.erb @@ -4,6 +4,7 @@ data-level="0" data-cycle-slides=".w-ad-banner__slide" data-cycle-log="false" + data-cycle-auto-height="calc" >
    {{subtitle}}

    +
    + Read more +
    diff --git a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget10.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget10.html.erb index 35e18b2..be2c45f 100644 --- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget10.html.erb +++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget10.html.erb @@ -16,4 +16,7 @@ +
    + Read more +
    diff --git a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget11.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget11.html.erb index 16d806e..bd0db88 100644 --- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget11.html.erb +++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget11.html.erb @@ -16,4 +16,7 @@ +
    + Read more +
    diff --git a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget12.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget12.html.erb index 4504ea6..9b1b289 100644 --- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget12.html.erb +++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget12.html.erb @@ -21,4 +21,7 @@ +
    + Read more +
    \ No newline at end of file diff --git a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget13.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget13.html.erb index 4408757..a21b0e8 100644 --- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget13.html.erb +++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget13.html.erb @@ -21,4 +21,7 @@ +
    + Read more +
    \ No newline at end of file diff --git a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget14.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget14.html.erb index e319e1a..434814a 100644 --- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget14.html.erb +++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget14.html.erb @@ -23,5 +23,7 @@ - +
    + Read more +
    diff --git a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget2.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget2.html.erb index e307ce8..58785a6 100644 --- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget2.html.erb +++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget2.html.erb @@ -28,4 +28,7 @@ +
    + Read more +
    diff --git a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget3.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget3.html.erb index 580a093..bc21e4f 100644 --- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget3.html.erb +++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget3.html.erb @@ -24,8 +24,11 @@

    {{subtitle}}

    - {{img_description}} + {{img_description}}
    +
    + Read more +
    diff --git a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget4.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget4.html.erb index 5c6baee..e95292e 100644 --- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget4.html.erb +++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget4.html.erb @@ -28,4 +28,7 @@ +
    + Read more +
    diff --git a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget5.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget5.html.erb index 3fe5459..9fc9da1 100644 --- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget5.html.erb +++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget5.html.erb @@ -25,4 +25,7 @@ +
    + Read more +
    diff --git a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget6.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget6.html.erb index 2e27093..7f47ce0 100644 --- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget6.html.erb +++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget6.html.erb @@ -20,4 +20,7 @@ +
    + Read more +
    diff --git a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget7.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget7.html.erb index f895a36..45753b3 100644 --- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget7.html.erb +++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget7.html.erb @@ -20,4 +20,7 @@ +
    + Read more +
    diff --git a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget8.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget8.html.erb index 9270b8c..afe0848 100644 --- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget8.html.erb +++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget8.html.erb @@ -23,4 +23,7 @@ +
    + Read more +
    \ No newline at end of file diff --git a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget9.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget9.html.erb index 883200f..2f8df20 100644 --- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget9.html.erb +++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget9.html.erb @@ -23,4 +23,7 @@ +
    + Read more +
    \ No newline at end of file diff --git a/app/templates/orbit_bootstrap/modules/personal_book/show.html.erb b/app/templates/orbit_bootstrap/modules/personal_book/show.html.erb index 34b30df..b183818 100644 --- a/app/templates/orbit_bootstrap/modules/personal_book/show.html.erb +++ b/app/templates/orbit_bootstrap/modules/personal_book/show.html.erb @@ -1,5 +1,8 @@ - - - -
    {{title}}{{value}}
    \ No newline at end of file + + + {{title}} + {{value}} + + + diff --git a/app/templates/orbit_bootstrap/modules/personal_conference/show.html.erb b/app/templates/orbit_bootstrap/modules/personal_conference/show.html.erb index 06783c8..b183818 100644 --- a/app/templates/orbit_bootstrap/modules/personal_conference/show.html.erb +++ b/app/templates/orbit_bootstrap/modules/personal_conference/show.html.erb @@ -1,5 +1,8 @@ - - - + + + + + +
    {{title}}{{value}}
    {{title}}{{value}}
    diff --git a/app/templates/orbit_bootstrap/modules/personal_diploma/show.html.erb b/app/templates/orbit_bootstrap/modules/personal_diploma/show.html.erb index 34b30df..b183818 100644 --- a/app/templates/orbit_bootstrap/modules/personal_diploma/show.html.erb +++ b/app/templates/orbit_bootstrap/modules/personal_diploma/show.html.erb @@ -1,5 +1,8 @@ - - - -
    {{title}}{{value}}
    \ No newline at end of file + + + {{title}} + {{value}} + + + diff --git a/app/templates/orbit_bootstrap/modules/personal_experience/show.html.erb b/app/templates/orbit_bootstrap/modules/personal_experience/show.html.erb index 34b30df..b183818 100644 --- a/app/templates/orbit_bootstrap/modules/personal_experience/show.html.erb +++ b/app/templates/orbit_bootstrap/modules/personal_experience/show.html.erb @@ -1,5 +1,8 @@ - - - -
    {{title}}{{value}}
    \ No newline at end of file + + + {{title}} + {{value}} + + + diff --git a/app/templates/orbit_bootstrap/modules/personal_honor/show.html.erb b/app/templates/orbit_bootstrap/modules/personal_honor/show.html.erb index 34b30df..b183818 100644 --- a/app/templates/orbit_bootstrap/modules/personal_honor/show.html.erb +++ b/app/templates/orbit_bootstrap/modules/personal_honor/show.html.erb @@ -1,5 +1,8 @@ - - - -
    {{title}}{{value}}
    \ No newline at end of file + + + {{title}} + {{value}} + + + diff --git a/app/templates/orbit_bootstrap/modules/personal_journal/show.html.erb b/app/templates/orbit_bootstrap/modules/personal_journal/show.html.erb index 06783c8..b183818 100644 --- a/app/templates/orbit_bootstrap/modules/personal_journal/show.html.erb +++ b/app/templates/orbit_bootstrap/modules/personal_journal/show.html.erb @@ -1,5 +1,8 @@ - - - + + + + + +
    {{title}}{{value}}
    {{title}}{{value}}
    diff --git a/app/templates/orbit_bootstrap/modules/personal_lab/show.html.erb b/app/templates/orbit_bootstrap/modules/personal_lab/show.html.erb index 34b30df..b183818 100644 --- a/app/templates/orbit_bootstrap/modules/personal_lab/show.html.erb +++ b/app/templates/orbit_bootstrap/modules/personal_lab/show.html.erb @@ -1,5 +1,8 @@ - - - -
    {{title}}{{value}}
    \ No newline at end of file + + + {{title}} + {{value}} + + +