From 5aac9b297d81d86959def2147a0e0e824795fc2b Mon Sep 17 00:00:00 2001 From: rulingcom Date: Tue, 14 Apr 2015 15:31:41 +0800 Subject: [PATCH] merged --- app/assets/images/no-image.jpg | Bin 2081 -> 2181 bytes app/assets/javascripts/group.js | 54 +- app/assets/stylesheets/group_show.css.scss | 668 ++++++++----- app/assets/stylesheets/lib/group.css | 2 - .../orbit_bootstrap/assets/javascripts/app.js | 22 +- .../stylesheets/template/base/_global.scss | 9 + .../stylesheets/template/base/_variables.scss | 14 +- .../assets/stylesheets/template/init.scss | 4 - .../assets/stylesheets/template/initial.scss | 1 - .../template/modules/ad_banner.scss | 153 +-- .../template/modules/announcement.scss | 944 +++++++++++------- .../stylesheets/template/modules/member.scss | 141 ++- .../assets/stylesheets/template/template.scss | 2 + .../ad_banner/_ad_banner_widget1.html.erb | 6 +- .../ad_banner/_ad_banner_widget2.html.erb | 2 +- .../_ad_banner_widget2_video.html.erb | 52 +- .../ad_banner/_ad_banner_widget3.html.erb | 9 +- .../modules/ad_banner/info.json | 4 +- .../announcement/_annc_widget11.html.erb | 37 +- .../announcement/_annc_widget12.html.erb | 37 +- .../modules/announcement/annc_index1.html.erb | 21 +- .../modules/announcement/annc_index2.html.erb | 49 +- .../modules/announcement/annc_index3.html.erb | 45 +- .../modules/announcement/info.json | 142 ++- .../thumbs/admission_widget1_thumbs.png | Bin 2214 -> 0 bytes .../thumbs/annc_index1_thumbs.png | Bin 2085 -> 2165 bytes .../thumbs/annc_index2_thumbs.png | Bin 2812 -> 2251 bytes .../thumbs/annc_index3_thumbs.png | Bin 2814 -> 2166 bytes .../thumbs/annc_widget11_thumbs.png | Bin 2125 -> 2091 bytes .../thumbs/annc_widget12_thumbs.png | Bin 2880 -> 2123 bytes .../modules/gallery/_gallery_widget1.html.erb | 1 - .../modules/member/member_index1.html.erb | 26 +- .../orbit_bootstrap/partial/_head.html.erb | 3 +- app/views/admin/groups/_post.html.erb | 12 + app/views/admin/groups/show.html.erb | 59 +- app/views/admin/groups/showpost.html.erb | 10 +- config/mongoid.yml | 6 +- 37 files changed, 1542 insertions(+), 993 deletions(-) delete mode 100644 app/assets/stylesheets/lib/group.css delete mode 100644 app/templates/orbit_bootstrap/assets/stylesheets/template/init.scss delete mode 100644 app/templates/orbit_bootstrap/modules/announcement/thumbs/admission_widget1_thumbs.png diff --git a/app/assets/images/no-image.jpg b/app/assets/images/no-image.jpg index ae197069478322f11d41abba20af7020aa23a0dc..a47918ffe7c07361e9b96c4b9c3043fa516be66c 100644 GIT binary patch delta 1366 zcmZ1|&?-2=h_QZhJfqA;e?G>^ZHy_C!x%N|3w(X8{EITvGxHL2T=J7kb5rw5JY8&+ zDsl_-QZiGl42+XaEz&GabW>AIEOk?pP11BNjg!oDjZ)H*(^5?mEfXz_l@x%gf#zV- z?_^+V|$YLWN7GW;$&##=Hz1HVr*h$;c8*QXgXPnNk##x$_R%l)5*_(3MVt^ zr&uPLCz>Uhr|KG;C#C8dSpuDtXkc!tYi5>gX_#V|VqsulsiaU`5|o-|l|rU>Cd)D3 zi%VgsU}h9#U=n0x7G(T?gdvfEk%5Vsk&yub*g2S4*;u$x#K5uw42&$y3`|T+%rM2w zEUavdOzc9!f+C7yN}?Q-V^|dGfB%3$_cZ0o%iPm* zyIHp8P;Svf4cDetG8c-1pc@J#N?zl(V17CH0T?AsS{&Z1^c@*e%i^ZBE8 zSJtFIe!}asKlO>|U!^PaUfsDRXnA7W=7Lq;_p(0j@^QAies;>9xc91p*PQBg@6Dew zNA=mH8Gl}HbGWjp@?g;>Vv=FV~65;@6}BW}XuO(rjG+EUATrd{@ZIVGz#ZOiPp zw{{dyQCzd)h+SVz*FCOU_Srwxdw$e6N(EcSCoJ65SoePR@`^c={xjHaS+L-uHLK-f zFWzrSWrq`XCmmR`<=m|GjCP+&_r>mMKeD*BQ2zB7&1FJ2IH$Q!icEST|E#Z4e%ZGa z%eB{M?b&hq&Bw*DLR|~OmQFviN@IV~-NQ?!Y}t}9i}%vi&@H|`={Xh4xBcLFKfA#5 z#-9K640FmhUA(#d)~fHTzwGOuDtEx>-Py?)cXe z|5c@j6tPq?o~+)Rw0l!mvCEootvgDWiOrcjTUFcRUhai=VY9FHy;$8Y8_0Mg^r~doQ_Uva~aF2N+ zt7w7yoGs7$-xO?_F@56;&u8vt%Qn7S9Hp@>>bK0YWe3wMwkvPDo-^@f{42AW?HA1d zO)furE9s`wQS-{#PM_Y+jLHr)ZP~In;(1EqyjS^Cm59`hcRYPUd3cMIh#pZ!Nt(h$<)}?&Bffp+|ba~ z#L~>!#L~dj#mUgb&Dhn_ZL%Jd3{;Vs0Zv7?m<(Vhx!_c!#|$&c)D@?qJmz}|0Spz) zjDieIf{e_9jQ@`?Br`BFFaseHU}NWCWaVOHL=pls1sE7vfufAeEX)u&Rt6?!7B)t9 zK_L+iC1Fu9MP+f7$*Wit>c4+zpbRvtgngSEaQ-B3n9J+er=M(^db)Cj5zl&-qV!sy zHjA`dYpt(6T6S{T;tdP(wA2^Df$;p9vU6dzhMw9BRn`-N;D5;>Wp` zwEm}Y7E2ofcn<$6{r0NA{`IHIXwgIIv-u{6cB|Gk1|;3KTP4kx{Xp(_uCh)cd)xM_ zr_B{+Nedj3J#Me^@mukNUe>d3zqtCbUwmQR%kRKm(r_q+>mKJ4&Ba^Xz3i2gIxan4 zw&rA9_?o@OR=4JEy#Jxevi#F^X@P~$S|8S`ySiQY&tR~%^3dzV%u@pW8$#>li+SfL zvrVpIicaSU*N**MP_K7&)k%w&X~~w?3)GbA6^q=qF>ESncs)1Xquy~c|Jt`Xzdws_ z`Dyt5{mYiCPitjZuh;fyw~~(8mUcP+aEffdbYRSB4^F@ z=-1KOyZt7u^?%cmdeX!!B`&Y9zG&Ce?OyKM$(mtzv*ito-$|bPcf0cQC(#@6$DDUE zCark%*L7j;=_d^}-AQ5JbeFA_kmEWS9hhnKc6wmoOka`7^LO8$ZGR@@`Mb^Q8sGQ7 zE{Iz4ry!=$Cf|Ue-7(#!+IP0KL-C6bJ#Cs#i`5!9MU&3w1^rIncG4oxJAKW}Pu}&> zk6%8IzrICzM?YJc^*`<7uWkg-bDn>9@1ECRx>kB0Z`41pAJ)yaU+|zq;P}x@MSIgPGG}wnoouS{TgPRuc%pc* z+qR2*PX6~fU$05KuYcL|bC__FoODFae%SjndzQ`;;`2n*42s5+) GzX= 1 ) { var imgs = doc.querySelectorAll( ".group-post-banner-image" ), - imgHeight = imgs[ 0 ].clientHeight, cycleNav = doc.querySelectorAll( ".cycle-nav" ), - cycleNavHeight = cycleNav[ 0 ].clientHeight, len = cycleNav.length, i = -1; @@ -19,31 +18,27 @@ for( i = 0; i < len; i++ ) { cycleNav[ i ].classList.add( "hide" ); } - } else { - // Change nav top positions which are calculating by JavaScript - for ( i = 0; i < len; i++ ) { - cycleNav[ i ].style.top = ( ( imgHeight / 2 ) - ( cycleNavHeight / 2 ) ) + "px"; - } } + + } else if ( doc.querySelectorAll( ".group-post-banner-image").length === 0 && doc.querySelector( ".group-post-image-wrap" ) ) { + doc.querySelector( ".group-post-image-wrap").classList.add( "hide" ); } }, // Create the tool tip wrap and get the seen counts and then inject them into DOM - createToolTip: function() { - if( doc.querySelectorAll( ".group-post-seen-by-name" ).length >= 1 ) { - var container = doc.querySelector( ".group-post-seen-by" ), - names = doc.querySelectorAll( ".group-post-seen-by-name" ), - namesLen = names.length, + createToolTip: function( container, names, cls1, cls2, wrapEl ) { + if( doc.querySelectorAll( names ).length >= 1 ) { + var container = doc.querySelector( container ), + names = doc.querySelectorAll( names ), span = doc.createElement( "span" ), wrap = doc.createElement( "div" ), frag = document.createDocumentFragment(); // Get the seen counts and append them - span.className = "group-post-seen-by-count"; - span.textContent = namesLen; + span.className = cls1; names[ 0 ].parentNode.appendChild( span ); // Create the tool tip and save them in the document fragment - wrap.className = "group-post-seen-by-names tool-tip"; + wrap.className = cls2 + " tool-tip"; Array.prototype.slice.call( names ).forEach( function( el ) { frag.appendChild( el ); }); @@ -53,25 +48,30 @@ container.appendChild( wrap ); } }, + // Create scroll effect (with css) scrollEffect: function() { - var page = doc.querySelector( ".group-page" ), - wrap = doc.querySelector( ".group-page-banner-image-wrap" ), - scrollClass = "scroll"; + if( doc.querySelector( ".group-page") ) { + var page = doc.querySelector( ".group-page" ), + wrap = doc.querySelector( ".group-page-banner-image-wrap" ), + scrollClass = "scroll"; - function stickyScroll( e ) { - if( window.pageYOffset > 210 ) { - page.classList.add( scrollClass ); - } - } - - window.addEventListener( "scroll", stickyScroll); + // Use pageYOffset to get the Y positoin and add scroll on it, the animation + // is done by css transition + window.addEventListener( "scroll", function() { + if( window.pageYOffset !== 0 ) { + page.classList.add( scrollClass ); + } else { + page.classList.remove( scrollClass ); + } + }, false); + } } } - // When DOM is completely loaded + // When DOM is completely loaded, execute these functions document.addEventListener( "DOMContentLoaded", function( event ) { group.cycleFix(); - group.createToolTip(); + group.createToolTip( ".group-post-seen-by", ".group-post-seen-by-name", "group-post-seen-by-count", "group-post-seen-by-names" ); group.scrollEffect(); }); diff --git a/app/assets/stylesheets/group_show.css.scss b/app/assets/stylesheets/group_show.css.scss index c2f01dd..7cc7985 100644 --- a/app/assets/stylesheets/group_show.css.scss +++ b/app/assets/stylesheets/group_show.css.scss @@ -2,50 +2,133 @@ @import url(http://fonts.googleapis.com/css?family=Maven+Pro); +@import url(http://fonts.googleapis.com/css?family=Roboto); + // Font stacks $main-font: "Maven Pro", "微軟正黑體" sans-serif; +$paragraph-font: "Roboto", "微軟正黑體", sans-serif; $gray: #f3f3f3; $dark-gray: #aaaaaa; $light-gray: #cdcdcd; $white: white; +$light-black: #353535; $black: black; -$green: #1d9e20; -$blue: #0056cc; +$green: #4ad976; +$blue: #4171d5; $red: #c71932; +$blue-green: #00acee; $group-page-bar-color: #171717; +// Transition units +$fast: 0.3s; +$normal: 0.6s; +$slow: 1s; + +// Border radius units +$general: 0.25rem; + // General style body { - background: $gray; + background: $gray; } *, *:before, *:after { - box-sizing: border-box; -} - -.screen-reader { - position: absolute; - top: -9999px; - left: -9999px; -} - -.button { - padding: 8px .75rem; - color: $gray; - border: none; - border: 1px solid #38b7ea; - border-radius: 10rem; - background: $white; + box-sizing: border-box; } img { - width: 100%; - max-width: 100%; - height: auto; + width: 100%; + max-width: 100%; + height: auto; } + +a { + text-decoration: none; +} + +a:hover, a:visited { + text-decoration: none; +} + +// General classes + +.screen-reader { + position: absolute; + top: -9999px; + left: -9999px; +} + +// Buttons +.button { + padding: 8px .75rem; + color: $black; + border: none; + border-radius: 15rem; + background: $gray; +} + +.button-default { + color: $blue; + background-color: transparent; + border: 2px solid $blue; + transition: $fast all; + &:hover { + color: $white; + background-color: $blue; + } +} + +.button-activated { + color: #fff; + background-color: $green; +} + +.button-primary { + color: $white; + background-color: $blue; + transition: $fast all; + &:hover { + color: $white; + background-color: lighten($blue, 5%); + } +} + +// Button group +.button-group { + display: inline-block; + list-style: none; + > .button-group-common { + display: inline-block; + } + > .button:first-child { + border-radius: 15rem 0 0 15rem; + margin-right: -4px; + } + > .button:last-child { + border-radius: 0 15rem 15rem 0; + } + li { + color: $blue; + background-color: rgba($white, 0.2); + &:hover { + a { + color: $white; + } + } + } + > .active { + color: $white; + background-color: $blue; + a { + color: $white; + } + } +} + +// Tool Tip .tool-tip-parent { position: relative; &:hover { @@ -54,270 +137,292 @@ img { } } } + .tool-tip { - padding: 10px 0.75rem; - border-radius: .2rem; - color: $white; - background: rgba($black, 0.85); + padding: 10px 0.75rem; + border-radius: .2rem; + color: $white; + background: rgba($black, 0.85); + position: absolute; + left: 0; + bottom: 100%; + z-index: 150; + &:after { + border: 5px solid transparent; + border-top-color: rgba($black, 0.85); + content: ""; position: absolute; - left: 0; - bottom: 100%; - z-index: 150; - &:after { - border: 5px solid transparent; - border-top-color: rgba($black, 0.85); - content: ""; - position: absolute; - left: 10px; - bottom: -10px; - } + left: 10px; + bottom: -10px; + } } .topnav { - display: none; + display: none; } // Group page #main-wrap { - padding-top: 0; + padding-top: 0; +} + +.group-page-banner-wrap { + height: 280px; + overflow: hidden; + position: fixed; + top: 0; + left: 0; + width: 100%; + transition: $fast all; + z-index: 500; } .group-page-banner-image-wrap { - position: relative; - overflow: hidden; - max-height: 280px; + background-color: $black; + text-align: center; } .group-page-view-switch { - position: absolute; - top: 2rem; - right: 2rem; + position: absolute; + top: 4rem; + right: 2rem; } .group-page-banner-image { - width: 100%; - max-width: 100%; - height: auto; + width: auto; + max-width: 100%; + height: auto; } .group-page-bar { - overflow: hidden; - padding: 20px 2rem; - text-align: center; - background: $group-page-bar-color; + padding: 0 2rem 0 6rem; + text-align: center; + background: rgba($group-page-bar-color, 0.95); + width: 100%; + position: absolute; + left: 0; + bottom: 0; } .group-page-title { - margin-bottom: 12px; - padding: 6px 0; - color: $white; + margin-bottom: 12px; + padding: 6px 0; + color: $white; + font-family: $main-font; + font-weight: normal; } -.group-page-setion { - overflow: hidden; - max-width: 1350px; - margin: auto; - padding: 30px 2rem; +.group-page-new-post { + float: right; + margin: 18px 0 0 0; +} + +.group-page-section { + overflow: hidden; + max-width: 1350px; + margin: auto; + padding: 300px 2rem 30px; } .gorup-page-info-wrap { - font-size: .9rem; - display: block; - float: right; - padding: 5px .5rem; - cursor: pointer; - border: 2px solid $light-gray; + font-size: .9rem; + padding: 6px 1rem; + display: block; + float: right; + cursor: pointer; } .group-page-description-wrap { - clear: both; + clear: both; } .gorup-page-info-wrap { - margin-bottom: 10px; - text-align: right; + margin-bottom: 10px; + text-align: right; } .group-page-status-wrap { - font-size: .75rem; - float: right; - margin-bottom: 10px; - padding: 2px .4rem; - color: $white; - border-radius: .2rem; - background: $green; + font-size: .75rem; + float: right; + padding: 2px 0.5rem; + margin-bottom: 10px; } .group-page-status-wrap.close-eye { - margin-left: 5px; - background: $red; + margin-left: 5px; + background: $red; } .group-page-description-wrap { - margin-bottom: 15px; - padding: 16px 1.2rem 16px; - border-radius: .2rem; - box-shadow: inset 0 0 8px $dark-gray; + margin-bottom: 15px; + padding: 16px 1.2rem 16px; + border-radius: .2rem; + box-shadow: inset 0 0 8px $dark-gray; } .group-page-description { - clear: both; - text-align: justify; + clear: both; + text-align: justify; } .group-page-post { - clear: both; - overflow: hidden; - margin-bottom: 40px; - padding: 28px 1.5rem; - text-align: center; - border-radius: .2rem; - background: $white; - box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.2); + clear: both; + overflow: hidden; + margin-bottom: 40px; + padding: 28px 1.5rem; + text-align: center; + border-radius: $general; + background: $white; + box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.2); } .group-page-post-link { - text-decoration: none; - color: $black; + text-decoration: none; + color: $black; } .group-page-post:hover { - box-shadow: 0 1px 25px 0 rgba(0, 0, 0, 0.2); + box-shadow: 0 1px 25px 0 rgba(0, 0, 0, 0.2); } .group-page-post-link:hover { - text-decoration: none; - color: $black; + text-decoration: none; + color: $black; } .group-page-post-image-wrap { - display: inline-block; - margin-bottom: 12px; + display: inline-block; + margin-bottom: 12px; } .group-page-post-image { - width: 100%; - max-width: 100%; - height: auto; - margin-top: 12px; + width: 100%; + max-width: 100%; + height: auto; + margin-top: 12px; + border: 2px solid $gray; + border-radius: $general; } .group-page-post-content { - margin-bottom: .5rem; + margin-bottom: .5rem; + color: $dark-gray; } .group-page-post-title { - font-size: 1.5rem; - font-weight: normal; - line-height: 1; - margin-bottom: 12px; + font-size: 1.5rem; + font-weight: normal; + line-height: 1; + margin-bottom: 12px; + color: $light-black; + font-family: $paragraph-font; } .group-page-post-meta-wrap { - color: $dark-gray; + color: $dark-gray; } .group-page-post-author, .group-page-post-postdate { - margin-right: .5rem; + margin-right: .5rem; } -/* scroll view */ +.group-page-seen-by { + display: inline-block; +} + +// scroll view .group-page.scroll { - padding-top: 7rem; -} - -.group-page.scroll .group-page-banner-image-wrap { - position: fixed; - top: 0; - overflow: hidden; - height: 70px; -} - -.group-page.scroll .group-page-title { + padding-top: 7rem; + .group-page-banner-wrap { + height: 120px; + } + .group-page-banner-image-wrap {} + .group-page-title { margin-bottom: 0; -} - -.group-page.scroll .group-page-title { - font-size: 18px; -} - -.group-page.scroll .group-page-new-post { - margin-top: 6px; -} - -.group-page.scroll .group-page-new-post { + font-size: 1.625rem; + line-height: 50px; + } + .group-page-new-post { + margin-top: 9px; + padding: 6px 10px; + } + .group-page-new-post { display: inline-block; vertical-align: top; -} - -.group-page.scroll .group-page-view-switch { + } + .group-page-view-switch { position: static; display: inline-block; margin: 6px .5rem 0 0; -} - -.group-page.scroll .btn { + display: none; + } + .group-page-view-switch { + margin: 6px .5rem 0 0; + } + .group-page-section { + padding-top: 60px; + } + .group-page-bar {} + .btn { padding: 2px 5px; + } } .group-page li a { - text-decoration: none; + text-decoration: none; } -.group-page .group-page-feed-view .active { +.group-page-switch-btn { + color: $blue; + &:hover { color: $white; + } } /* 600px */ @media screen and (min-width: 37.5rem) { - .group-page-post { - margin-bottom: 15px; - text-align: left; - } - .group-page-post-image-wrap { - float: left; - width: 12%; - min-width: 100px; - margin-right: 4%; - } - .group-page-post-content-wrap { - float: left; - width: 70%; - } - .group-page.scroll .group-page-view-switch { - margin: 6px .5rem 0 0; - } - .group-page.scroll .group-page-bar { - position: fixed; - top: 70px; - width: 100%; - padding: 0 5rem 0 2rem; - } + .group-page-post { + margin-bottom: 35px; + text-align: left; + } + .group-page-post-image-wrap { + float: left; + width: 12%; + min-width: 100px; + margin-right: 4%; + max-height: 140px; + overflow: hidden; + } + .group-page-post-content-wrap { + float: left; + width: 70%; + font-family: $paragraph-font; + } } /* 760px */ @media screen and (min-width: 47.5rem) { - .group-page-post-content-wrap { - width: 70%; - } - .group-page-bar { - text-align: left; - } - .group-page-title { - float: left; - margin: 0; - padding: 0; - } - .group-page-new-post { - float: right; - } - .group-page-view-switch { - float: right; - } + .group-page-post-content-wrap { + width: 70%; + } + .group-page-bar { + text-align: left; + } + .group-page-title { + display: inline-block; + margin: 0; + padding: 0; + line-height: 70px; + transition: .6s all; + } + .group-page-new-post {} + .group-page-view-switch { + float: right; + } } // 900px @@ -329,101 +434,117 @@ img { // Group post .group-post { - width: 980px; - margin: auto; + width: 980px; + margin: auto; } .group-post-meta { - margin-bottom: 15px; -} - -.group-post-heading-wrap { + margin-bottom: 15px; } .group-post-title { - font-family: $main-font; - float: left; + font-family: $main-font; + float: left; + width: 90%; } .group-post-avatar-wrap { - float: right; + float: right; + padding: 20px 0.375rem 0 0; } + .group-post-avatar-username-toggle { - display: block + display: block; } .group-post-avatar { - width: 60px; - height: 60px; - border-radius: 50%; + width: 60px; + height: 60px; + border-radius: 50%; } .group-post-username { - display: none; - top: 100%; - padding-bottom: 30px; - right: 0; + display: none; + top: 100%; + padding-bottom: 30px; + right: 0; + left: auto; + white-space: nowrap; + &:after { + border-top-color: transparent; + border-bottom-color: rgba(0, 0, 0, 0.85); + top: -10px; left: auto; - &:after { - border-top-color: transparent; - border-bottom-color: rgba(0, 0, 0, 0.85); - top: -10px; - left: auto; - right: 20px; - bottom: auto; - } + right: 20px; + bottom: auto; + } } .group-post-postdate { - display: inline-block; - margin-right: 1rem; - clear: both; + display: inline-block; + margin-right: 1rem; + clear: both; } - .group-post-image-wrap { - position: relative; + position: relative; + background: $black; + &:hover { + .cycle-nav { + opacity: 1; + } + .group-post-cycle-prev { + left: 2rem; + } + .group-post-cycle-next { + right: 2rem; + } + } } .group-post-image-list { - margin: 0; - padding: 0; - list-style: none; + margin: 0; + padding: 0; + list-style: none; } .cycle-nav { - font-size: 1.2rem; - position: absolute; - line-height: 2.7rem; - z-index: 500; - width: 2.5rem; - height: 2.5rem; - cursor: pointer; - -webkit-transition: .3s all; - transition: .3s all; - text-align: center; - opacity: .5; - color: $white; - border-radius: 50%; - background-color: rgba($white, 0.2); - &:hover { - opacity: 1; - background-color: $blue; - } + font-size: 1.2rem; + position: absolute; + top: 50%; + margin-top: -1.25rem; + line-height: 1.5rem; + color: $white; + z-index: 500; + width: 2.5rem; + height: 2.5rem; + cursor: pointer; + -webkit-transition: $normal all; + transition: $normal all; + text-align: center; + background-color: rgba($black, 0.8); + border-radius: 50%; + opacity: 0; + &:hover { + background-color: $blue; + } + .group-post-cycle-nav-icon { + line-height: 2.6rem; + } } .group-post-cycle-prev { - left: 2rem; + left: 0; } .group-post-cycle-next { - right: 2rem; + right: 0; } .group-post-content { - font-family: $main-font; - font-size: .8125rem; - margin: 15px 0; + font-family: $main-font; + font-size: .8125rem; + margin: 15px 0; } .group-post-attachment-wrap { @@ -432,9 +553,9 @@ img { } .group-post-attachment-icon { - font-size: 1rem; - padding: 6px 4px 0 0; - float: left; + font-size: 1rem; + padding: 6px 4px 0 0; + float: left; } .group-post-attachments { @@ -442,70 +563,69 @@ img { padding-left: 0.5rem; float: left; width: 95%; - a { + a { margin-bottom: 10px; - } + } } - .group-post-seen-by { - float: right; - cursor: pointer; - &:hover { - .group-post-seen-by-names { - display: block; - } - } - .group-post-seen-by-name { - display: block; - color: #fff; + float: right; + cursor: pointer; + &:hover { + .group-post-seen-by-names { + display: block; } + } + .group-post-seen-by-name { + display: block; + color: #fff; + } } .group-post-seen-by-lead { - margin-right: 4px; + margin-right: 4px; } .group-post-seen-by-names { - display: none; + display: none; } .comments { - clear: both + clear: both; } .group-post-respond-comment { - width: 100%; + width: 100%; } .group-post-comment-list { - margin: 0; - padding: 0; - list-style: none; + margin: 0; + padding: 0; + list-style: none; } .group-post-comment-wrap { - overflow: hidden; - margin-bottom: 25px; - padding-bottom: 8px; - border-bottom: 1px solid $light-gray; + overflow: hidden; + margin-bottom: 25px; + padding-bottom: 8px; + border-bottom: 1px solid $light-gray; } .group-post-comment-avatar { - float: left; - width: 8%; - img { - width: 60px; - height: 60px; - border-radius: 50%; - } + float: left; + width: 8%; + img { + width: 60px; + height: 60px; + border-radius: 50%; + } } .group-post-comment-author { - font-size: .9375rem; + font-size: .9375rem; } .group-post-comment-body { - float: left; - width: 80%; + float: left; + width: 80%; } \ No newline at end of file diff --git a/app/assets/stylesheets/lib/group.css b/app/assets/stylesheets/lib/group.css deleted file mode 100644 index 47e1dc8..0000000 --- a/app/assets/stylesheets/lib/group.css +++ /dev/null @@ -1,2 +0,0 @@ -body { -} \ No newline at end of file diff --git a/app/templates/orbit_bootstrap/assets/javascripts/app.js b/app/templates/orbit_bootstrap/assets/javascripts/app.js index 139e974..7c20337 100644 --- a/app/templates/orbit_bootstrap/assets/javascripts/app.js +++ b/app/templates/orbit_bootstrap/assets/javascripts/app.js @@ -4,7 +4,8 @@ function init() { var doc = document, - lang = doc.documentElement.lang; + lang = doc.documentElement.lang, + pageModule = doc.body.getAttribute( "data-module" ); var orbit = { @@ -68,7 +69,7 @@ i = -1, elsLen = els.length; - for( i = 0; i < elsLen; i ++ ) { + for ( i = 0; i < elsLen; i ++ ) { if ( els[ i ].firstChild !== null ) { if( els[ i ].firstChild.length > maxLen ) { newTitle = els[ i ].firstChild.textContent; @@ -79,6 +80,20 @@ } }, + member: { + equalHeight: function() { + var bigbrother = -1; + + $( ".i-member-item" ).each( function() { + bigbrother = bigbrother > $( ".i-member-item" ).height() ? bigbrother : $( ".i-member-item" ).height(); + }); + + $( ".i-member-item" ).each( function() { + $( ".i-member-item" ).height( bigbrother ); + }); + } + }, + // Add link and cursor class name on element that has data-link attribute addLinkOnADBanner: function( els ) { $.each( els, function() { @@ -115,12 +130,13 @@ } // Specific functions that will be running on homepage - if ( doc.body.getAttribute( "data-module" ) === "home" ) { + if ( pageModule === "home" ) { } // Functions that will be running on every page orbit.sitemenuDropdown(); + orbit.member.equalHeight(); orbit.plugins.bullEye(); } 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 3e6534b..03b86f8 100644 --- a/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_global.scss +++ b/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_global.scss @@ -26,3 +26,12 @@ th, td { 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; +} \ No newline at end of file diff --git a/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_variables.scss b/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_variables.scss index 3064767..7e86c90 100644 --- a/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_variables.scss +++ b/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_variables.scss @@ -1,8 +1,5 @@ @charset "utf-8"; -// Google fonts -@import url(http://fonts.googleapis.com/css?family=Roboto); - // Base Color $theme-gray: #495054; $theme-gray-light: #cecece; @@ -17,11 +14,13 @@ $theme-color-main: #47bab5; $theme-color-second: #5bc0de; $theme-color-third: #ed4c43; - // Font stacks $main-font: 'Roboto', "微軟正黑體", "Helvetica Neue", Helvetica, sans-serif; $sub-font: 'Roboto', "新細明體", "Helvetica Neue", Helvetica, sans-serif; +// Font sizes +$font-15: 0.9375rem; +$font-13: 0.8125rem; // // Modules @@ -71,3 +70,10 @@ $table-th-bgcolor: $theme-color-main; // Font sizes $w-item-heading-font-size: 0.85rem; + + +// +// Member Module +// -------------------------------------------------- + +$border-width: 4px; \ No newline at end of file diff --git a/app/templates/orbit_bootstrap/assets/stylesheets/template/init.scss b/app/templates/orbit_bootstrap/assets/stylesheets/template/init.scss deleted file mode 100644 index ba687b7..0000000 --- a/app/templates/orbit_bootstrap/assets/stylesheets/template/init.scss +++ /dev/null @@ -1,4 +0,0 @@ -@import "bootstrap/mixins"; -@import "bootstrap/variables"; -@import "base/mixins"; -@import "base/variables"; diff --git a/app/templates/orbit_bootstrap/assets/stylesheets/template/initial.scss b/app/templates/orbit_bootstrap/assets/stylesheets/template/initial.scss index 694cb99..493bbbb 100644 --- a/app/templates/orbit_bootstrap/assets/stylesheets/template/initial.scss +++ b/app/templates/orbit_bootstrap/assets/stylesheets/template/initial.scss @@ -1,4 +1,3 @@ -@import url("http://fonts.googleapis.com/css?family=Droid+Sans:400,700"); @import "bootstrap/mixins"; @import "bootstrap/variables"; @import "base/mixins"; diff --git a/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/ad_banner.scss b/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/ad_banner.scss index 9bef0ac..35b53e3 100644 --- a/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/ad_banner.scss +++ b/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/ad_banner.scss @@ -1,9 +1,10 @@ @charset "utf-8"; + @import "../initial"; // // Widget -// +// // Widget // ## gerenral styles @@ -15,19 +16,46 @@ } } +.w-ad-banner__wrap { + width: 100%; +} -// Widget 1 +.w-ad-banner__slide { + width: 100%; +} + +.banner-pager { + @include list-reset; + position: absolute; + right: 1em; + top: 1em; + z-index: 200; + + li { + display: inline-block; + } + + a { + background: $theme-color-main; + display: inline-block; + margin-right: 0.25em; + width: 0.8em; + height: 0.8em; + border-radius: 50%; + opacity: .5; + } + + .active-slide a { + opacity: 1; + } +} + +.banner-responsive { + width: 100%; +} + +// Widget 1 .ad-banner-widget-1 { - .w-ad-banner__wrap { - width: 100%; - } - .w-ad-banner__slide { - width: 100%; - } - .w-ad-banner__image { - width: 100%; - height: auto; - } .w-ad-banner__caption { background: $theme-color-main; color: $theme-white; @@ -44,123 +72,50 @@ font-family: $main-font; font-size: $w-caption-desc; } - - } - .w-ad-banner__pager { - @include list-reset(); - position: absolute; - right: 1em; - top: 1em; - z-index: 200; - - li { - display: inline-block; - } - - a { - background: $theme-color-main; - display: inline-block; - margin-right: 0.25em; - width: 0.8em; - height: 0.8em; - border-radius: 50%; - opacity: 0.5; - } - - .active-slide a{ - opacity: 1; - } } } -// Widget 2 +// Widget 2 .ad-banner-widget-2 { - .w-ad-banner__wrap { - width: 100%; - } - .w-ad-banner__slide { - width: 100%; - } .w-ad-banner__image { width: 100%; height: auto; } - .youtube { - } + .youtube, .cycle-youtube { width: 100%; height: 100%; } - object, embed{ - width: 100%; - height: 100%; + + object, embed { + width: 100%; + height: 100%; } - .w-ad-banner__pager { - @include list-reset(); - position: absolute; + + .banner-pager { right: 1em; bottom: 1em; z-index: 102; - - li { - display: inline-block; - } - - a { - background: $theme-color-main; - display: inline-block; - margin-right: 0.25em; - width: 0.8em; - height: 0.8em; - border-radius: 50%; - opacity: 0.5; - } - - .active-slide a{ - opacity: 1; - } } } - // Widget 3 .ad-banner-widget-3 { - .w-ad-banner__wrap { + .w-ad-banner__wrap { width: 100%; } + .w-ad-banner__slide { width: 100%; } - .w-ad-banner__image { - width: 100%; - height: auto; - } - .w-ad-banner__pager { - @include list-reset(); - position: absolute; + + .banner-pager { + top: auto; right: 1em; bottom: 1em; - z-index: 200; - - li { - display: inline-block; - } - - a { - background: $theme-color-main; - display: inline-block; - margin-right: 0.25em; - width: 0.8em; - height: 0.8em; - border-radius: 50%; - opacity: 0.5; - } - .active-slide a{ - opacity: 1; - } } } -.cycle-slide-active{ +.cycle-slide-active { z-index: 101 !important; } \ No newline at end of file diff --git a/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/announcement.scss b/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/announcement.scss index a5918d0..e9eeebb 100644 --- a/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/announcement.scss +++ b/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/announcement.scss @@ -1,380 +1,500 @@ @charset "utf-8"; + @import "../initial"; // // Widget -// +// // Announcement widget // ## Gerneral styles for widgets .w-annc { - .w-annc__widget-title { - @extend .unity-title; + .w-annc__widget-title { + @extend .unity-title; + } + + .w-annc__list { + margin: 0; + padding: 0; + list-style: none; + } + + .w-annc__item { + margin-bottom: 30px; + } + + .label { + font-size: 0.75rem; + font-weight: normal; + } + + .w-annc__meta { + .w-annc__status-wrap, + .w-annc__postdate-wrap, + .w-annc__category-wrap { + display: inline-block; + margin-right: 0.2em; + font-size: 0.8125em; + color: $theme-gray; + font-weight: normal; } - .w-annc__list { - margin: 0; - padding: 0; - list-style: none; + + i { + color: $theme-gray; } - .w-annc__item { - margin-bottom: 30px; - } - .label { - font-size: 0.75rem; - font-weight: normal; - } - .w-annc__meta { - .w-annc__status-wrap, - .w-annc__postdate-wrap, - .w-annc__category-wrap { - display: inline-block; - margin-right: 0.2em; - font-size: 0.8125em; - color: $theme-gray; - font-weight: normal; - } - i { - color: $theme-gray; - } - } - .status-top { - background: $theme-color-second; - } - .status-hot { - background: $theme-color-third; - } - .w-annc__subtitle { - font-size: 0.8125em; - color: $theme-gray; - } - .w-annc__entry-title { - margin-bottom: 10px; - } - .w-annc__title { - font-family: $sub-font; - color: $theme-color-main; - text-decoration: none; - font-size: 0.8125rem; - &:hover { - color: darken($theme-color-main, 10%); - } + } + + .status-top { + background: $theme-color-second; + } + + .status-hot { + background: $theme-color-third; + } + + .w-annc__subtitle { + font-size: 0.8125em; + color: $theme-gray; + } + + .w-annc__entry-title { + margin-bottom: 10px; + } + + .w-annc__title { + font-family: $sub-font; + color: $theme-color-main; + text-decoration: none; + font-size: 0.8125rem; + + &:hover { + color: darken($theme-color-main, 10%); } + } } // Widget-1 .widget-announcement-1 { - .w-annc__img-wrap { - height: 200px; - margin: 0 0 1em 0; - } - .w-annc__title { - font-family: $main-font; - line-height: 1.3; - font-size: 1.2rem; - } + .w-annc__img-wrap { + height: 200px; + margin: 0 0 1em 0; + } + + .w-annc__title { + font-family: $main-font; + line-height: 1.3; + font-size: 1.2rem; + } } // Widget-2 .widget-announcement-2 { - .w-annc__img-wrap { - height: 200px; - margin: 0 0 1em 0; - } - .w-annc__title { - font-family: $main-font; - line-height: 1.3; - font-size: 1.2rem; - } + .w-annc__img-wrap { + height: 200px; + margin: 0 0 1em 0; + } + + .w-annc__title { + font-family: $main-font; + line-height: 1.3; + font-size: 1.2rem; + } } // Widget-3 .widget-announcement-3 { - .w-annc__img-wrap { - height: 200px; - margin: 0 0 1em 0; - } - .w-annc__title { - font-family: $main-font; - line-height: 1.3; - font-size: 1.2rem; - } + .w-annc__img-wrap { + height: 200px; + margin: 0 0 1em 0; + } + + .w-annc__title { + font-family: $main-font; + line-height: 1.3; + font-size: 1.2rem; + } } // Widget-4 .widget-announcement-4 { - .w-annc__title { - font-family: $main-font; - line-height: 1.3; - font-size: 1.2rem; - } - .w-annc__list > .w-annc__item:nth-child(3n+1) { - clear: both; - } - .w-annc__img-wrap { - height: 200px; - margin: 0 0 1em 0; - } + .w-annc__title { + font-family: $main-font; + line-height: 1.3; + font-size: 1.2rem; + } + + .w-annc__list > .w-annc__item:nth-child(3n+1) { + clear: both; + } + + .w-annc__img-wrap { + height: 200px; + margin: 0 0 1em 0; + } } // Widget-5 .widget-announcement-5 { - .w-annc__title { - font-family: $main-font; - line-height: 1.3; - font-size: 1.2rem; - } - .w-annc__item { - border-bottom: 1px dashed lighten($theme-gray, 65%); - padding-bottom: 1em; - margin-bottom: 1em; - } + .w-annc__title { + font-family: $main-font; + line-height: 1.3; + font-size: 1.2rem; + } + + .w-annc__item { + border-bottom: 1px dashed lighten($theme-gray, 65%); + padding-bottom: 1em; + margin-bottom: 1em; + } } // Widget-6 .widget-announcement-6 { - .w-annc__item { - margin-bottom: 0.8em; - padding-bottom: 0.8em; - border-bottom: 1px dashed lighten($theme-gray, 65%); - } - .w-annc__entry-title { - margin: 0; - } - .w-annc__category-wrap, - .w-annc__status, - .w-annc__title, - .w-annc__postdate-wrap { - font-size: 0.8125rem; - } - .w-annc__status { - display: inline-block; - } + .w-annc__item { + margin-bottom: 0.8em; + padding-bottom: 0.8em; + border-bottom: 1px dashed lighten($theme-gray, 65%); + } + + .w-annc__entry-title { + margin: 0; + } + + .w-annc__category-wrap, + .w-annc__status, + .w-annc__title, + .w-annc__postdate-wrap { + font-size: 0.8125rem; + } + + .w-annc__status { + display: inline-block; + } } // Widget-7 .widget-announcement-7 { - .w-annc__item { - margin-bottom: 0.8em; - padding-bottom: 0.8em; - border-bottom: 1px dashed lighten($theme-gray, 65%); - } - .w-annc__entry-title { - margin: 0; - } - .w-annc__category-wrap, - .w-annc__status, - .w-annc__title, - .w-annc__postdate-wrap { - font-size: 0.75rem; - } - .w-annc__status { - display: inline-block; - } + .w-annc__item { + margin-bottom: 0.8em; + padding-bottom: 0.8em; + border-bottom: 1px dashed lighten($theme-gray, 65%); + } + + .w-annc__entry-title { + margin: 0; + } + + .w-annc__category-wrap, + .w-annc__status, + .w-annc__title, + .w-annc__postdate-wrap { + font-size: 0.75rem; + } + + .w-annc__status { + display: inline-block; + } } // Widget-8 // ## Table .widget-announcement-8 { - .w-annc__th { - color: #fff; - background: $theme-color-main; - font-size: 0.8125em; - border: none; - } - .w-annc__status { - display: inline-block; - font-size: 0.75rem; - } - td { - font-size: 0.8125em; - } - a:hover { - text-decoration: none; - } + .w-annc__th { + color: #fff; + background: $theme-color-main; + font-size: 0.8125em; + border: none; + } + + .w-annc__status { + display: inline-block; + font-size: 0.75rem; + } + + td { + font-size: 0.8125em; + } + + a:hover { + text-decoration: none; + } } // Widget-9 // ## Table .widget-announcement-9 { - .w-annc__th { - color: #fff; - background: $theme-color-main; - font-size: 0.8125em; - border: none; - } - .w-annc__status { - display: inline-block; - font-size: 0.75rem; - } - td { - font-size: 0.8125em; - } - a:hover { - text-decoration: none; - } + .w-annc__th { + color: #fff; + background: $theme-color-main; + font-size: 0.8125em; + border: none; + } + + .w-annc__status { + display: inline-block; + font-size: 0.75rem; + } + + td { + font-size: 0.8125em; + } + + a:hover { + text-decoration: none; + } } // Widget-10 .widget-announcement-10 { - .w-annc__item { - margin-bottom: 0.8em; - padding-bottom: 0.8em; - border-bottom: 1px dashed lighten($theme-gray, 65%); - } - .w-annc__entry-title { - margin: 0; - } - .w-annc__postdate-wrap { - font-size: 0.8125em; - } - .w-annc__status { - display: inline-block; - font-size: 0.75rem; - } + .w-annc__item { + margin-bottom: 0.8em; + padding-bottom: 0.8em; + border-bottom: 1px dashed lighten($theme-gray, 65%); + } + + .w-annc__entry-title { + margin: 0; + } + + .w-annc__postdate-wrap { + font-size: 0.8125em; + } + + .w-annc__status { + display: inline-block; + font-size: 0.75rem; + } } // Widget-11 -// ## Table .widget-announcement-11 { - .w-annc__th { - color: #fff; - background: $theme-color-main; - font-size: 0.8125em; - border: none; - } - .w-annc__status { - display: inline-block; - font-size: 0.75rem; - } - td { - font-size: 0.8125em; - } - a:hover { - text-decoration: none; - } + .w-annc__item { + margin-bottom: 0.8em; + padding-bottom: 0.8em; + border-bottom: 1px dashed lighten($theme-gray, 65%); + } + + .w-annc__entry-title { + margin: 0; + } + + .w-annc__postdate-wrap { + font-size: 0.8125em; + } + + .w-annc__status { + display: inline-block; + font-size: 0.75rem; + } } // Widget-12 +// ## Table .widget-announcement-12 { - .w-annc__list { - padding: 0 15px; + .w-annc__th { + color: #fff; + background: $theme-color-main; + font-size: 0.8125em; + border: none; + } + + .w-annc__status { + display: inline-block; + font-size: 0.75rem; + } + + td { + font-size: 0.8125em; + } + + a:hover { + text-decoration: none; + } +} + +// Widget-13 +// ## Table +.widget-announcement-13 { + .w-annc__th { + color: #fff; + background: $theme-color-main; + font-size: 0.8125em; + border: none; + } + + .w-annc__status { + display: inline-block; + font-size: 0.75rem; + } + + td { + font-size: 0.8125em; + } + + a:hover { + text-decoration: none; + } +} + +// Widget-14 +.widget-announcement-14 { + .w-annc__list { + padding: 0 15px; + } + + .w-annc__img-wrap { + height: 300px; + margin-bottom: 15px; + + @media (min-width: $screen-md) { + height: 200px; + margin-bottom: 0; } - .w-annc__img-wrap { - height: 300px; - margin-bottom: 15px; - @media (min-width: $screen-md) { - height: 200px; - margin-bottom: 0; - } - } - .w-annc__item { - margin-bottom: 0.8em; - padding-bottom: 0.8em; - border-bottom: 1px dashed lighten($theme-gray, 65%); - } - .w-annc__entry-title { - margin: 0 0 10px 0; - @media (min-width: $screen-md) { - margin-bottom: 0; - } - } - .w-annc__postdate-wrap { - font-size: 0.8125em; - } - .w-annc__status { - display: inline-block; - } - .w-annc__postdate { - font-size: 0.8125rem; + } + + .w-annc__item { + margin-bottom: 0.8em; + padding-bottom: 0.8em; + border-bottom: 1px dashed lighten($theme-gray, 65%); + } + + .w-annc__entry-title { + margin: 0 0 10px 0; + + @media (min-width: $screen-md) { + margin-bottom: 0; } + } + + .w-annc__postdate-wrap { + font-size: 0.8125em; + } + + .w-annc__status { + display: inline-block; + } + + .w-annc__postdate { + font-size: 0.8125rem; + } } // Announcement index // ## General style for index pages .i-annc { - .i-annc__page-title { - @extend .unity-title; + .i-annc__page-title { + @extend .unity-title; + } + + .i-annc__list { + margin: 0; + padding: 0; + list-style: none; + } + + .status-top { + background: $theme-color-second; + } + + .status-hot { + background: $theme-color-third; + } + + .i-annc__widget-title { + @extend .unity-title; + } + + .i-annc__item { + margin-bottom: 30px; + } + + .i-annc__img { + width: 100%; + max-width: 100%; + height: auto; + } + + .i-annc__th { + color: #fff; + background: $theme-color-main; + font-size: 0.8125em; + border: none; + white-space: nowrap; + } + + .i-annc__status-wrap { + span { + display: inline-block; + padding: .2em .6em .3em; + + &:last-child { + margin: 0 5px 3px 0; + display: inline-block; + } } - .i-annc__list { - margin: 0; - padding: 0; - list-style: none; + } + + td { + font-size: 0.8125rem; + } + + .i-annc__title:hover { + text-decoration: none; + } + + .label { + font-size: 0.75rem; + font-weight: normal; + } + + .i-annc__meta { + .i-annc__status-wrap, + .i-annc__postdate-wrap, + .i-annc__category-wrap { + display: inline-block; + margin-right: 0.2em; + font-size: 0.8125em; + color: $theme-gray; + font-weight: normal; } - .status-top { - background: $theme-color-second; + + i { + color: $theme-gray; } - .status-hot { - background: $theme-color-third; - } - .w-annc__widget-title { - @extend .unity-title; - } - .i-annc__item { - margin-bottom: 30px; - } - .i-annc__img { - width: 100%; - max-width: 100%; - height: auto; - } - .label { - font-size: 0.75rem; - font-weight: normal; - } - .i-annc__meta { - .i-annc__status-wrap, - .i-annc__postdate-wrap, - .i-annc__category-wrap { - display: inline-block; - margin-right: 0.2em; - font-size: 0.8125em; - color: $theme-gray; - font-weight: normal; - } - i { - color: $theme-gray; - } - } - .i-annc__subtitle { - font-size: 0.8125em; - color: $theme-gray; - } - .i-annc__entry-title { - margin-bottom: 10px; - } - .i-annc__title { - font-family: $sub-font; - color: $theme-color-main; - text-decoration: none; - font-size: 0.8125rem; - &:hover { - color: darken($theme-color-main, 10%); - } + } + + .i-annc__subtitle { + font-size: 0.8125em; + color: $theme-gray; + } + + .i-annc__entry-title { + margin-bottom: 10px; + } + + .i-annc__title { + font-family: $sub-font; + color: $theme-color-main; + text-decoration: none; + font-size: 0.8125rem; + + &:hover { + color: darken($theme-color-main, 10%); } + } } // Index-1 -.index-announcement-1 { - .i-annc__th { - color: #fff; - background: $theme-color-main; - font-size: 0.8125em; - border: none; - } - td { - font-size: 0.8125rem; - } - .i-annc__title:hover { - text-decoration: none; - } -} +.index-announcement-1 {} -// Index-2 -.index-announcement-2, -.index-announcement-3 { +// Index-5 +// Index-6 +.index-announcement-5, +.index-announcement-6 { .i-annc__img-wrap { margin: 0 0 1em; } + .i-annc__title { font-family: $main-font; font-size: 1.2rem; @@ -382,73 +502,177 @@ } } +// Index-7 +.index-announcement-7 { + .i-annc__title { + font-family: $main-font; + line-height: 1.3; + font-size: 1.2rem; + } + + .i-annc__list > .i-annc__item:nth-child(3n+1) { + clear: both; + } + + .i-annc__img-wrap { + height: 200px; + margin: 0 0 1em 0; + } +} + +// Index-8 +.index-announcement-8 { + .i-annc__title { + font-family: $main-font; + line-height: 1.3; + font-size: 1.2rem; + } + + .i-annc__item { + border-bottom: 1px dashed lighten($theme-gray, 65%); + padding-bottom: 1em; + margin-bottom: 1em; + } +} + +// Index-9 +// Index-10 +.index-announcement-9, +.index-announcement-10 { + .i-annc__item { + margin-bottom: 0.8em; + padding-bottom: 0.8em; + border-bottom: 1px dashed lighten($theme-gray, 65%); + } + + .i-annc__entry-title { + margin: 0; + } + + .i-annc__category-wrap, + .i-annc__status, + .i-annc__title, + .i-annc__postdate-wrap { + font-size: 0.8125rem; + } + + .i-annc__status { + display: inline-block; + } +} + + +// Index-11 +// Index-12 +.index-announcement-11, +.index-announcement-12 { + .i-annc__item { + margin-bottom: 0.8em; + padding-bottom: 0.8em; + border-bottom: 1px dashed lighten($theme-gray, 65%); + } + + .i-annc__entry-title { + margin: 0; + } + + .i-annc__postdate-wrap { + font-size: 0.8125em; + } + + .i-annc__status { + display: inline-block; + font-size: 0.75rem; + } +} + +// Index-16 +.index-announcement-16 { + td ul { + margin: 0; + padding: 0; + list-style: none; + } +} + // Announcement show .s-annc { - .s-annc__show-title { - @extend .unity-title; - } - .s-annc__meta-wrap { - border-bottom: 1px solid $theme-gray-light; - @include clearfix; - .s-annc__meta--item { - font-size: 0.875rem; - margin-right: 1em; - margin-bottom: 0.6em; - float: left; - i { - color: darken($theme-gray-light, 10%); - } - } - .s-annc__tag-wrap { - position: relative; - margin-right: 0; - padding-left: 1.6em; - clear: both; - float: none; - i { - position: absolute; - top: 7px; - left: 0; - } - } - .s-annc__tag-wrap { - .s-annc__tag { - font-weight: normal; - } - } - } - .s-annc__post-wrap { - @include clearfix; - margin-bottom: 2em; - } - .s-annc__related-wrap { - padding-top: 1em; - border-top: 1px dotted $theme-gray-light; - } - .s-annc__related-file { - margin-bottom: 15px; - } - .s-annc__related-file, - .s-annc__related-link { - padding-bottom: 6px; - padding-left: 1.6em; - i { - margin: 8px 0 0 -1.6em; - float: left; - color: darken($theme-gray-light, 10%); - } - a { + .s-annc__show-title { + @extend .unity-title; + } - } + .s-annc__meta-wrap { + border-bottom: 1px solid $theme-gray-light; + @include clearfix; + + .s-annc__meta--item { + font-size: 0.875rem; + margin-right: 1em; + margin-bottom: 0.6em; + float: left; + + i { + color: darken($theme-gray-light, 10%); + } } - .s-annc__related-link-list, - .s-annc__related-file-list { - display: inline-block; + + .s-annc__tag-wrap { + position: relative; + margin-right: 0; + padding-left: 1.6em; + clear: both; + float: none; + + i { + position: absolute; + top: 7px; + left: 0; + } } - .s-annc__flie-title { - max-width: 9.375rem; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; + + .s-annc__tag-wrap { + .s-annc__tag { + font-weight: normal; + } } + } + + .s-annc__post-wrap { + @include clearfix; + margin-bottom: 2em; + } + + .s-annc__related-wrap { + padding-top: 1em; + border-top: 1px dotted $theme-gray-light; + } + + .s-annc__related-file { + margin-bottom: 15px; + } + + .s-annc__related-file, + .s-annc__related-link { + padding-bottom: 6px; + padding-left: 1.6em; + + i { + margin: 8px 0 0 -1.6em; + float: left; + color: darken($theme-gray-light, 10%); + } + a {} + } + + .s-annc__related-link-list, + .s-annc__related-file-list { + display: inline-block; + } + + .s-annc__flie-title { + max-width: 9.375rem; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } } \ 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 9d084b3..67c9a3f 100644 --- a/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/member.scss +++ b/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/member.scss @@ -1,54 +1,101 @@ @charset "utf-8"; @import "../initial"; - -// Member index page -.index-member { - .index-title { - @extend .unity-title; - } - th, - td { - font-family: $sub-font; - font-size: .8125rem; - } - th[class^="member-data-title"] { - white-space: nowrap; - } - .index-member-item { - min-height: 200px; - margin-bottom: 20px; - } - .index-member-item:nth-child(2n+1) { - clear: both; - } - .member-data-title-job-title:before, - .member-data-title-name:before, - .member-data-title-email:before, - .member-data-title-office-tel:before { - font-family: "fontAwesome"; - font-size: .75rem; - display: inline-block; - min-width: 15px; - margin-right: .3125rem; - content: "\f007"; - color: gray; - } - .member-data-title-job-title:before { - content: "\f19d"; - } - .member-data-title-email:before { - content: "\f0e0"; - } - .member-data-title-office-tel:before { - content: "\f098"; - } - .member-profile-data-wrap { - overflow: hidden; - } - .member-pic { - border-radius: .25rem; +// +// Index +// +// Member Index +// ## Gerneral styles for Index +.i-member-section { + max-width: 500px; + margin: auto; + @media screen and (min-width: $screen-sm) { + max-width: 100%; } } + +.i-member-status-title { + @extend .unity-title; +} + +.i-member-item-inner { + background: none; + border-radius: 0.25rem; + padding: 24px 1rem; + margin-bottom: 16px; + @media screen and (min-width: $screen-sm) { + background: $theme-gray-lighter; + } +} + +.i-member-pic-wrap { + height: auto; + margin-bottom: 16px; + + @media screen and (min-width: $screen-sm) { + position: relative; + overflow: hidden; + height: 125px; + } +} + +.i-member-pic { + width: 100%; + + @media screen and (min-width: $screen-sm) { + position: absolute; + top: -100%; + left: 0; + right: 0; + bottom: -100%; + margin: auto; + width: 100%; + } +} + +.i-member-profile-list { + @include list-reset; +} + +.i-member-profile-item { + margin-bottom: 8px; + font-size: $font-13; +} + +.member-data-title-job-title:before, +.member-data-title-name:before, +.member-data-title-email:before, +.member-data-title-office-tel:before { + font-family: "fontAwesome"; + font-size: .75rem; + display: inline-block; + min-width: 15px; + margin-right: .3125rem; + content: "\f007"; + text-align: center; + color: $theme-gray; +} + +.member-data-title-job-title:before { + content: "\f19d"; +} + +.member-data-title-email:before { + content: "\f0e0"; +} + +.member-data-title-office-tel:before { + content: "\f098"; +} + +// Index 3 +.i-member-item:nth-child( even) { + .i-member-item-inner {} +} + +.i-member-pic-wrap { + padding: 0; +} + // Member show page .show-member { font-family: $sub-font; diff --git a/app/templates/orbit_bootstrap/assets/stylesheets/template/template.scss b/app/templates/orbit_bootstrap/assets/stylesheets/template/template.scss index 006f71d..ef7c34f 100644 --- a/app/templates/orbit_bootstrap/assets/stylesheets/template/template.scss +++ b/app/templates/orbit_bootstrap/assets/stylesheets/template/template.scss @@ -1,3 +1,5 @@ +@import url("http://fonts.googleapis.com/css?family=Droid+Sans:400,700"); + // Base @import "base/pagination"; @import "base/orbitbar-override"; 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 31c154f..867eeb4 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,7 +5,7 @@ data-cycle-slides=".w-ad-banner__slide" data-cycle-log="false" data-overlay=".w-ad-banner__caption" - data-pager=".w-ad-banner__pager" + data-pager=".w-ad-banner__pager-1" data-pager-template="
    • " data-pager-active-class="active-slide" > @@ -15,11 +15,11 @@ data-cycle-desc="{{context}}" data-overlay-template="

    {{title}}

    {{desc}}" > - +
    -
      + 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 842ebc3..b820dbd 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 @@ -1,4 +1,4 @@ -
      +
      -
        +
        \ No newline at end of file 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 0524e45..abf99db 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,16 +4,19 @@ data-level="0" data-cycle-slides=".w-ad-banner__slide" data-cycle-log="false" - data-pager=".w-ad-banner__pager" + 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/info.json b/app/templates/orbit_bootstrap/modules/ad_banner/info.json index b1a540b..8b460b0 100644 --- a/app/templates/orbit_bootstrap/modules/ad_banner/info.json +++ b/app/templates/orbit_bootstrap/modules/ad_banner/info.json @@ -19,8 +19,8 @@ { "filename" : "ad_banner_widget3", "name" : { - "zh_tw" : "3. 廣告輪播 ( 圖片 )", - "en" : "3. AD banner ( image )" + "zh_tw" : "3. 橫幅輪播 ( 圖片, 導航圖示 )", + "en" : "3. Carousel ( image, navigation )" }, "thumbnail" : "thumbnail-block.png" }, 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 dcbe3e5..16d806e 100644 --- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget11.html.erb +++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget11.html.erb @@ -1,24 +1,19 @@ -
          +

          {{widget-title}}

          - - - - - - - - - - - - - -
          {{title-head}}{{date-head}}
          - - {{status}} - - {{title}} - {{postdate}}
          -
          \ No newline at end of file +
            +
          • + + + {{postdate}} + +

            + + {{status}} + + {{title}} +

            +
            • +
          +
          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 07bdcc2..4504ea6 100644 --- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget12.html.erb +++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget12.html.erb @@ -2,26 +2,23 @@

          {{widget-title}}

          -
          -
          - {{main_picture_description}} -
          -
            -
          • -
            -

            + + + + + + + + + + + + + +
            {{title-head}}{{date-head}}
            - {{status}} + {{status}} {{title}} - - - - {{postdate}} - - - - - - - + {{postdate}}
            +

            \ No newline at end of file diff --git a/app/templates/orbit_bootstrap/modules/announcement/annc_index1.html.erb b/app/templates/orbit_bootstrap/modules/announcement/annc_index1.html.erb index c760a99..d0cb9c2 100644 --- a/app/templates/orbit_bootstrap/modules/announcement/annc_index1.html.erb +++ b/app/templates/orbit_bootstrap/modules/announcement/annc_index1.html.erb @@ -1,20 +1,25 @@ -
            +

            {{page-title}}

            - +
            - - - + + + + + - -
            {{date-head}}{{title-head}}{{category-head}}{{category-head}}{{title-head}}{{date-head}}
            {{category}} + + {{status}} + + {{title}} + {{postdate}}{{title}}{{category}}
            -{{pagination_goes_here}} \ No newline at end of file +{{pagination_goes_here}} diff --git a/app/templates/orbit_bootstrap/modules/announcement/annc_index2.html.erb b/app/templates/orbit_bootstrap/modules/announcement/annc_index2.html.erb index a35b028..db83e76 100644 --- a/app/templates/orbit_bootstrap/modules/announcement/annc_index2.html.erb +++ b/app/templates/orbit_bootstrap/modules/announcement/annc_index2.html.erb @@ -1,30 +1,27 @@ -
            +

            {{page-title}}

            -
              -
            • -
              - {{img_description}} -
              -
              -
              - - {{status}} + + + + + + + + + + + + + + + + + +
              {{category-head}}{{title-head}}{{date-head}}{{view-count-head}}
              {{category}} + + {{status}} - - - {{postdate}} - - - - {{category}} - - -

              {{title}} -

              -

              {{subtitle}}

              - - - +               		{{postdate}}{{view_count}}
              -{{pagination_goes_here}} +{{pagination_goes_here}} \ No newline at end of file diff --git a/app/templates/orbit_bootstrap/modules/announcement/annc_index3.html.erb b/app/templates/orbit_bootstrap/modules/announcement/annc_index3.html.erb index 44dd8d9..b7f975f 100644 --- a/app/templates/orbit_bootstrap/modules/announcement/annc_index3.html.erb +++ b/app/templates/orbit_bootstrap/modules/announcement/annc_index3.html.erb @@ -1,30 +1,25 @@ -
              +

              {{page-title}}

              -
                -
              • -
                -
                - - {{status}} + + + + + + + + + + + + + + + +
                {{date-head}}{{title-head}}{{category-head}}
                {{postdate}} + + {{status}} - - - {{postdate}} - - - - {{category}} - - -

                {{title}} -

                -

                {{subtitle}}

                - -
                - {{img_description}} -
                - - +                 		{{category}}
                {{pagination_goes_here}} \ No newline at end of file diff --git a/app/templates/orbit_bootstrap/modules/announcement/info.json b/app/templates/orbit_bootstrap/modules/announcement/info.json index 688368a..bed4a8c 100644 --- a/app/templates/orbit_bootstrap/modules/announcement/info.json +++ b/app/templates/orbit_bootstrap/modules/announcement/info.json @@ -3,26 +3,130 @@ { "filename" : "annc_index1", "name" : { - "zh_tw" : "1. 標準表格列表 ( 模組標題, 日期, 標題, 類別 )", - "en" : "1. Standard Table List (widget-title, postdate, title, category)" + "zh_tw" : "1. 標準標題列表-1A ( 模組標題, 類別, 狀態, 標題, 日期 )", + "en" : "1. Standard Title List-1 (widget-title, category, status, title, postdate)" }, "thumbnail" : "annc_index1_thumbs.png" }, { "filename" : "annc_index2", "name" : { - "zh_tw" : "2. 左圖右文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )", - "en" : "2. Balanced Image + Text(Right) (widget-title, image, status, postdate, category, title, subtitle)" + "zh_tw" : "2. 標準標題列表-1B ( 模組標題, 類別, 狀態, 標題, 日期, 瀏覽人次 )", + "en" : "2. Standard Title List-1B (widget-title, category, status, title, postdate, view-counts)" }, "thumbnail" : "annc_index2_thumbs.png" }, { "filename" : "annc_index3", "name" : { - "zh_tw" : "3. 右圖左文 ( 模組標題, 狀態, 日期, 類別, 標題, 副標題, 圖片 )", - "en" : "3. Balanced Image + Text(left) (widget-title, status, postdate, category, title, subtitle, image)" + "zh_tw" : "3. 標準表格列表-2A ( 模組標題, 日期, 狀態, 標題, 類別 )", + "en" : "3. Standard Table List-2 (widget-title, postdate, status, title, category)" }, "thumbnail" : "annc_index3_thumbs.png" + }, + { + "filename" : "annc_index4", + "name" : { + "zh_tw" : "4. 標準表格列表-2B ( 模組標題, 日期, 狀態, 標題, 類別, 瀏覽人次 )", + "en" : "4. Standard Table List-2 (widget-title, postdate, status, title, category, view-counts)" + }, + "thumbnail" : "annc_index4_thumbs.png" + }, + { + "filename" : "annc_index5", + "name" : { + "zh_tw" : "5. 左圖右文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )", + "en" : "5. Balanced Image + Text(Left) (widget-title, image, status, postdate, category, title, subtitle)" + }, + "thumbnail" : "annc_index5_thumbs.png" + }, + { + "filename" : "annc_index6", + "name" : { + "zh_tw" : "6. 右圖左文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )", + "en" : "6. Balanced Image + Text(Right) (widget-title, image, status, postdate, category, title, subtitle)" + }, + "thumbnail" : "annc_index6_thumbs.png" + }, + { + "filename" : "annc_index7", + "name" : { + "zh_tw" : "7. 三欄圖文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )", + "en" : "7. 3-Column Standard Image + Text (widget-title, image, status, postdate, category, title, subtitle)" + }, + "thumbnail" : "annc_index7_thumbs.png" + }, + { + "filename" : "annc_index8", + "name" : { + "zh_tw" : "8. 標準文字列表 ( 模組標題, 日期, 類別, 狀態, 標題, 副標題 )", + "en" : "8. Standard Text List (widget-title, postdate, category, status, title, subtitle)" + }, + "thumbnail" : "annc_index8_thumbs.png" + }, + { + "filename" : "annc_index9", + "name" : { + "zh_tw" : "9. 標準標題列表-1 ( 模組標題, 類別, 狀態, 標題, 日期 )", + "en" : "9. Standard Title List-1 (widget-title, category, status, title, postdate)" + }, + "thumbnail" : "annc_index9_thumbs.png" + }, + { + "filename" : "annc_index10", + "name" : { + "zh_tw" : "10. 標準標題列表-2 ( 模組標題, 日期, 狀態, 標題, 類別 )", + "en" : "10. Standard Title List-2 (widget-title, postdate, status, title, category)" + }, + "thumbnail" : "annc_index10_thumbs.png" + }, + { + "filename" : "annc_index11", + "name" : { + "zh_tw" : "11. 精簡標題列表-1 ( 模組標題, 狀態, 標題, 日期 )", + "en" : "11. Simple Title List-1 (widget-title, status, title, postdate)" + }, + "thumbnail" : "annc_index11_thumbs.png" + }, + { + "filename" : "annc_index12", + "name" : { + "zh_tw" : "12. 精簡標題列表-2 ( 模組標題, 日期, 狀態, 標題 )", + "en" : "12. Simple Title List-2 (widget-title, postdate, status, title)" + }, + "thumbnail" : "annc_index12_thumbs.png" + }, + { + "filename" : "annc_index13", + "name" : { + "zh_tw" : "13. 精簡表格列表-1 ( 模組標題, 狀態, 標題, 日期 )", + "en" : "13. Simple Table List (widget-title, status, title, postdate)" + }, + "thumbnail" : "annc_index13_thumbs.png" + }, + { + "filename" : "annc_index14", + "name" : { + "zh_tw" : "14. 精簡表格列表-2 ( 模組標題, 日期, 狀態, 標題 )", + "en" : "14. Simple Table List (widget-title, postdate, status, title)" + }, + "thumbnail" : "annc_index14_thumbs.png" + }, + { + "filename" : "annc_index15", + "name" : { + "zh_tw" : "15. 精簡表格列表-3 ( 模組標題, 日期, 狀態, 標題, 瀏覽人次 )", + "en" : "15. Simple Table List (widget-title, postdate, status, title, view-counts)" + }, + "thumbnail" : "annc_index15_thumbs.png" + }, + { + "filename" : "annc_index16", + "name" : { + "zh_tw" : "16. 連結 + 附件表格列表 ( 模組標題, 日期, 狀態, 標題 )", + "en" : "16. Table List including Links and attachments (widget-title, postdate, status, title, view-counts)" + }, + "thumbnail" : "annc_index16_thumbs.png" } ], "widgets" : [ @@ -101,7 +205,7 @@ { "filename" : "annc_widget10", "name" : { - "zh_tw" : "10. 精簡標題列表 ( 模組標題, 狀態, 標題, 日期 )", + "zh_tw" : "10. 精簡標題列表-1 ( 模組標題, 狀態, 標題, 日期 )", "en" : "10. Simple Title List-1 (widget-title, status, title, postdate)" }, "thumbnail" : "annc_widget10_thumbs.png" @@ -109,18 +213,34 @@ { "filename" : "annc_widget11", "name" : { - "zh_tw" : "11. 精簡表格列表 ( 模組標題, 狀態, 標題, 日期 )", - "en" : "11. Simple Table List (widget-title, status, title, postdate)" + "zh_tw" : "11. 精簡標題列表-2 ( 模組標題, 日期, 狀態, 標題 )", + "en" : "11. Simple Title List-2 (widget-title, postdate, status, title)" }, "thumbnail" : "annc_widget11_thumbs.png" }, { "filename" : "annc_widget12", "name" : { - "zh_tw" : "12. 一圖 + 標題列表 ( 模組標題, 圖片, 狀態, 標題, 日期 )", - "en" : "12. 1 Image + Title List (widget-title, status, title, postdate)" + "zh_tw" : "12. 精簡表格列表-1 ( 模組標題, 狀態, 標題, 日期 )", + "en" : "12. Simple Table List (widget-title, status, title, postdate)" }, "thumbnail" : "annc_widget12_thumbs.png" + }, + { + "filename" : "annc_widget13", + "name" : { + "zh_tw" : "13. 精簡表格列表-2 ( 模組標題, 日期, 狀態, 標題 )", + "en" : "13. Simple Table List (widget-title, postdate, status, title)" + }, + "thumbnail" : "annc_widget13_thumbs.png" + }, + { + "filename" : "annc_widget14", + "name" : { + "zh_tw" : "14. 一圖 + 標題列表 ( 模組標題, 圖片, 狀態, 標題, 日期 )", + "en" : "14. 1 Image + Title List (widget-title, status, title, postdate)" + }, + "thumbnail" : "annc_widget14_thumbs.png" } ] } \ No newline at end of file diff --git a/app/templates/orbit_bootstrap/modules/announcement/thumbs/admission_widget1_thumbs.png b/app/templates/orbit_bootstrap/modules/announcement/thumbs/admission_widget1_thumbs.png deleted file mode 100644 index 6ecaa4e6f2baec9b8ad26065a888c57d098a6487..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2214 zcmdT`dsI_(9N)1r^MPV<1P8Bt0=E9jQ7HdxQ8o8Pt57Dn<#&r7IbZxAa9u`oM>!^4#g|cF1oE4!XH8>D$ z#Pqlt$8?)B&f*dl>j}b;u#Q?6qZDgNBOhaI_%@@7_GYmp;WiVdO~WZbgX;~1lrwnJ z$pH*HDJL-~28=Pu@KnQ^EoMA^iz-38B~6R!IN@P{#3rT#7;y>%Y{qoLBDP66<8j6G zoY@v|fN>KlP0E=7wJs(OkdbB_2;v9vv>*%tB9spW1&KuPDgXu{p#X#g5W<5{u}~-m zL16OX(Amto6tP;an9N15q?}ZWGKmEOtJTW4B7D-U7eFYA3P4x@!#vu8XW2|pn2kqR zmQ6*F;})&iV4@5p0Wc9U4Vg(vIW*FV5{#ypm`8yL%Op`WWda*!5rRQVxB> z*BNwTI0OVm3J69J7z_@9AT&4vkwXZmfQ73SA{jgt<8i*I0)>&_UtgF<*{NHD^~Q6bF3v}iC7 zLbO4;5E#{Ipm*?W0nu^UHyaJmW=bg z2iaw1WzYE3JuR8$bK>c)=YQzGCy89RJ}HUFZgRC2v0vXC^~JWgs*}is8bgsCAYQLY zYfG!2`SAYfD+S^9va(Rev16qxxLm1t^?aY5&BJ3}dqZ;VYhy$1(_!q2dEkXh()JB& zubimZ-F^7&f`zw<7c#O#8{Xk+#gP}1RJrxe(YOY0}QZzTTcSjoNE)FHa~Q&-8wT4(#sb7vbb3r8BW3^#lC z-R&Oi`NR@_s@Us(aInpOCw^An&&3s$H%gM+J?CA^r&YJ{ArA1)mJGTYg?Z-(ut<4JeeFRyK_ENp$r@3-!yBb&C%VqN+3=`s~AUR%%L zM|HN2H||->g`!Z$*tV?Cojp9sV`FHy!qmpcXt+%V|53s+MS28jMpzv zmR`FjJpYEOd`(Z%L-hx|nA7H$q~89-$n#sVzRJ5l_lJ)t8RnO1e4)KqtR!!s0J+R= z*2cPlGwOkY@AD+PYW%Y_rbADRo45))_lK;=^31;P8tP>0>$vZ=?4SSEz{|8mO%;LH z=fjQXbh{Q51*YUacm--)wdi)h8MP8>X!Ma6(mMJgn)q|2N(d>{G--F)&-x?5@k%B% zqwEg-f5|SNeeE*4Xla&5IgU(}PowtKEiLk_Y@7hdP!BCT!hP@T{*YX0hUC7>K2V@_ zaHl^P>I>zU4(WHHc{DORgX}V0yAqnHeF7ju4_&)IvLgQ6>`zOFN;N5PV_}Owd!qLL zZ}!ftsxTFGazm`|psQ9e=%Tx>_?u9OW{VN5*6LR?cc&~i&*belkL7UAv=9DX{C>ea zQ#aoGU8}R}R+h(++mQV6mhx)vSZQ;V@6ns0&YPLojg885f;b{R-qFALl<>%@Q|{ry lc0ZYG_Yy{i1>R?qS-&P2I|Pfr{*d`|h>ldrt5+v){}a6focsU) diff --git a/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_index1_thumbs.png b/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_index1_thumbs.png index ff4c8eca735113c6bc97d7ee61a046f65ab91ef4..0ad29c47867c99a68d251e425b9a8073bb3c6791 100644 GIT binary patch delta 1341 zcmZ{jeN>Wn6vxestw|e%8XldRn#}o8zn}ZP=iJY|zj~A%)tc@e zlt>{ElM)k>Xtcy60H71%=@be%0gorg69FO}pi~Im{ofbSKUmb^&JCrINLfT82u6Xi zcy81#5`i0)MZ#xC5kU%(NG5?Ka8+!@+JyxY@2piyH#d*!WLo@|!(%oRGk3>U|LYI& zy1OY`p7TP_)cVm$SN9S+te(5$mCHD+zJ0w3g@4I?v~MfyfR(#_fu+YZ^+Cd1Hi zKb9}Hs_^54Z0z(&<(JEESBRJs-#vNJbG!2D8IxFTGKl{k_o{asHcQch(A{x(put7U8|-jH<0KX9M$aR|co@R<<-X)gM2; zNKu9gtI!YaCTQXU%I6vjUO&60lCAs%+HDP(jE)F=^oG+J$*C(6n?jleI7k$nqzwX5 z08^7xGr9z^kX5$6&OF_P8RxsxB*H5|=RbTnmlq+~*5lXCobXN@ZKMtJ3 z^JPbK?Y?&QrKJl-taxkt9{2stSN7ZO=e!rIw^j2GY&#Zc+vp*lIlpwl+`4~^q{6)A zw=5A2J#3Xs`F_OU=-L8FXXT}9?bcbrCU*MU+4IiJn}6QElkz6;H=mLI&oyeF5X%%R zQ;f>=+#PMi5?+(i>X3ZD`=KCAW(*;d8Ix>DgwVLI)`sPp^ zW?YG-Az}Y9k8LtN$oxgGB1elX2%Zsh9eKnj6OcII)xZ@9w3G@MZ8H2Q=6W{Mbd<{H zxCjaeE=pwpdQh&^d*P$g3<#bQ)V)hKK<|U$VMYdkhd^Dn+;}uRhvOn}5P?oic4)a5 za06VXzk=m5+xkDFXTdSGG3ed0~KJy5@0*9ga?r#3*_3dPBo8% zz*byX6_t+=S=2U}Un}lY158|cQS$IGHY@>_150=inP!*|dSTx64FY5OLaV}a5NQTA z1MrLKLmFV>3QB^&FZ3!X(xFw(OE~Zom2Wu3d*;21>EbSvqnL_6Rb(lZzr&$jGK%>q z2PQ=a%Q4d49&c?mHlV*+4S%PDYK#;f0iFa|9&Pzg&$Zk{4P+@^Q_$vslS#=pXrAh) zZEg88x5`8{hjZfs1dSto*2#nwit?bR!=zEGePVFk6UNy)+i;(qNK`0v!pj+x`1JKi jw4`+*ypM+-Z_yk#;S$35H;DTW+~Ai?-%M*x;1vE3Kz43S delta 1260 zcmew=uvB0}6qACbp|OR5v8k)Gv4NwZp{t3dtDB>Rk*lezse!qpfuY&tDkd42A{U&B zwlSrs7?~$qCa0t(>l#~{B*?YcQgQ3e9mnjLP?=*7jgMXP4Vjga;^b)FmDh4pbX8r0*p#0PWubS<6qj&>ZFz92 zt~KTAR)ZZU&rRicm-g~d?`oc&WeQCJlElr)RWX18% zz8)w1?{R4Pqx@fg|IIy^Fu}~sEXK-d#`)*r%Pzm1do$--_~&n%L(d=C&f;T|+n+nV z*S~1r#@j*$fzEdC1+V+7@A%--)8TkTA!%N@>;8?>{m0kIoIjFbQlx(DF-wPp3y+dp zJy24>utP%daOUJMbCq~tjTQ9Zm-!*sh&e>J+vP-@^ z>z%ya{?Cu#U!PvHXMVf=exFzNwfi^yzQ2FF^!xgF>&p6yKkmE!eqR6b#mD<|&)wZy zqba-Rv)itXUr$xd?_AAtC+nPrZ>>LGzds8obUx#J)PM6bQzpCTI*iA; zD=qg$WzBgya|XBn5r{L7#OA)c_WO1YpPzkBy_u(s_3i(E-v_=uU!E-)VzIjT$X@>M z^SjpHI2}HFGoRo6y01U)1&jB6tz5f*^1J)HtAEw~e|vrPk@Bxgy^wPJg_bTH6|9fH8{T(wC(O||+_%(o+nH-*LL zsXnMs)IT2HZ3_zOW?+;g`1{CJKa%-Y50>Ag-gkN)I6jUDbZe?<&rEt|bd=|`$mS2Q z;P5eYgaid!u+OI%NzV+x(i1e(VwTMS#h?6UHluK6QWG%P zK&c`0rts!TwuO4tk2bvNj)i+ZOUcq;CozPX$I-TUWpE z$Xnj9XJLHfdO}TbN7!5yZO6~T0Sp1{di7?yx;Q6Dk+Ot@08uV zVgGyQ=Q_Wdai%lN)2AmLez@VYFVdQ&MBb@0LS4;KL7v# diff --git a/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_index2_thumbs.png b/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_index2_thumbs.png index 832fe3568ba10d6b8ec1105b3ff6309218f82556..d7baca760121119c935a98bd41c630c40e703880 100644 GIT binary patch delta 1495 zcma)*dsNbQ7{4QZ;-U?n9xP1 z$HY>~a$0S(kzty51zS_mju%MFDXw%AFXY5@kV9JgYddG(f1l?)@A*ET=T%wt!iq?` z$=`f_b+3nO0?Hk50C7mb!vh4}KXq_N0T?$F;0B;w0h|{G&b z;C?- zS$R+(u4qa}w4|v6vy@FU-I1{=`6Hn|+ZYVS9rgLEg%?X7PnbSvd;4~3`SI zx+djF~$*KS(ngc0K*8baGKoDgAH)P z4eUf{S=93+TI^+JN0`c%5WDeqc9o=em4n_cK2U9pcY7)oY_5s*E9rxKFYLO59U5Q>JE>%7t_W=ihicv z;1GseXX~f0TT3)JHetb_Q136@?&9g$N?|r1US}P9Kq;h3E%J6A)X3H_|7NEKxVR8c zCu#NVN+G73_xJR0WBCt^a|lZA%@8hhEs;~cBchL^_!i=n=Ogwt^7XZ-S&v+xh(6Un zhByuhO$O+}AF4nF7_u;i?>xJ=9xlFwr;FZ&^WhA7-t&_k{M zBfQ2&DQw)gStDQJBQ9QXxAm4%`1*y#jEL6=G4Dw&YU4vqljWaj>o(7kvUpg6Qn*)Z zz)CHKOc~G#i_PI9)0Bn<-5T!NS+96bR55}QLk3)W$~Xv$Z4Gy_XS=4Xfx^MMf?!}d z;iI01*w>E|2|YB)Xyh7^oPB71ivW%s;9=dALaXT@5f8hK0i`AwX^QR)or)AHS;93w z9QjOZ=;U!JQVUJ`n&Es~u>Oo0O4PSFv^Aoym<%jKoG75}C>a<+i44GuO*~Hd83Cs` z<@O(S8!|xEL|ez+JSKC%mGVE>vHk^KYK>b}xXMarf<3j73(xSsn7P>nYfYw8Re>#d zYg2D@;!JYccr82Yj%03&W62jC{NApyrJK7}af+4P_FoXYgG3K%@n;hucw6Tug{%1+ zlLVKBhqC*|_r0hd9LWp&Kap(U6d{nv~ delta 2060 zcmb_dX*k>I9<>yerYNT3wly(RVvYPGi_oehLNyv=r%Di-R8h61nB;FM#aQbqM$uB# zwPqHSs+QQswRdpGzSLSZ?X{FBBc0BN`{6#%{czup?>W!!Iq!LX=e*q~_P$875WSXu zDMbyX%Ru1(I1YmZFen0spaVyv0F)kp)H6P{xWF3XUbC2{sEFFyKDmpj>mowL%d<14TaLxybEucD& zw)yz@z_8hMkpjIeUhy5+6AkbV><$dh7g3GdJoelsAM<|X@wXQOi1Jxg`q8rewZ+ci z^l@a~*p-v#x4L%Cg?!MJ_bf2=QYhKOSiVvX^XrX?$ z1dVRX#=&&%Ov{XYP5EMufcDJ?AD1Z(LSye$ovO{CG^9j9L{(B%@+e>uA9WX9XapD; zX)7ow1PZp+eo$dgG=#_}o2e;6GB@il><7E0fWag#DEMf#D*k~#m-mHD=jR^_>L>H_^KlDc zhzt}eH+^nyZZ2?l2ee@0-L4oB!Ei)TpWbN zL8N(IN;NUDXH4QnNl+5BriR?Lq+pxi@l9G8|9+vBrP}AcK18+q^H4C3rxpN(pfg8p zHWJGC!UFlU_8t-q3X(;K^f)51MBXLQ7|8tGFNbi23A@EzNJnXO+Idn35GC?4pfHr5 z`sa%!8Z1f3mz2o4`RA^eb(ym(8vQN)DBbh(&7~hJtPV(6~e8MU3 z;u9`6D?KtHYr85&Q_Z3C)3&qec62hQ@}p*p1Ci3k^ljw7|n? zcTP4%P**gi2A4ND?8ASfq_MG4*&f!_Rcf#UMIj`E{`3#dcbZeBA$4?6XjE_0RrM_S zS*vQdCap5NL~Dl_0F(MXwWDmW1LA76M?~j94ac;5*Kl#NaTg87n7yF}2T>G+(S2%e qpGn!C0dIl8k4*SnrcQC71WaW4C!Y$7_SV}XhsT0KGp!=INB;p@yP1pt diff --git a/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_index3_thumbs.png b/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_index3_thumbs.png index eac861914155d20a090ae5856f7f2638297bcf56..0193f818ce4179c2fc556f0f33bc03bc0b1e03b6 100644 GIT binary patch delta 1409 zcmew-`b}VhCu813uRc{%-DCqJLj`k7JwsDdb8{md1tSAP6MX|ieM4hiLrW_Y6DtFQ zjelbq6->-rEuGC=3|w4X3=9ojO&kr3&D<=_Ow3H3ogAH9Ehbkn$v_o3yWv!{jY&no z8El7wMtEjkN`85<=HzEg1}bR=$tgx@i59wshNg+Sh9)M-x|XSisk-KAhQ`UM1{OvZ zW@(ennCt2{rvy)8U|^Z&>EaktaqG>UgIO`5496cDAKNy2Mara!ElqhMcR4m+ys?V^ zLX#1HLio|#gHBCXy2OsSa@RJcTd_OCEoj5Gdd^u zowHR!i}%caNoS>9g|- z37og~-;UtDcI)DDr_XevJu@IcYdx!zpz45y?|kd1W?lPh(eMJPw~==_9DJNMHOY1pPX`V?u_)`el-ui z&o$UtZ`!iIeD>VUJH(>obK5`MTH5SiU;Dv(NA>U78}@I%{^G{BPenWSRVwelYKEobDqweu~QxBcAy`XA1xER{^@V7SUA7^n)~<9rmp<^W6iI8 zUiaZ%)sMpG)~;qHl|PqmsQ##X9vG$qps;tA`*y@-qk3PWe~d}>qn6EYI#2UdO2zAa zJEBkzae1??;m0?f=^NGcX4w`pRX-}aDGZ8}4vAAqU7jMrXC#)*a5X;aV{uw!^O*_D zKR!+B;#6`28$TmS=)6d=Sn!!eGn3Q|j_OR;RO^s%=>ckZ>0`zUk~v^Ph8I-i{ccgP<-B!|7t`I=G%>7h`j9+a_Qz z92GHc(@eYQV<>#i=%|kIlgyf(Gm@G*1cBal;aN80i1E=mM@2SgEStgUV|Y3h7=XY8 z14{oXss279)sG~;9dX^P?q_j&-VR6*`}079_=d3X`FRy$)sGh46jtA$t~VVNf<|_J zUw+qy3zR2WOtmgtf4%r=fjTIcfvlSscjWiuk2j_+wD8|`r@!;Zy#fm!r)66jUh8Q` zyYDZ%^ZUr`#TQqE?p+rm@2tPGM&waqZS&f=c$vRWz~aHgs?tDW#~zi}WxIRNXUG^% k`Oz#3@`3t?`3%eq26Igw-tlME*8)~$y?w%B;MI-iVtHuszv zOp7&nu!K(X2pf>fENj9_+IHS+FjnS@jeoM$QF381gt0FFG(EO4f^PXZU2KJE{EN;O zgT~#Gkz4aDScjB3N9mxizMz{R!a~^tia~l9t*e_8B)$=}KJY7^jFIoq9jHU7S7+Kc z*1T?j>Ee+xh%dbz-l|mWC$}yxVoNi{%PTAN#7oB~W7@U_4!{3}tXwI%@Hg?3h^$Cu zO#eMo(Kk-vH>4SeEU84LQl0Sg>*>F5gey1}6&3Z$-(FB&Gw$gB4AD}Xtcll#dG|Sn z*bsz8g~JvKg@Qq-U(lVGpSC=z2TXi+(FD9`VlIVz;yyur`}o~$VUGrd&H+*TT7(rZ z?+!6Kwt-{)8U= zvYFwUbMVSlfpwQf()zG);MMcquRWNJ?l0C4KlqV83r3bkhoALXdAdu&x<+7bOMC|w zk)u?K>V4ol*@duIBgTHy@@}MZXMqQ)3fE-{f9Avkt6r=9Py}IQP+$8pZfT5fku?7x zqd9+M4+k}54iC+>JvhAF+tXJ}V!VTW*(iwE-|BXG>SW5ddpqw!FslsRxWK1bWWY|O zvlTd$>71Ero^FSv+N~HfqRM_s1AE#rc69OmhT?1XUmqx=WXh3_{;QI_e)dbzE`1g0 z%&Np_Act|e=3&-N&zKgU&&cUW{rTfEBZ+BJk7Gn?+ZR4iWc{JZA5t%fu3(O*kT*57 zC@>1lkag?m;}CT6+oi(2>c#rC_oHU1eywOEcygtsh8pA8^v{sXBnJo3ibkVF&2$S& zk}E=GWxO~?8{QGAnjg0~@n`KsVR>5lVM5V~yCqu~vup)h&4N=s{VbYF>yi5U`YS>* znfzta7>~zWV^^V}AL^Uj*Z6Yxxw`YuuSDC2$*CxK|KOk$m0ox3*s)<%+W4F1g*t>P z%WgwamQm-D__h~xfQS1$P@IZ3jV6zw_>UfP^^NDgAIG>IKAfTHzZ*ZGZk8jQHqHqX z)k8C=Vea(IOki|0UOuDHY~MpP@xwDK+QP;g3u3hA^&;5pJ4sPL@)>e(g{!5MLEvyW zQM3I;i766^MCD`i@IBB1EihE0TJ6IY#+yPj=yf|l0)YVE#(m{1iwMoV@Ri#0R04}x zIZ#YZD9=9Cmwvm6`ChFqZLSzRdhXo0CkB=Cq5MZbn2r~o&RynI>vyYo?URdF*t4Ji zQtsDs9>nwo56by*!NHjjnjjrD9M($9J-4dkQ6xB zc?|=0zIjuviEIL2PkVwH3}H|93p9NwG5?y^(}dOe5n5GgX=!kZr?YGW67T2Y2t0&6HO9-?!4iLP!XViyiYV&Ko zi;nfx!}YNAKiw`qo4whc&fDK{p#>hW9Oi`Wte zA3&seY>xUz>Y@quHkx<~9RycvlOt1p9|(TX`(Nb562f6W5u3%_8K4^tr-@SkKfT|| zfxkP`-;#d}2!8BpYMx#ses|zhb}!L#uK|WxA#>kVeD!o*gI6Fo&fovgUwK#d`7mdpJU9a_$Dx;A@)vi2y?%6oI&D;XgX+q>>e_eY5r*+1W;t|i+G41DUEWEz9~ z9X34idEr-eE?hH4l!)C>od|tACFRy+yTIy~qy`_}1~h-tObZH;b3@7s=%be*o95x> Kruv%b(Cu813uRc{%-DCqJLj`k7JwsDdb8{md1tSAP6MX|ieM4hiLrW_Y6DtFQ zjep}9<;@Muos69gTwI(i3=LgPoSfWTEu1XOoy;wr%?u1(CRZ`ZLex09;Z(DYNkzaJ zY=eSEcxGNoetEIx*|Z`2nmkqo!)P5twyn@P>AvcGcrO#Qxn;bI>H4jhpxx+(a5O0@GUm!1yCBMM2s-hBz$|LWiQ z#DABcE80|-?73h2H%6kSzDm92yM5iu!~6gK^4?MU+0DYn!s6P~_Sv%^uKqan!@-~2 z`gY%b@BN+l=WO}IgYx`;-@2!4*($j%{w}Y4ZNSG2>Fe88{-^)<-=5a{@bvYn&u=8_Ur)SsOJ-iok!JtA>BqjGI=5$T?CW!f+V$VZ zMRw$`oW04k>fgz}MIWE)AFh7CZ}E&1drWU}U0>ff{nysi_<1Jzk6+JQ!2R=jNm?!6 zoX$cuHo<0KK&%m{PFj@UA9HY?h3vN@ri%6AH-(SOBHROX&WU+5_-+VKzbjJxDCLIm zW$AB6EQCQ?6_Uax*ct|IP+yneKZmdS(X0vGZ#p0I-JB`GUk3DvVTXjEd5XUe`VC!=>+K%Fw_Pbt8qg(e1p1QyKSNG3D<8&3ftfK)c3GkgR}x;NqUp| zGUjhbQq7Ofvyl9D5h9XYu{eVO?iL?kJoMiLF2Y?ytw)=hU->3RMmRQNAtna@0-TaQ7(npK`>}J)m z*1wJ&Qn!u^{Wt&ohBan(8_V8wJS-J91ct+5!@t@G7?Nt2CTqSmJ;(qAp00i_>zopr E0E}5({olxobk!3F#d9%bcU*B5*`kB*$eP$FA*CQ(XkVC(ONREYNqL$GG@T z`poBzs?tvTT6T&b_Io$Cnk&Ho>}h&`S7 zragSq^~pE0@20ACc;C#{u8uu(=>PH;el-hkzukA^_185y>YQCjwu zzb3Tqa)wD!{Zk8p!w)aam5^6=IHHgwV5r0<*xca=R5s0P?bqt5`GSXfugo;sA$<9r zb>X|i>-T%==lfquSsVU(&cCN~zua=OxBYscwtN2n50A^Le$V}WNj$#p>1vS!w&nA^ z(#_`k^53h^_qsiQ`Ooz9;9Vh~vp3gSmC98bFYRsT|8D%Tcyhh=R_1e0)1Rcre*P8x zp37oF{{G)~b8X8DKi2&_`S>gIxzu!>b5?KIckl0)%YNe&TYoKo|Nn(^66$__{d8~k zYJ2nY4CeHoK4&foLtHLc=$&-S&+>a47tT@mH2YNRXMLS}<#N^bOOw@K$%%ch~b?A5x-FE96Rzao6`q|bl+M2s7cJ1E%`jo)A z`dGiyE`JWD7BTl`{I4!{Z@1R`cu}cZ~CqtW7l-zzw1l)o3H=; zi+^$E`R6G0{^QBhr=MbLc6@7`<*vjdDE|hO^M1(x6HQ?7zbtxLPW&r30}yz+`njxg HN@xNAsR?mx diff --git a/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_widget12_thumbs.png b/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_widget12_thumbs.png index 0e6ba7b2affd4f9f294c550d49f3c646afc61e5d..82eee2c5d24cc18ebba8f9dcbd48a610e3ad5f49 100644 GIT binary patch delta 1365 zcmZ{jYfzGD7=}HRwXIDOtwO1p<)W#;#|H}Tl7pZPX3>mmt%YTrTxUxoR2Z#LDFrPv zsl-g&4$@?KwQN10rmJ>_t=vj9b=eo4{kh-I=euW~>%H#xz3XmpD`q;T z9FH#YBL#Eu1jr|pf`v$=&`?5<4*?Gmad-#^!NCwEj7SW_;EP@UBu@O-+7+RXf6K+u zv~59=jhoqNi80l_3-99x(V6vmIh28{=!2^|oasmn<;1fkt;EUB_O!5#drQ(8#!JT} zWY5OPzAInoSnw}f_`}>pm zd|emfK93N;@@Q14espZ8>*5FM^g!AC7F$WSLeM>0V|e_-`pWIg#`3Zi%l|%i<7N_j zF{VO}faEBKG5JQ{i$WJ!PWkBZH`b{gim?nQhSb&91+kjrW)B>Z4>RKTe9~<^$XHl- zt&AY?dzIF*v}5|?jQH)d^2!UXGTD~byLYE(E;sdb7J6XY!);?1o06?F$2vP&rr)Io zWWVngGzt%3Zhw7z_{95z<(i$hD>`>t`@9-6u<3)%%1%+8*N3c;rH&oOc2z}O|CHsF zG}{?%%P3wqElK@Hcsx6)8h(}JWevAP&ue~DGh~~Hr8v@SM*}r?;|GzV5d{h%lhd^F zn^h*OctiZq#D^M;ceptfqx!vVflc;D->rT5wR=`dwOcc4XK;5OcwFnMuw6NSJ?rK3 z&lZ>!h>>HOw!eMw<@uz(A~eNAfvb=ns17r4GIO`twC}4*aT;)t#)+!iAEzfjw|Pvx zQ@oirUlM)Up$aduY9*{WS>$1h;t_{+=AN1yk~QLzWJ2m)Zxz*{vVcZlQzpNsR_z|w z8n6%5WFiPy6wVD8`y2rs;uJ95V~wsFRec#Jglt$Qg#{1O_v=)g+_{p#A0Dh@XV5gN zvmlXJfK~;3KidsWySao4#ak3`FH$dH4g49DHKJP8Gxi-9U`1(t!17+CvP~^9%{L+Q zK_HtdOdOw`11LIkT+6G+v?sDW%c(+HgGIs3W9zpbky1hPvr-dTG2k?O4<5_&G*#$4 zuFWwaXJw-zAl;h60D()au{Q=C@G*Pqq$uE0z-qSSS`>7UxT_}P?H&OX z-5A!uT8 z`&CR4dY{)$$nL{VjF3?wlSNUQAT6c}e*uYJ zx$5L7?*whW@{zX9tzCv)BJv#skC6G0@vWqr|8o54Yxe_{67i4T;%a@>yV3NX^={TA z+?B3T*?Cr)=2`M(Wq#{fb5;G0x}L8`x)H5Hr2VSUH=t~b@D4h`I=|tYhvqwgj~Tg% JQ5%t%`!71^X&wLo delta 2128 zcmbu9dsxzG7RN=K#4;s$yp%Uwr)U$=pEm-FO+d@CsHjxDpyZf$)4XIO^UKRxOit-A zUYZhh9L-cHXhrdoI^sQQQ9(=yZOt?lFC{isHnuza$NsU;GtV>U-}ijqbH3;OoOb}$ zZj$E>3C}-rW0#}-IY&1D;pTz{TpY13SQNs^5pZ+>oE#i6_JAYK6@zmGcprlx2m%)C zMerhGFa#_C06bkhNUi{h=mt1rTu3Arf-~!~w#9#w-2QKpK>JI5iYppG_(sNs#iw3m zz1DWL_V94tM|5>{#S$0DvJn5lIA+6YGEu2==f!C$+S6FL;wYPG5R9 zr;Lvq>UY`AfBasJa6tKz@}8-C`ipHLx%@XKh=` zFw~H;_28Pr=}sQ$h)n3(36irUvI7vT2RQ_Ftj9NXzYmV_8B!$92i;$7ZlS>n-R55w z&E9QLDH)02caw?OFQ(_VpM@luCO2P6!ilM(rWK8*DcI}hBwT0?U-scuX4==vmP$V{ z^qS3^6md(CQ&!uF$fN1NEgyDdZ0wl;K}@LB2F4$aiHeDtyAx{WI(7BDotUYT3ojxe zUS)@^b`^b3M!Ki;MY!}+iHj-Y%R(QV9#CdX&<6?nF!~i(#p~2}vNy-Fz?-$!ZB6&Q z7JRb9J^wL( zO!xe_-b2d>K19YZ72{T(cqfm~Fg}6HPYn02DkCd%zDaCY9QH6yo3X7-X?rjgZ=c$Y z27PBvkKcXOc4p|)q^H2|K^INd(Ce3&99gD^DGlqx{7F~czn`iV}Gt{ zgl@U(h5PWTD$pVQPP2kLJY0?08XrT+r`Q^PG`fc^{x!FeeLNdzF9S zb-`cAyZFWMEKBz*Fr93(Y%_#NYLkB$jFa=JEWKD+XARFS?cF10GWt5q{jGZDp=>Fr zA#4Y~j&Az2?Yt$p?Slg!>$M}A*DI;rI2xHW6o{eUm9y*e4`hnVp^GlsJzX4ZOM&m;aGaDi5!dDv<2bQs2~t=k}W#A3hvv zve)&u+IlK)20nxgHVzqmhQGAfzJ-&GG3uik64izV1|aq7KfmmCs;}m7ly9vO47#~g zjw~e72Ox!Mu?bf=s+c$H%O?JU!R30V`8|hzOlXKxo?@|BKKi%d@6V;A2w>yg-ChMp zD$j0`N9Mg84Cw6aj7m>eTn<#j!w7R*Z|z3e+uy6I+AWnxPP(-hWTM)%5^0103Z;Td zrPkdCi{Mri3grVyZ>jrxEermalVBzo(4Sz#7xVKA?(U*=n7 z)HS)FW-^(2cD+t2jS+*sCgOVMePxHHfcb-3rn>$D%|Jkyg9KSco|}~gPbn)+4O6e< zd15~yeyKapUSI)%xTjEAk-AWzUBdi@MXHcZ0BKuW7aa21C>tQvmT<&S_}|k6BDNke zBM8@iD|cd)|E>3-)W^LMJga^U6L|o4r*DOcG5K8lSp_*JYZkt-2OvU(5NX+LR=k+b zCcb6Pz@u;C0S0|uf)wni}b^X!{PXX zTTh_@bVuZ7C~)u^2qEOc%E@!Ee`AgnO`TBjD%eusrC-9**e63vEccit<%Y2-Ef|q1 zR5s(PEbO?88qk0zJop*7z*4i29)sUKKzZb8_*iZMo`;{_0B-aCjy{9m%VbEa={S-x zYj2gNnm%>1YuN0J&u!kRu1%nvrvn8(cLE{I!E1`$&Q*SU&#_JTjD2mi2xiX(&= z6dKJBhwc0Ha`1xDi>GR3^IiTZDtcRnP1+BEKXME3XVoQ^3+6c|qn{ryULEseK%sv% z2jiYUDZ)Q^9o9qb>o_0M+Om%~g%cfwrOs(>jMkhUvTfZsMCtM
              -<%= javascript_include_tag "plugin/jquery.cycle2.carousel.min"%> \ No newline at end of file diff --git a/app/templates/orbit_bootstrap/modules/member/member_index1.html.erb b/app/templates/orbit_bootstrap/modules/member/member_index1.html.erb index 9afd77e..5113fbc 100644 --- a/app/templates/orbit_bootstrap/modules/member/member_index1.html.erb +++ b/app/templates/orbit_bootstrap/modules/member/member_index1.html.erb @@ -1,5 +1,4 @@ -
              -
              + + +
              +
              +
              +

              {{status-title}}

              +
              + + + + + + + + + + + + + +
              {{date-head}}{{title-head}}
              {{title}}{{value}}
              +
              +
              {{pagination_goes_here}} \ No newline at end of file diff --git a/app/templates/orbit_bootstrap/partial/_head.html.erb b/app/templates/orbit_bootstrap/partial/_head.html.erb index 11d6eb4..87c143f 100644 --- a/app/templates/orbit_bootstrap/partial/_head.html.erb +++ b/app/templates/orbit_bootstrap/partial/_head.html.erb @@ -11,7 +11,8 @@ <%= javascript_include_tag "plugin/modernizr"%> <%= javascript_include_tag "plugin/jquery-bullseye-min"%> <%= javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/jquery.cycle2/20140415/jquery.cycle2.min.js"%> - <%= javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/jquery.cycle2/20140415/jquery.cycle2.video.min.js"%> + <%= javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/jquery.cycle2/20140415/jquery.cycle2.carousel.min.js"%> + <%= javascript_include_tag "plugin/jquery.cycle2.video.min.js"%> <%= javascript_include_tag "app"%> <%= javascript_include_tag "#{@dataApi}" if @dataApi != nil%> <%= render_google_analytics %> diff --git a/app/views/admin/groups/_post.html.erb b/app/views/admin/groups/_post.html.erb index 0f4edd4..ab288a2 100644 --- a/app/views/admin/groups/_post.html.erb +++ b/app/views/admin/groups/_post.html.erb @@ -30,6 +30,18 @@ <% date = DateTime.parse(post.created_at.to_s).strftime("%d %B") %> <%= date %> +
              + Seen by: + Harry + Ika + Joshua + Mason + Tina + Shelley + Anna + Poke + Moses +
              diff --git a/app/views/admin/groups/show.html.erb b/app/views/admin/groups/show.html.erb index 57d3675..a4392bb 100644 --- a/app/views/admin/groups/show.html.erb +++ b/app/views/admin/groups/show.html.erb @@ -5,32 +5,38 @@ <%= javascript_include_tag "group.js" %> <% end -%>
              -
              - <%= @group.title %> -
                -
                • -
                • -
              -
              -
              -

              <%= @group.title %>

              - <% if user_can_write? %> - New Post - <% end %> -
              +
              +
              + <%= @group.title %> +
                +
              • + +
                • +
              • + +
                • +
              +
              +
              +

              <%= @group.title %>

              + <% if user_can_write? %> + New Post + <% end %> +
              +
              -
              +
              - - Info + + Info