Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity

This commit is contained in:
Harry Bomrah 2015-03-06 17:48:09 +08:00
commit 3aa4922632
46 changed files with 912 additions and 720 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 110 KiB

BIN
app/assets/images/spin.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

View File

@ -0,0 +1,65 @@
@charset "utf-8";
@import url(http://fonts.googleapis.com/css?family=Ubuntu:400,400italic);
body {
font-family: "Ubuntu", sans-serif;
font-size: 100%;
padding: 8rem 0 0 0;
background: url(/assets/google-message-background.jpg) center center fixed;
background-size: cover;
}
.message-wrap {
width: 80%;
max-width: 366px;
margin: auto;
padding: 2rem;
text-align: center;
border: 2px solid rgba(255, 255, 255, .1);
border-radius: 4px;
background: rgba(255, 255, 255, .1);
}
.message-image-wrap {
position: relative;
display: inline-block;
width: 100px;
}
.message-image {
width: 100px;
height: 100px;
margin: 3rem 0 1.875rem 0;
border-radius: 50%;
}
.message-body .message-icon {
font-size: 1.2rem;
line-height: 50px;
position: absolute;
right: -1.625rem;
bottom: 1rem;
display: block;
width: 50px;
height: 50px;
color: #fff;
border-radius: 50%;
}
.message-heading {
font-size: 1.75rem;
font-weight: normal;
margin-bottom: .5rem;
text-transform: uppercase;
color: #fff;
}
.message-paragraph {
font-size: .9rem;
font-style: italic;
margin-bottom: 1rem;
color: rgba(255, 255, 255, .8);
}
.success-skin {
background: #37be1c;
}
.fail-skin {
background: #cc1c1c;
}
.info-skin {
background: #1cadcc;
}

View File

@ -36,6 +36,10 @@ class SessionsController < ApplicationController
end end
def google_callback def google_callback
error = params[:error] rescue nil
if error == "access_denied"
redirect_to auth_failure_path and return
end
auth = env["omniauth.auth"] auth = env["omniauth.auth"]
user = Google.find_by("google_uid" => auth.uid).user rescue nil user = Google.find_by("google_uid" => auth.uid).user rescue nil
if user.nil? && current_user.nil? if user.nil? && current_user.nil?
@ -69,6 +73,11 @@ class SessionsController < ApplicationController
redirect_to admin_member_path(current_user.member_profile.to_param) and return redirect_to admin_member_path(current_user.member_profile.to_param) and return
end end
def google_faliure
@code = 2
render "google_result"
end
def connect_account(auth) def connect_account(auth)
if !current_user.nil? if !current_user.nil?
google = Google.new google = Google.new

View File

@ -12,7 +12,7 @@ class User
has_many :assets has_many :assets
has_many :user_actions, :dependent => :destroy has_many :user_actions, :dependent => :destroy
index({ confirmation_token: 1}, { unique: true }) # index({ confirmation_token: 1}, { unique: true })
scope :unapproved, ->{ where(approved: false) } scope :unapproved, ->{ where(approved: false) }
has_secure_password has_secure_password

View File

@ -1,108 +1,108 @@
(function($) { (function($) {
"use strict" "use strict"
function init () {
var doc = document;
var orbit = { function init() {
// Cross browser add class function var doc = document;
addClass : function(el, className) {
if( el.classList ) { var orbit = {
el.classList.add(className); // Cross browser add class function
} else { addClass: function(el, className) {
el.className += ' ' + className; if (el.classList) {
} el.classList.add(className);
}, } else {
// Cross browser has class function el.className += ' ' + className;
hasClass : function(el, cls) { }
return (' ' + el.className + ' ').indexOf(' ' + cls + ' ') > -1; },
}, // Cross browser has class function
// Add class name to the menu item when its children items are more than eight hasClass: function(el, cls) {
addMegaDropdownClass : function(el, len) { return (' ' + el.className + ' ').indexOf(' ' + cls + ' ') > -1;
for( var i = 0; i < el.length; i++ ) { },
if( el[i].children.length > len ) { // Add class name to the menu item when its children items are more than eight
orbit.addClass(el[i].parentNode, 'mega-dropdown'); addMegaDropdownClass: function(el, len) {
} for (var i = 0; i < el.length; i++) {
if (el[i].children.length > len) {
orbit.addClass(el[i].parentNode, 'mega-dropdown');
}
}
},
// Append caret to menu item if it has dropdown
addCaret: function() {
var list = doc.querySelectorAll('.page_menu.level_2');
for (var i = 0, len = list.length; i < len; i++) {
var node = doc.createElement('span');
node.className = 'caret';
list[i].parentNode.appendChild(node);
}
},
// Add link and cursor class name on element that has data-link attribute
addLinkOnADBanner: function(els) {
$.each(els, function(i) {
if ($(this).data('link') !== "" && !$(this).hasClass('youtube')) {
$(this).on('click', function() {
var target = $(this).data('target'),
link = $(this).data('link');
if (target === '_blank') {
window.open(link, target);
} else {
window.location.href = link;
} }
}, }).addClass('cursor');
// Append caret to menu item if it has dropdown }
addCaret : function() { });
var list = doc.querySelectorAll('.page_menu.level_2'); },
for( var i = 0, len = list.length; i < len; i++ ) { // Announcement text truncation
var node = doc.createElement('span'); truncation: function(el, len) {
node.className = 'caret'; for (var i = 0; i < el.length; i++) {
list[i].parentNode.appendChild(node); if (el[i].firstChild !== null) {
} if (el[i].firstChild.length > len) {
}, var newStr = el[i].firstChild.nodeValue,
// Add link and cursor class name on element that has data-link attribute newStr = newStr.substring(0, len) + '...'
addLinkOnADBanner : function(els) { el
$.each(els, function(i) { .eq(i)
if ($(this).data('link') !== "" && !$(this).hasClass('youtube')) { .text(newStr);
$(this).on('click', function() {
var target = $(this).data('target'),
link = $(this).data('link');
if (target === '_blank') {
window.open(link, target);
} else {
window.location.href = link;
}
}).addClass('cursor');
}
});
},
// Announcement text truncation
truncation : function (el, len) {
for( var i = 0; i < el.length; i ++ ) {
if ( el[i].firstChild !== null ) {
if( el[i].firstChild.length > len ) {
var newStr = el[i].firstChild.nodeValue,
newStr = newStr.substring(0, len) + '...'
el
.eq(i)
.text(newStr);
}
}
}
},
// Sitemenu dropdown
sitemenuDropdown : function() {
var el = doc.querySelectorAll('.sitemenu__list.level-2');
for( var i = 0, len = el.length; i < len; i++ ) {
if( el[i].hasChildNodes() ) {
var caret = doc.createElement('span');
caret.className = 'sitemenu___dropdown-toggle fa fa-caret-down';
caret.setAttribute('data-toggle', 'dropdown');
el[i].parentNode.insertBefore(caret, el[i]);
orbit.addClass(el[i], 'dropdown-menu');
}
}
} }
}
} }
},
// Sitemenu dropdown
sitemenuDropdown: function() {
var el = doc.querySelectorAll('.sitemenu__list.level-2');
for (var i = 0, len = el.length; i < len; i++) {
if (el[i].hasChildNodes()) {
var caret = doc.createElement('span');
caret.className = 'sitemenu___dropdown-toggle fa fa-caret-down';
caret.setAttribute('data-toggle', 'dropdown');
var plugin = { el[i].parentNode.insertBefore(caret, el[i]);
// RWD image resize script orbit.addClass(el[i], 'dropdown-menu');
bullEye : function() { }
$(".bullseye").bullseye({
fadeEffect: false
});
}
} }
}
// Specific functions that will be running on homepage
if( doc.body.getAttribute('data-module') === 'home' ) {
}
// Functions that will be running on every page
orbit.sitemenuDropdown();
plugin.bullEye();
} }
var plugin = {
// RWD image resize script
bullEye: function() {
$(".bullseye").bullseye({
fadeEffect: false
});
}
}
$(document).ready(function($) { // Specific functions that will be running on homepage
init(); if (doc.body.getAttribute('data-module') === 'home') {
});
}
// Functions that will be running on every page
orbit.sitemenuDropdown();
plugin.bullEye();
}
$(document).ready(function($) {
init();
});
}(jQuery)); }(jQuery));

View File

@ -1,26 +1,20 @@
html { html {
font-size: 100%; font-size: 100%;
} }
body {
body { font-family: $sub-font;
font-family: $sub-font; margin-top: 40px; // needed for Orbit bar
margin-top: 40px; // needed for Orbit bar font-size: inherit;
font-size: inherit; }
} a {} a:hover,
a:focus {
a {} text-decoration: none;
}
a:hover, a:focus { a:focus {} img {
text-decoration: none; max-width: 100%;
} height: auto;
}
a:focus {} .admin-edit {
clear: both;
img { }
max-width: 100%;
height: auto;
}
.admin-edit {
clear: both;
}

View File

@ -1,20 +1,15 @@
@charset "utf-8"; @charset 'utf-8';
// //
// Widget // Widget
// //
// Widget // Widget
// ## gerenral styles // ## gerenral styles
.w-ad-banner { .w-ad-banner {
position: relative; position: relative;
.cursor { .cursor {
cursor: pointer; cursor: pointer;
} }
} }
// Widget 1 // Widget 1
.ad-banner-widget-1 { .ad-banner-widget-1 {
.w-ad-banner__wrap { .w-ad-banner__wrap {
@ -28,53 +23,46 @@
height: auto; height: auto;
} }
.w-ad-banner__caption { .w-ad-banner__caption {
background: $theme-color-main;
color: $theme-white;
z-index: 200; z-index: 200;
padding: 0.5em 1em; padding: .5em 1em;
color: $theme-white;
background: $theme-color-main;
h2 { h2 {
font-family: $main-font; font-family: $main-font;
font-size: $w-caption-font-size; font-size: $w-caption-font-size;
margin: 0.5em 0; margin: .5em 0;
} }
p { p {
font-family: $main-font; font-family: $main-font;
font-size: $w-caption-desc; font-size: $w-caption-desc;
} }
} }
.w-ad-banner__pager { .w-ad-banner__pager {
@include list-reset();
position: absolute; position: absolute;
right: 1em; z-index: 120;
top: 1em; top: 1em;
z-index: 100; right: 1em;
@include list-reset();
li { li {
display: inline-block; display: inline-block;
} }
a { a {
background: $theme-color-main;
display: inline-block; display: inline-block;
margin-right: 0.25em; width: .8em;
width: 0.8em; height: .8em;
height: 0.8em; margin-right: .25em;
opacity: .5;
border-radius: 50%; border-radius: 50%;
opacity: 0.5; background: $theme-color-main;
} }
.active-slide a {
.active-slide a{
opacity: 1; opacity: 1;
} }
} }
} }
// Widget 2 // Widget 2
.ad-banner-widget-2 { .ad-banner-widget-2 {
.w-ad-banner__wrap { .w-ad-banner__wrap {
width: 100%; width: 100%;
} }
.w-ad-banner__slide { .w-ad-banner__slide {
@ -84,47 +72,42 @@
width: 100%; width: 100%;
height: auto; height: auto;
} }
.youtube { .youtube,
} .cycle-youtube {
.youtube, .cycle-youtube {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
object, embed{ object,
width: 100%; embed {
height: 100%; width: 100%;
height: 100%;
} }
.w-ad-banner__pager { .w-ad-banner__pager {
@include list-reset();
position: absolute; position: absolute;
z-index: 102;
right: 1em; right: 1em;
bottom: 1em; bottom: 1em;
z-index: 102; @include list-reset();
li { li {
display: inline-block; display: inline-block;
} }
a { a {
background: $theme-color-main;
display: inline-block; display: inline-block;
margin-right: 0.25em; width: .8em;
width: 0.8em; height: .8em;
height: 0.8em; margin-right: .25em;
opacity: .5;
border-radius: 50%; border-radius: 50%;
opacity: 0.5; background: $theme-color-main;
} }
.active-slide a {
.active-slide a{
opacity: 1; opacity: 1;
} }
} }
} }
// Widget 3 // Widget 3
.ad-banner-widget-3 { .ad-banner-widget-3 {
.w-ad-banner__wrap { .w-ad-banner__wrap {
width: 100%; width: 100%;
} }
.w-ad-banner__slide { .w-ad-banner__slide {
@ -135,31 +118,29 @@
height: auto; height: auto;
} }
.w-ad-banner__pager { .w-ad-banner__pager {
@include list-reset();
position: absolute; position: absolute;
z-index: 120;
right: 1em; right: 1em;
bottom: 1em; bottom: 1em;
z-index: 100; @include list-reset();
li { li {
display: inline-block; display: inline-block;
} }
a { a {
background: $theme-color-main;
display: inline-block; display: inline-block;
margin-right: 0.25em; width: .8em;
width: 0.8em; height: .8em;
height: 0.8em; margin-right: .25em;
opacity: .5;
border-radius: 50%; border-radius: 50%;
opacity: 0.5; background: $theme-color-main;
} }
.active-slide a{ .active-slide a {
opacity: 1; opacity: 1;
} }
} }
} }
.cycle-slide-active {
.cycle-slide-active{
z-index: 101 !important; z-index: 101 !important;
} }

View File

@ -1,448 +1,473 @@
@charset "utf-8"; @charset 'utf-8';
// //
// Widget // Widget
// //
// Announcement widget // Announcement widget
// ## Gerneral styles for widgets // ## Gerneral styles for widgets
.w-annc { .w-annc {
.w-annc__widget-title { .w-annc__widget-title {
@extend .unity-title; @extend .unity-title;
}
.w-annc__list {
margin: 0;
padding: 0;
list-style: none;
}
.w-annc__item {
margin-bottom: 30px;
}
.label {
font-size: .75rem;
font-weight: normal;
}
.w-annc__meta {
.w-annc__status-wrap, .w-annc__postdate-wrap, .w-annc__category-wrap {
font-size: .8125em;
font-weight: normal;
display: inline-block;
margin-right: .2em;
color: $theme-gray;
} }
.w-annc__list { i {
margin: 0; color: $theme-gray;
padding: 0;
list-style: none;
} }
.w-annc__item { }
margin-bottom: 30px; .status-top {
} background: $theme-color-second;
.label { }
font-size: 0.75rem; .status-hot {
font-weight: normal; background: $theme-color-third;
} }
.w-annc__meta { .w-annc__subtitle {
.w-annc__status-wrap, font-size: .8125em;
.w-annc__postdate-wrap, color: $theme-gray;
.w-annc__category-wrap { }
display: inline-block; .w-annc__entry-title {
margin-right: 0.2em; margin-bottom: 10px;
font-size: 0.8125em; }
color: $theme-gray; .w-annc__title {
font-weight: normal; font-family: $sub-font;
} font-size: .8125rem;
i { text-decoration: none;
color: $theme-gray; color: $theme-color-main;
} &: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-1
.widget-announcement-1 { .widget-announcement-1 {
.w-annc__img-wrap { .w-annc__img-wrap {
height: 200px; height: 200px;
margin: 0 0 1em 0; margin: 0 0 1em 0;
} }
.w-annc__title { .w-annc__title {
font-family: $main-font; font-family: $main-font;
line-height: 1.3; font-size: 1.2rem;
font-size: 1.2rem; line-height: 1.3;
} }
} }
// Widget-2 // Widget-2
.widget-announcement-2 { .widget-announcement-2 {
.w-annc__img-wrap { .w-annc__img-wrap {
height: 200px; height: 200px;
margin: 0 0 1em 0; margin: 0 0 1em 0;
} }
.w-annc__title { .w-annc__title {
font-family: $main-font; font-family: $main-font;
line-height: 1.3; font-size: 1.2rem;
font-size: 1.2rem; line-height: 1.3;
} }
} }
// Widget-3 // Widget-3
.widget-announcement-3 { .widget-announcement-3 {
.w-annc__img-wrap { .w-annc__img-wrap {
height: 200px; height: 200px;
margin: 0 0 1em 0; margin: 0 0 1em;
} }
.w-annc__title { .w-annc__title {
font-family: $main-font; font-family: $main-font;
line-height: 1.3; font-size: 1.2rem;
font-size: 1.2rem; line-height: 1.3;
} }
} }
// Widget-4 // Widget-4
.widget-announcement-4 { .widget-announcement-4 {
.w-annc__title { .w-annc__title {
font-family: $main-font; font-family: $main-font;
line-height: 1.3; font-size: 1.2rem;
font-size: 1.2rem; line-height: 1.3;
} }
.w-annc__list > .w-annc__item:nth-child(3n+1) { .w-annc__list > .w-annc__item:nth-child(3n+1) {
clear: both; clear: both;
} }
.w-annc__img-wrap { .w-annc__img-wrap {
height: 200px; height: 200px;
margin: 0 0 1em 0; margin: 0 0 1em;
} }
} }
// Widget-5 // Widget-5
.widget-announcement-5 { .widget-announcement-5 {
.w-annc__title { .w-annc__title {
font-family: $main-font; font-family: $main-font;
line-height: 1.3; font-size: 1.2rem;
font-size: 1.2rem; line-height: 1.3;
} }
.w-annc__item { .w-annc__item {
border-bottom: 1px dashed lighten($theme-gray, 65%); margin-bottom: 1em;
padding-bottom: 1em; padding-bottom: 1em;
margin-bottom: 1em; border-bottom: 1px dashed lighten($theme-gray, 65%);
} }
} }
// Widget-6 // Widget-6
.widget-announcement-6 { .widget-announcement-6 {
.w-annc__item { .w-annc__item {
margin-bottom: 0.8em; margin-bottom: .8em;
padding-bottom: 0.8em; padding-bottom: .8em;
border-bottom: 1px dashed lighten($theme-gray, 65%); border-bottom: 1px dashed lighten($theme-gray, 65%);
} }
.w-annc__entry-title { .w-annc__entry-title {
margin: 0; margin: 0;
} }
.w-annc__category-wrap, .w-annc__category-wrap,
.w-annc__status, .w-annc__status,
.w-annc__title, .w-annc__title,
.w-annc__postdate-wrap { .w-annc__postdate-wrap {
font-size: 0.8125rem; font-size: .8125rem;
} }
.w-annc__status { .w-annc__status {
display: inline-block; display: inline-block;
} }
} }
// Widget-7 // Widget-7
.widget-announcement-7 { .widget-announcement-7 {
.w-annc__item { .w-annc__item {
margin-bottom: 0.8em; margin-bottom: .8em;
padding-bottom: 0.8em; padding-bottom: .8em;
border-bottom: 1px dashed lighten($theme-gray, 65%); border-bottom: 1px dashed lighten($theme-gray, 65%);
} }
.w-annc__entry-title { .w-annc__entry-title {
margin: 0; margin: 0;
} }
.w-annc__category-wrap, .w-annc__category-wrap,
.w-annc__status, .w-annc__status,
.w-annc__title, .w-annc__title,
.w-annc__postdate-wrap { .w-annc__postdate-wrap {
font-size: 0.75rem; font-size: .75rem;
} }
.w-annc__status { .w-annc__status {
display: inline-block; display: inline-block;
} }
} }
// Widget-8 // Widget-8
// ## Table // ## Table
.widget-announcement-8 { .widget-announcement-8 {
.w-annc__th { .w-annc__th {
color: #fff; font-size: .8125em;
background: $theme-color-main; color: $theme-white;
font-size: 0.8125em; border: 0;
border: none; background: $theme-color-main;
} }
.w-annc__status { .w-annc__status {
display: inline-block; font-size: .75rem;
font-size: 0.75rem; display: inline-block;
} }
td { td {
font-size: 0.8125em; font-size: .8125em;
} }
a:hover { a:hover {
text-decoration: none; text-decoration: none;
} }
} }
// Widget-9 // Widget-9
// ## Table // ## Table
.widget-announcement-9 { .widget-announcement-9 {
.w-annc__th { .w-annc__th {
color: #fff; font-size: .8125em;
background: $theme-color-main; color: $theme-white;
font-size: 0.8125em; border: 0;
border: none; background: $theme-color-main;
} }
.w-annc__status { .w-annc__status {
display: inline-block; font-size: .75rem;
font-size: 0.75rem; display: inline-block;
} }
td { td {
font-size: 0.8125em; font-size: .8125em;
} }
a:hover { a:hover {
text-decoration: none; text-decoration: none;
} }
} }
// Widget-10 // Widget-10
.widget-announcement-10 { .widget-announcement-10 {
.w-annc__item { .w-annc__item {
margin-bottom: 0.8em; margin-bottom: .8em;
padding-bottom: 0.8em; padding-bottom: .8em;
border-bottom: 1px dashed lighten($theme-gray, 65%); border-bottom: 1px dashed lighten($theme-gray, 65%);
} }
.w-annc__entry-title { .w-annc__entry-title {
margin: 0; margin: 0;
} }
.w-annc__postdate-wrap { .w-annc__postdate-wrap {
font-size: 0.8125em; font-size: .8125em;
} }
.w-annc__status { .w-annc__status {
display: inline-block; font-size: .75rem;
font-size: 0.75rem; display: inline-block;
} }
} }
// Widget-11 // Widget-11
// ## Table // ## Table
.widget-announcement-11 { .widget-announcement-11 {
.w-annc__th { .w-annc__th {
color: #fff; font-size: .8125em;
background: $theme-color-main; color: $theme-white;
font-size: 0.8125em; border: 0;
border: none; background: $theme-color-main;
} }
.w-annc__status { .w-annc__status {
display: inline-block; font-size: .75rem;
font-size: 0.75rem; display: inline-block;
} }
td { td {
font-size: 0.8125em; font-size: .8125em;
} }
a:hover { a:hover {
text-decoration: none; text-decoration: none;
} }
} }
// Widget-12 // Widget-12
.widget-announcement-12 { .widget-announcement-12 {
.w-annc__list { .w-annc__list {
padding: 0 15px; 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; .w-annc__item {
margin-bottom: 15px; margin-bottom: .8em;
@media (min-width: $screen-md) { padding-bottom: .8em;
height: 200px; border-bottom: 1px dashed lighten($theme-gray, 65%);
margin-bottom: 0; }
} .w-annc__entry-title {
} margin: 0 0 10px 0;
.w-annc__item { @media (min-width: $screen-md) {
margin-bottom: 0.8em; margin-bottom: 0;
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__postdate-wrap {
font-size: .8125em;
}
.w-annc__status {
display: inline-block;
}
.w-annc__postdate {
font-size: .8125rem;
}
} }
// Announcement index // Announcement index
// ## General style for index pages // ## General style for index pages
.i-annc { .i-annc {
.i-annc__page-title { .i-annc__page-title {
@extend .unity-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;
}
.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: .75rem;
font-weight: normal;
}
.i-annc__meta {
.i-annc__status-wrap, .i-annc__postdate-wrap, .i-annc__category-wrap {
font-size: .8125em;
font-weight: normal;
display: inline-block;
margin-right: .2em;
color: $theme-gray;
} }
.i-annc__list { i {
margin: 0; color: $theme-gray;
padding: 0;
list-style: none;
} }
.status-top { }
background: $theme-color-second; .i-annc__subtitle {
} font-size: .8125em;
.status-hot { color: $theme-gray;
background: $theme-color-third; }
} .i-annc__entry-title {
.w-annc__widget-title { margin-bottom: 10px;
@extend .unity-title; }
} .i-annc__title {
.i-annc__item { font-family: $sub-font;
margin-bottom: 30px; font-size: .8125rem;
} text-decoration: none;
.label { color: $theme-color-main;
font-size: 0.75rem; &:hover {
font-weight: normal; color: darken($theme-color-main, 10%);
}
.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%);
}
} }
}
} }
// Index-1 // Index-1
.index-announcement-1 { .index-announcement-1 {
.i-annc__th { .i-annc__th {
color: #fff; font-size: .8125em;
background: $theme-color-main; color: $theme-white;
font-size: 0.8125em; border: 0;
border: none; background: $theme-color-main;
} }
td { td {
font-size: 0.8125rem; font-size: .8125rem;
} }
.i-annc__title:hover { .i-annc__title:hover {
text-decoration: none; text-decoration: none;
} }
} }
// Index-2 // Index-2
.i-announcement-2 { .index-announcement-2,
.i-annc__img-wrap { .index-announcement-3 {
height: 200px; .i-annc__img-wrap {
margin: 0 0 1em 0; margin: 0 0 1em;
} }
.i-annc__title { .i-annc__title {
font-family: $main-font; font-family: $main-font;
line-height: 1.3; font-size: 1.2rem;
font-size: 1.2rem; line-height: 1.3;
} }
} }
// Announcement show // Announcement show
.s-annc { .s-annc {
.s-annc__show-title { .s-annc__show-title {
@extend .unity-title; @extend .unity-title;
}
.s-annc__meta-wrap {
border-bottom: 1px solid $theme-gray-light;
@include clearfix;
.s-annc__meta--item {
font-size: .875rem;
float: left;
margin-right: 1em;
margin-bottom: .6em;
i {
color: darken($theme-gray-light, 10%);
}
} }
.s-annc__meta-wrap { .s-annc__tag-wrap {
border-bottom: 1px solid $theme-gray-light; position: relative;
@include clearfix; float: none;
.s-annc__meta--item { clear: both;
font-size: 0.875rem; margin-right: 0;
margin-right: 1em; padding-left: 1.6em;
margin-bottom: 0.6em; i {
float: left; position: absolute;
i { top: 7px;
color: darken($theme-gray-light, 10%); left: 0;
} }
}
.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 { .s-annc__tag-wrap {
@include clearfix; .s-annc__tag {
margin-bottom: 2em; font-weight: normal;
}
} }
.s-annc__related-wrap { }
padding-top: 1em; .s-annc__post-wrap {
border-top: 1px dotted $theme-gray-light; margin-bottom: 2em;
@include clearfix;
}
.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 {
float: left;
margin: 8px 0 0 -1.6em;
color: darken($theme-gray-light, 10%);
} }
.s-annc__related-file { }
margin-bottom: 15px; .s-annc__related-link-list,
} .s-annc__related-file-list {
.s-annc__related-file, display: inline-block;
.s-annc__related-link { }
padding-bottom: 6px; .s-annc__flie-title {
padding-left: 1.6em; overflow: hidden;
i { max-width: 9.375rem;
margin: 8px 0 0 -1.6em; white-space: nowrap;
float: left; text-overflow: ellipsis;
color: darken($theme-gray-light, 10%); }
} }
a { //
// Widget
//
// Admission widget
// ## Gerneral styles for widgets
// Widget-8
// ## Table
.widget-admission-1 {
.w-adm__th {
font-size: .8125em;
color: $theme-white;
border: 0;
background: $theme-color-main;
}
.w-adm__status {
font-size: .75rem;
display: inline-block;
}
td {
font-size: .8125em;
}
a:hover {
text-decoration: none;
}
}
// ## Table
.widget-admission-1 {
.w-adm__th {
font-size: .8125em;
color: $theme-white;
border: 0;
background: $theme-color-main;
}
.w-adm__status {
font-size: .75rem;
display: inline-block;
}
td {
font-size: .8125em;
}
a:hover {
text-decoration: none;
}
}
}
}
.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;
}
}

View File

@ -7,13 +7,11 @@
@import "base/pagination"; @import "base/pagination";
@import "base/orbitbar-override"; @import "base/orbitbar-override";
@import "base/global"; @import "base/global";
// Layout // Layout
@import "layout/header"; @import "layout/header";
@import "layout/slide"; @import "layout/slide";
@import "layout/content"; @import "layout/content";
@import "layout/footer"; @import "layout/footer";
// // Modules // // Modules
@import "modules/menu"; @import "modules/menu";
@import "modules/ad_banner"; @import "modules/ad_banner";
@ -24,7 +22,7 @@
@import "modules/archives"; @import "modules/archives";
@import "modules/member"; @import "modules/member";
@import "modules/personal_plugin"; @import "modules/personal_plugin";
// Widget // Widget
@import "widget/breadcrumb"; @import "widget/breadcrumb";
@import "widget/sitemenu"; @import "widget/sitemenu";

View File

@ -1,52 +1,53 @@
.sitemenu-wrap { .sitemenu-wrap {
padding: 10px 0; padding: 10px 0;
@include clearfix; @include clearfix;
.sitemenu__title { .sitemenu__title {
display: none; display: none;
}
.sitemenu__list {
margin: 0;
padding: 0;
list-style: none;
}
.sitemenu__item.level-1 {
font-size: 0.8125rem;
position: relative;
float: left;
margin-right: 1%;
margin-bottom: 12px;
padding: 8px .8em;
padding-bottom: 8px;
color: $theme-white;
border-radius: .2em;
background: $theme-color-second;
&:hover {
background: darken($theme-color-second, 10%);
} }
.sitemenu__list { }
margin: 0; .sitemenu__link.level-1 {
padding: 0; margin-right: .25rem;
list-style: none; color: $theme-white;
}
.sitemenu___dropdown-toggle {
font-size: 0.75rem;
padding: 2px .3125rem;
cursor: pointer;
}
// sitemenu dropdown
.sitemenu__list.dropdown-menu {
min-width: 100%;
margin-top: 4px;
border: none;
border-radius: .2em;
background: $theme-color-main;
}
.sitemenu__link.level-2 {
color: $theme-white;
font-size: 0.8125rem;
padding: 4px 0.625rem;
&:hover {
background: lighten($theme-color-second, 5%);
} }
.sitemenu__item.level-1 { }
font-size: 0.8125rem; }
position: relative;
float: left;
margin-right: 1%;
margin-bottom: 12px;
padding: 8px .8em;
padding-bottom: 8px;
color: #fff;
border-radius: .2em;
background: $theme-color-second;
&:hover {
background: darken($theme-color-second, 10%);
}
}
.sitemenu__link.level-1 {
margin-right: .25rem;
color: #fff;
}
.sitemenu___dropdown-toggle {
font-size: 0.75rem;
padding: 2px .3125rem;
cursor: pointer;
}
// sitemenu dropdown
.sitemenu__list.dropdown-menu {
min-width: 100%;
margin-top: 4px;
border: none;
border-radius: .2em;
background: $theme-color-main;
}
.sitemenu__link.level-2 {
color: #fff;
font-size: 0.8125rem;
padding: 4px 0.625rem;
&:hover {
background: lighten($theme-color-second, 5%);
}
}
}

View File

@ -1,24 +1,27 @@
<table class="table table-hover table-striped active-index"> <table class="table table-hover table-striped active-index">
<caption> <caption>
<h3>{{page-title}}</h3> <h3>{{page-title}}</h3>
</caption> </caption>
<thead> <thead>
<tr> <tr>
<th class="col-md-2">{{th_category}}</th> <th class="col-md-2">{{th_category}}</th>
<th class="col-md-2">{{th_act_time_range}}</th> <th class="col-md-2">{{th_act_time_range}}</th>
<th class="col-md-5">{{th_title}}</th> <th class="col-md-5">{{th_title}}</th>
<th class="col-md-2">{{th_sign_up_time_range}}</th> <th class="col-md-2">{{th_sign_up_time_range}}</th>
<th class="col-md-2">{{th_sign_up}}</th> <th class="col-md-2">{{th_sign_up}}</th>
</tr> </tr>
</thead> </thead>
<tbody data-level="0" data-list="acts"> <tbody data-level="0" data-list="acts">
<tr> <tr>
<td>{{category}}</td> <td>{{category}}</td>
<td>{{act_start_date}} ~ <br /> {{act_end_date}}</td> <td>{{act_start_date}} ~
<td>{{title}}</td> <br /> {{act_end_date}}</td>
<td>{{sign_start_date}} ~ <br /> {{sign_end_date}}</td> <td>{{title}}</td>
<td>{{sign_up}}</i></td> <td>{{sign_start_date}} ~
</tr> <br /> {{sign_end_date}}</td>
</tbody> <td>{{sign_up}}</i>
</td>
</tr>
</tbody>
</table> </table>
{{pagination_goes_here}} {{pagination_goes_here}}

View File

@ -0,0 +1,24 @@
<div class="w-adm widget-admission-1">
<h3 class="w-adm__widget-title">
<span>{{widget-title}}</span>
</h3>
<table class="w-adm__table table">
<thead>
<tr>
<th class="w-adm__th w-adm__th--category">{{category-head}}</th>
<th class="w-adm__th w-adm__th--title">{{title-head}}</th>
</tr>
</thead>
<tbody data-level="0" data-list="announcements">
<tr>
<td class="w-adm__category">{{category}}</td>
<td>
<span class="w-adm__status-wrap" data-list="statuses" data-level="1">
<span class="w-adm__status label status {{status-class}}">{{status}}</span>
</span>
<a class="w-adm__title" href="{{link_to_show}}">{{title}}</a>
</td>
</tr>
</tbody>
</table>
</div>

View File

@ -1,4 +1,4 @@
<div class="w-annc widget-announcement-1"> <div class="w-annc widget-announcement-1">
<h3 class="w-annc__widget-title"> <h3 class="w-annc__widget-title">
<span>{{widget-title}}</span> <span>{{widget-title}}</span>
</h3> </h3>

View File

@ -1,16 +1,16 @@
<div class="w-annc widget-announcement-10"> <div class="w-annc widget-announcement-10">
<h3 class="w-annc__widget-title"> <h3 class="w-annc__widget-title">
<span>{{widget-title}}</span> <span>{{widget-title}}</span>
</h3> </h3>
<ul class="w-annc__list" data-level="0" data-list="announcements"> <ul class="w-annc__list" data-level="0" data-list="announcements">
<li class="w-annc__item row"> <li class="w-annc__item row">
<h4 class="w-annc__entry-title col-sm-9"> <h4 class="w-annc__entry-title col-sm-9">
<span class="w-annc__status-wrap" data-list="statuses" data-level="1"> <span class="w-annc__status-wrap" data-list="statuses" data-level="1">
<span class="w-annc__status label {{status-class}}">{{status}}</span> <span class="w-annc__status label {{status-class}}">{{status}}</span>
</span> </span>
<a class="w-annc__title" href="{{link_to_show}}">{{title}}</a> <a class="w-annc__title" href="{{link_to_show}}">{{title}}</a>
</h4> </h4>
<span class="w-annc__postdate-wrap col-sm-3" date-format="%Y-%m-%d"> <span class="w-annc__postdate-wrap col-sm-3" date-format="%Y-%m-%d">
<i class="fa fa-calendar-o"></i> <i class="fa fa-calendar-o"></i>
<span class="w-annc__postdate">{{postdate}}</span> <span class="w-annc__postdate">{{postdate}}</span>
</span> </span>

View File

@ -1,19 +1,19 @@
<div class="w-annc widget-announcement-11"> <div class="w-annc widget-announcement-11">
<h3 class="w-annc__widget-title"> <h3 class="w-annc__widget-title">
<span>{{widget-title}}</span> <span>{{widget-title}}</span>
</h3> </h3>
<table class="w-annc__table table"> <table class="w-annc__table table">
<thead> <thead>
<tr> <tr>
<th class="w-annc__th w-annc__th--title">{{title-head}}</th> <th class="w-annc__th w-annc__th--title">{{title-head}}</th>
<th class="w-annc__th w-annc__th--date">{{date-head}}</th> <th class="w-annc__th w-annc__th--date">{{date-head}}</th>
</tr> </tr>
</thead> </thead>
<tbody data-level="0" data-list="announcements"> <tbody data-level="0" data-list="announcements">
<tr> <tr>
<td> <td>
<span class="w-annc__status-wrap" data-list="statuses" data-level="1"> <span class="w-annc__status-wrap" data-list="statuses" data-level="1">
<span class="w-annc__status label status {{status-class}}">{{status}}</span> <span class="w-annc__status label status {{status-class}}">{{status}}</span>
</span> </span>
<a class="w-annc__title" href="{{link_to_show}}">{{title}}</a> <a class="w-annc__title" href="{{link_to_show}}">{{title}}</a>
</td> </td>

View File

@ -1,21 +1,21 @@
<div class="w-annc widget-announcement-12"> <div class="w-annc widget-announcement-12">
<h3 class="w-annc__widget-title"> <h3 class="w-annc__widget-title">
<span>{{widget-title}}</span> <span>{{widget-title}}</span>
</h3> </h3>
<div class="w-annc__inner row"> <div class="w-annc__inner row">
<div class="w-annc__img-wrap col-md-4 bullseye"> <div class="w-annc__img-wrap col-md-4 bullseye">
<img class="w-annc__img" src="{{main_picture}}" alt="{{main_picture_description}}"> <img class="w-annc__img" src="{{main_picture}}" alt="{{main_picture_description}}">
</div> </div>
<ul class="w-annc__list col-md-8" data-level="0" data-list="announcements"> <ul class="w-annc__list col-md-8" data-level="0" data-list="announcements">
<li class="w-annc__item"> <li class="w-annc__item">
<div class="w-annc__content row"> <div class="w-annc__content row">
<h4 class="w-annc__entry-title col-md-9"> <h4 class="w-annc__entry-title col-md-9">
<span class="w-annc__status-wrap" data-list="statuses" data-level="1"> <span class="w-annc__status-wrap" data-list="statuses" data-level="1">
<span class="w-annc__status label {{status-class}}">{{status}}</span> <span class="w-annc__status label {{status-class}}">{{status}}</span>
</span> </span>
<a class="w-annc__title" href="{{link_to_show}}">{{title}}</a> <a class="w-annc__title" href="{{link_to_show}}">{{title}}</a>
</h4> </h4>
<span class="w-annc__postdate-wrap col-md-3" date-format="%Y-%m-%d"> <span class="w-annc__postdate-wrap col-md-3" date-format="%Y-%m-%d">
<i class="fa fa-calendar-o"></i> <i class="fa fa-calendar-o"></i>
<span class="w-annc__postdate">{{postdate}}</span> <span class="w-annc__postdate">{{postdate}}</span>
</span> </span>

View File

@ -1,13 +1,13 @@
<div class="w-annc widget-announcement-2"> <div class="w-annc widget-announcement-2">
<h3 class="w-annc__widget-title"> <h3 class="w-annc__widget-title">
<span>{{widget-title}}</span> <span>{{widget-title}}</span>
</h3> </h3>
<ul class="w-annc__list" data-level="0" data-list="announcements"> <ul class="w-annc__list" data-level="0" data-list="announcements">
<li class="w-annc__item row"> <li class="w-annc__item row">
<div class="w-annc__img-wrap col-sm-4 bullseye"> <div class="w-annc__img-wrap col-sm-4 bullseye">
<img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}"> <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}">
</div> </div>
<div class="w-annc__content-wrap col-sm-8"> <div class="w-annc__content-wrap col-sm-8">
<div class="w-annc__meta"> <div class="w-annc__meta">
<span class="w-annc__status-wrap" data-list="statuses" data-level="1"> <span class="w-annc__status-wrap" data-list="statuses" data-level="1">
<span class="w-annc__status label {{status-class}}">{{status}}</span> <span class="w-annc__status label {{status-class}}">{{status}}</span>

View File

@ -1,10 +1,10 @@
<div class="w-annc widget-announcement-3"> <div class="w-annc widget-announcement-3">
<h3 class="w-annc__widget-title"> <h3 class="w-annc__widget-title">
<span>{{widget-title}}</span> <span>{{widget-title}}</span>
</h3> </h3>
<ul class="w-annc__list" data-level="0" data-list="announcements"> <ul class="w-annc__list" data-level="0" data-list="announcements">
<li class="w-annc__item row"> <li class="w-annc__item row">
<div class="w-annc__content-wrap col-sm-8"> <div class="w-annc__content-wrap col-sm-8">
<div class="w-annc__meta"> <div class="w-annc__meta">
<span class="w-annc__status-wrap" data-list="statuses" data-level="1"> <span class="w-annc__status-wrap" data-list="statuses" data-level="1">
<span class="w-annc__status label {{status-class}}">{{status}}</span> <span class="w-annc__status label {{status-class}}">{{status}}</span>
@ -23,7 +23,7 @@
</h4> </h4>
<p class="w-annc__subtitle">{{subtitle}}</p> <p class="w-annc__subtitle">{{subtitle}}</p>
</div> </div>
<div class="w-annc__img-wrap col-sm-4 bullseye"> <div class="w-annc__img-wrap col-sm-4 bullseye">
<img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}"> <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}">
</div> </div>
</li> </li>

View File

@ -1,10 +1,10 @@
<div class="w-annc widget-announcement-4"> <div class="w-annc widget-announcement-4">
<h3 class="w-annc__widget-title"> <h3 class="w-annc__widget-title">
<span>{{widget-title}}</span> <span>{{widget-title}}</span>
</h3> </h3>
<ul class="w-annc__list row" data-level="0" data-list="announcements"> <ul class="w-annc__list row" data-level="0" data-list="announcements">
<li class="w-annc__item col-md-4"> <li class="w-annc__item col-md-4">
<div class="w-annc__img-wrap bullseye"> <div class="w-annc__img-wrap bullseye">
<img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}"> <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}">
</div> </div>
<div class="w-annc__content-wrap"> <div class="w-annc__content-wrap">

View File

@ -1,8 +1,8 @@
<div class="w-annc widget-announcement-5"> <div class="w-annc widget-announcement-5">
<h3 class="w-annc__widget-title"> <h3 class="w-annc__widget-title">
<span>{{widget-title}}</span> <span>{{widget-title}}</span>
</h3> </h3>
<ul class="w-annc__list row" data-level="0" data-list="announcements"> <ul class="w-annc__list row" data-level="0" data-list="announcements">
<li class="w-annc__item"> <li class="w-annc__item">
<div class="w-annc__content-wrap"> <div class="w-annc__content-wrap">
<div class="w-annc__meta"> <div class="w-annc__meta">

View File

@ -1,20 +1,20 @@
<div class="w-annc widget-announcement-6"> <div class="w-annc widget-announcement-6">
<h3 class="w-annc__widget-title"> <h3 class="w-annc__widget-title">
<span>{{widget-title}}</span> <span>{{widget-title}}</span>
</h3> </h3>
<ul class="w-annc__list" data-level="0" data-list="announcements"> <ul class="w-annc__list" data-level="0" data-list="announcements">
<li class="w-annc__item row"> <li class="w-annc__item row">
<span class="w-annc__category-wrap col-sm-2"> <span class="w-annc__category-wrap col-sm-2">
<i class="fa fa-tasks"></i> <i class="fa fa-tasks"></i>
<span class="w-annc__category">{{category}}</span> <span class="w-annc__category">{{category}}</span>
</span> </span>
<h4 class="w-annc__entry-title col-sm-8"> <h4 class="w-annc__entry-title col-sm-8">
<span class="w-annc__status-wrap" data-list="statuses" data-level="1"> <span class="w-annc__status-wrap" data-list="statuses" data-level="1">
<span class="w-annc__status label {{status-class}}">{{status}}</span> <span class="w-annc__status label {{status-class}}">{{status}}</span>
</span> </span>
<a class="w-annc__title" href="{{link_to_show}}">{{title}}</a> <a class="w-annc__title" href="{{link_to_show}}">{{title}}</a>
</h4> </h4>
<span class="w-annc__postdate-wrap col-sm-2" date-format="%Y-%m-%d"> <span class="w-annc__postdate-wrap col-sm-2" date-format="%Y-%m-%d">
<i class="fa fa-calendar-o"></i> <i class="fa fa-calendar-o"></i>
<span class="w-annc__postdate">{{postdate}}</span> <span class="w-annc__postdate">{{postdate}}</span>
</span> </span>

View File

@ -1,20 +1,20 @@
<div class="w-annc widget-announcement-7"> <div class="w-annc widget-announcement-7">
<h3 class="w-annc__widget-title"> <h3 class="w-annc__widget-title">
<span>{{widget-title}}</span> <span>{{widget-title}}</span>
</h3> </h3>
<ul class="w-annc__list" data-level="0" data-list="announcements"> <ul class="w-annc__list" data-level="0" data-list="announcements">
<li class="w-annc__item row"> <li class="w-annc__item row">
<span class="w-annc__postdate-wrap col-sm-2" date-format="%Y-%m-%d"> <span class="w-annc__postdate-wrap col-sm-2" date-format="%Y-%m-%d">
<i class="fa fa-calendar-o"></i> <i class="fa fa-calendar-o"></i>
<span class="w-annc__postdate">{{postdate}}</span> <span class="w-annc__postdate">{{postdate}}</span>
</span> </span>
<h4 class="w-annc__entry-title col-sm-8"> <h4 class="w-annc__entry-title col-sm-8">
<span class="w-annc__status-wrap" data-list="statuses" data-level="1"> <span class="w-annc__status-wrap" data-list="statuses" data-level="1">
<span class="w-annc__status label {{status-class}}">{{status}}</span> <span class="w-annc__status label {{status-class}}">{{status}}</span>
</span> </span>
<a class="w-annc__title" href="{{link_to_show}}">{{title}}</a> <a class="w-annc__title" href="{{link_to_show}}">{{title}}</a>
</h4> </h4>
<span class="w-annc__category-wrap col-sm-2"> <span class="w-annc__category-wrap col-sm-2">
<i class="fa fa-tasks"></i> <i class="fa fa-tasks"></i>
<span class="w-annc__category">{{category}}</span> <span class="w-annc__category">{{category}}</span>
</span> </span>

View File

@ -1,13 +1,13 @@
<div class="w-annc widget-announcement-8"> <div class="w-annc widget-announcement-8">
<h3 class="w-annc__widget-title"> <h3 class="w-annc__widget-title">
<span>{{widget-title}}</span> <span>{{widget-title}}</span>
</h3> </h3>
<table class="w-annc__table table"> <table class="w-annc__table table">
<thead> <thead>
<tr> <tr>
<th class="w-annc__th w-annc__th--category">{{category-head}}</th> <th class="w-annc__th w-annc__th--category">{{category-head}}</th>
<th class="w-annc__th w-annc__th--title">{{title-head}}</th> <th class="w-annc__th w-annc__th--title">{{title-head}}</th>
<th class="w-annc__th w-annc__th--date">{{date-head}}</th> <th class="w-annc__th w-annc__th--date">{{date-head}}</th>
</tr> </tr>
</thead> </thead>
<tbody data-level="0" data-list="announcements"> <tbody data-level="0" data-list="announcements">
@ -15,7 +15,7 @@
<td class="w-annc__category">{{category}}</td> <td class="w-annc__category">{{category}}</td>
<td> <td>
<span class="w-annc__status-wrap" data-list="statuses" data-level="1"> <span class="w-annc__status-wrap" data-list="statuses" data-level="1">
<span class="w-annc__status label status {{status-class}}">{{status}}</span> <span class="w-annc__status label status {{status-class}}">{{status}}</span>
</span> </span>
<a class="w-annc__title" href="{{link_to_show}}">{{title}}</a> <a class="w-annc__title" href="{{link_to_show}}">{{title}}</a>
</td> </td>

View File

@ -1,13 +1,13 @@
<div class="w-annc widget-announcement-9"> <div class="w-annc widget-announcement-9">
<h3 class="w-annc__widget-title"> <h3 class="w-annc__widget-title">
<span>{{widget-title}}</span> <span>{{widget-title}}</span>
</h3> </h3>
<table class="w-annc__table table"> <table class="w-annc__table table">
<thead> <thead>
<tr> <tr>
<th class="w-annc__th w-annc__th--date">{{date-head}}</th> <th class="w-annc__th w-annc__th--date">{{date-head}}</th>
<th class="w-annc__th w-annc__th--title">{{title-head}}</th> <th class="w-annc__th w-annc__th--title">{{title-head}}</th>
<th class="w-annc__th w-annc__th--category">{{category-head}}</th> <th class="w-annc__th w-annc__th--category">{{category-head}}</th>
</tr> </tr>
</thead> </thead>
<tbody data-level="0" data-list="announcements"> <tbody data-level="0" data-list="announcements">
@ -15,7 +15,7 @@
<td class="w-annc__postdate" date-format="%Y-%m-%d">{{postdate}}</td> <td class="w-annc__postdate" date-format="%Y-%m-%d">{{postdate}}</td>
<td> <td>
<span class="w-annc__status-wrap" data-list="statuses" data-level="1"> <span class="w-annc__status-wrap" data-list="statuses" data-level="1">
<span class="w-annc__status label status {{status-class}}">{{status}}</span> <span class="w-annc__status label status {{status-class}}">{{status}}</span>
</span> </span>
<a class="w-annc__title" href="{{link_to_show}}">{{title}}</a> <a class="w-annc__title" href="{{link_to_show}}">{{title}}</a>
</td> </td>

View File

@ -1,16 +1,18 @@
<div class="i-annc index-announcement-1 {{display}}"> <div class="i-annc index-announcement-1 {{display}}">
<h3 class="i-annc__page-title">{{page-title}}</h3> <h3 class="i-annc__page-title">{{page-title}}</h3>
<table class="i-annc__table table table-striped"> <table class="i-annc__table table table-striped">
<thead> <thead>
<tr> <tr>
<th class="i-annc__th i-annc__th--date">{{date-head}}</th> <th class="i-annc__th i-annc__th--date">{{date-head}}</th>
<th class="i-annc__th i-annc__th--title">{{title-head}}</th> <th class="i-annc__th i-annc__th--title">{{title-head}}</th>
<th class="i-annc__th i-annc__th--title">{{category-head}}</th>
</tr> </tr>
</thead> </thead>
<tbody data-level="0" data-list="announcements"> <tbody data-level="0" data-list="announcements">
<tr> <tr>
<td><span class="i-annc__postdate" date-format="%Y-%m-%d">{{postdate}}</span></td> <td><span class="i-annc__postdate" date-format="%Y-%m-%d">{{postdate}}</span></td>
<td><a class="i-annc__title" href="{{link_to_show}}">{{title}}</a></td> <td><a class="i-annc__title" href="{{link_to_show}}">{{title}}</a></td>
<td>{{category}}</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>

View File

@ -1,11 +1,11 @@
<div class="i-annc index-announcement-2 {{display}}"> <div class="i-annc index-announcement-2 {{display}}">
<h3 class="i-annc__page-title">{{page-title}}</h3> <h3 class="i-annc__page-title">{{page-title}}</h3>
<ul class="i-annc__list" data-level="0" data-list="announcements"> <ul class="i-annc__list" data-level="0" data-list="announcements">
<li class="i-annc__item"> <li class="i-annc__item row">
<div class="i-annc__img-wrap bullseye"> <div class="i-annc__img-wrap col-sm-4">
<img class="i-annc__img" src="{{img_src}}" alt="{{img_description}}"> <img class="i-annc__img" src="{{img_src}}" alt="{{img_description}}">
</div> </div>
<div class="i-annc__content-wrap"> <div class="i-annc__content-wrap col-sm-8">
<div class="i-annc__meta"> <div class="i-annc__meta">
<span class="i-annc__status-wrap" data-list="statuses" data-level="1"> <span class="i-annc__status-wrap" data-list="statuses" data-level="1">
<span class="i-annc__status label status {{status-class}}">{{status}}</span> <span class="i-annc__status label status {{status-class}}">{{status}}</span>
@ -24,7 +24,7 @@
</h4> </h4>
<p class="i-annc__subtitle">{{subtitle}}</p> <p class="i-annc__subtitle">{{subtitle}}</p>
</div> </div>
</li> </li>
</ul> </ul>
</div> </div>
{{pagination_goes_here}} {{pagination_goes_here}}

View File

@ -0,0 +1,30 @@
<div class="i-annc index-announcement-3 {{display}}">
<h3 class="i-annc__page-title">{{page-title}}</h3>
<ul class="i-annc__list" data-level="0" data-list="announcements">
<li class="i-annc__item row">
<div class="i-annc__content-wrap col-sm-8">
<div class="i-annc__meta">
<span class="i-annc__status-wrap" data-list="statuses" data-level="1">
<span class="i-annc__status label status {{status-class}}">{{status}}</span>
</span>
<span class="i-annc__postdate-wrap" date-format="%Y-%m-%d">
<i class="fa fa-calendar-o"></i>
<span class="i-annc__postdate">{{postdate}}</span>
</span>
<span class="i-annc__category-wrap">
<i class="fa fa-tasks"></i>
<span class="i-annc__category">{{category}}</span>
</span>
</div>
<h4 class="i-annc__entry-title">
<a class="i-annc__title" href="{{link_to_show}}">{{title}}</a>
</h4>
<p class="i-annc__subtitle">{{subtitle}}</p>
</div>
<div class="i-annc__img-wrap col-sm-4">
<img class="i-annc__img" src="{{img_src}}" alt="{{img_description}}">
</div>
</li>
</ul>
</div>
{{pagination_goes_here}}

View File

@ -3,18 +3,26 @@
{ {
"filename" : "annc_index1", "filename" : "annc_index1",
"name" : { "name" : {
"zh_tw" : "1. 標準表格列表 ( 模組標題, 日期, 標題 )", "zh_tw" : "1. 標準表格列表 ( 模組標題, 日期, 標題, 類別 )",
"en" : "1. Standard Table List (widget-title, postdate, title)" "en" : "1. Standard Table List (widget-title, postdate, title, category)"
}, },
"thumbnail" : "annc_index1_thumbs.png" "thumbnail" : "annc_index1_thumbs.png"
}, },
{ {
"filename" : "annc_index2", "filename" : "annc_index2",
"name" : { "name" : {
"zh_tw" : "2. 標準圖片 ( 模組標題, 日期, 標題, 圖片, 閱讀更多, 標籤 )", "zh_tw" : "2. 右圖左文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
"en" : "2. Standard Image + Text (widget-title, postdate, title, image)" "en" : "2. Balanced Image + Text(Right) (widget-title, image, status, postdate, category, title, subtitle)"
}, },
"thumbnail" : "annc_index2_thumbs.png" "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)"
},
"thumbnail" : "annc_index3_thumbs.png"
} }
], ],
"widgets" : [ "widgets" : [
@ -113,6 +121,14 @@
"en" : "12. 1 Image + Title List (widget-title, status, title, postdate)" "en" : "12. 1 Image + Title List (widget-title, status, title, postdate)"
}, },
"thumbnail" : "annc_widget12_thumbs.png" "thumbnail" : "annc_widget12_thumbs.png"
},
{
"filename" : "admission_widget1",
"name" : {
"zh_tw" : "招生模組: 1. 標準表格列表 ( 模組標題, 類別, 標題, 檔案下載, 超連結 )",
"en" : "Admission: 1. Standard Table List (widget-title, category, title, attatchment, link)"
},
"thumbnail" : "admission_widget1_thumbs.png"
} }
] ]
} }

View File

@ -26,7 +26,7 @@
<li class="s-annc__related-file"> <li class="s-annc__related-file">
<i class="fa fa-fw fa-paperclip"></i> <i class="fa fa-fw fa-paperclip"></i>
<div class="s-annc__related-file-list" data-list="bulletin_files" data-level="0"> <div class="s-annc__related-file-list" data-list="bulletin_files" data-level="0">
<a class="s-annc__flie-title btn btn-default btn-sm" href="{{file_url}}">{{file_title}}</a> <a class="s-annc__flie-title btn btn-default btn-sm" href="{{file_url}}" target="_blank">{{file_title}}</a>
</div> </div>
</li> </li>

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

View File

@ -1,10 +1,10 @@
<div class="w-archive widget-archive-1" module="archive" data-ps=""> <div class="w-archive widget-archive-1" module="archive" data-ps="">
<h3 class="w-archive__widget-title">{{widget-title}}</h3> <h3 class="w-archive__widget-title">{{widget-title}}</h3>
<ul class="w-archive__list level-1" data-list="categories" data-level="0"> <ul class="w-archive__list level-1" data-list="categories" data-level="0">
<li class="w-archive__item level-1"> <li class="w-archive__item level-1">
<h4 class="w-archive__item-heading">{{category-title}}</h4> <h4 class="w-archive__item-heading">{{category-title}}</h4>
<ul class="w-archive__list level-2" data-list="archives" data-level="1"> <ul class="w-archive__list level-2" data-list="archives" data-level="1">
<li class="w-archive__item level-2"> <li class="w-archive__item level-2">
<a class="w-archive__link" href="{{archive_url}}">{{archive-title}}</a> <a class="w-archive__link" href="{{archive_url}}">{{archive-title}}</a>
</li> </li>
</ul> </ul>

View File

@ -1,4 +1,4 @@
<div class="i-archive index-archive-1"> <div class="i-archive index-archive-1">
<h3 class="i-archive__page-title">{{page-title}}</h3> <h3 class="i-archive__page-title">{{page-title}}</h3>
<ul class="i-archive__list" data-list="categories" data-level="0"> <ul class="i-archive__list" data-list="categories" data-level="0">
<li class="i-archive__item"> <li class="i-archive__item">
@ -8,13 +8,13 @@
<dt class="i-archive__category-item"> <dt class="i-archive__category-item">
<sapn class="i-archive__archive-title">{{archive-title}}</span> <sapn class="i-archive__archive-title">{{archive-title}}</span>
<span class="i-archive__status-wrap" data-list="statuses" data-level="2"> <span class="i-archive__status-wrap" data-list="statuses" data-level="2">
<span class="i-archive__status label status {{status-class}}">{{status}}</span> <span class="i-archive__status label status {{status-class}}">{{status}}</span>
</span> </span>
</dt> </dt>
<dl class="i-archive__file-list" data-list="files" data-level="2"> <dl class="i-archive__file-list" data-list="files" data-level="2">
<dd class="i-archive__file-wrap"> <dd class="i-archive__file-wrap">
<a class="i-archive__file-name" href="{{file-url}}" target="_blank">{{file-name}}</a> <a class="i-archive__file-name" href="{{file-url}}" target="_blank">{{file-name}}</a>
<span class="i-archive__file-type label label-primary">{{file-type}}</span> <span class="i-archive__file-type label label-primary">{{file-type}}</span>
</dd> </dd>
</dl> </dl>
</div> </div>

View File

@ -12,7 +12,7 @@
</a> </a>
</h4> </h4>
</div> </div>
<div id="collapse" class="panel-collapse collapse"> <div id="collapse" class="panel-collapse collapse in">
<div class="panel-body"> <div class="panel-body">
<dl class="dl-horizontal index-archive-item-group" data-list="archives" data-level="1"> <dl class="dl-horizontal index-archive-item-group" data-list="archives" data-level="1">
<dt class="index-archive-item-list"> <dt class="index-archive-item-list">
@ -21,7 +21,7 @@
<span class="label status {{status-class}}">{{status}}</span> <span class="label status {{status-class}}">{{status}}</span>
</span> </span>
</dt> </dt>
<dl class="index-archives-files-list" data-list="files" data-level="2"> <dl class="index-archives-files-list" data-list="files" data-level="2">
<dd> <dd>
<a href="{{file-url}}" class="index-archives-files-item" target="_blank">{{file-name}}</a> <a href="{{file-url}}" class="index-archives-files-item" target="_blank">{{file-name}}</a>
<span class="label label-primary">{{file-type}}</span> <span class="label label-primary">{{file-type}}</span>

View File

@ -166,7 +166,7 @@
<i class="icon-remove">&nbsp;&nbsp;&nbsp;&nbsp;<%= t("update_manager_.update_faild") %></i> <i class="icon-remove">&nbsp;&nbsp;&nbsp;&nbsp;<%= t("update_manager_.update_faild") %></i>
</div> </div>
<div id="update_progress"> <div id="update_progress">
<img src="http://ridepal.com/images/homeimg/preloader_transparent.gif" width="50"><br/> <img src="/assets/spin.gif" width="50"><br/>
<span id="progress_msg"></span> <span id="progress_msg"></span>
</div> </div>
</div> </div>

View File

@ -1,4 +1,4 @@
<%#= content_for :page_specific_css do -%> <%# content_for :page_specific_css do -%>
<%= stylesheet_link_tag "basic/icon" %> <%= stylesheet_link_tag "basic/icon" %>
<%= stylesheet_link_tag "lib/orbit_bar/orbit-bar" %> <%= stylesheet_link_tag "lib/orbit_bar/orbit-bar" %>
<%# end -%> <%# end -%>

View File

@ -1 +1,14 @@
Google account successfully connected. <!-- Successful message -->
<div class="message-wrap google-success">
<div class="message-body">
<div class="message-image-wrap state-success">
<img class="message-image" src="/assets/google-account.png" alt="Google Account">
<i class="icon-ok message-icon success-skin"></i>
</div>
<h3 class="message-heading">Connected</h3>
<p class="message-paragraph">Google account is sucessfully connected.</p>
<div class="message-button-wrap">
<a class="google-btn btn btn-success btn-large" href="<%= admin_member_path(current_user.member_profile.to_param) %>">Got it!</a>
</div>
</div>
</div>

View File

@ -1 +1,14 @@
Google account could not be connected. <!-- Failure message -->
<div class="message-wrap google-fail">
<div class="message-body">
<div class="message-image-wrap">
<img class="message-image" src="/assets/google-account.png" alt="Google Account">
<i class="icon-remove message-icon fail-skin"></i>
</div>
<h3 class="message-heading">Failed</h3>
<p class="message-paragraph">Sorry, Google could not be connected successfully.</p>
<div class="message-button-wrap">
<a class="google-btn btn btn-danger btn-large" href="<%= admin_member_path(current_user.member_profile.to_param) %>">Profile</a>
</div>
</div>
</div>

View File

@ -1 +1,14 @@
Google account is not connected. Please login using your username and password and then connect google account in your member profile. <!-- Login require -->
<div class="message-wrap google-login-require">
<div class="message-body">
<div class="message-image-wrap state-login-require">
<img class="message-image" src="/assets/google-account.png" alt="Google Account">
<i class="icons-question message-icon info-skin"></i>
</div>
<h3 class="message-heading">Failed</h3>
<p class="message-paragraph">Google account is not connected. Please login using your username and password and then connect google account in your member profile.</p>
<div class="message-button-wrap">
<a class="google-btn btn btn-info btn-large" href="<%= new_session_path %>">Login</a>
</div>
</div>
</div>

View File

@ -1,3 +1,5 @@
<section id="main-wrap"> <% content_for :page_specific_css do -%>
<%= render :partial => "google_code_#{@code}" %> <%= stylesheet_link_tag "google_oauth" %>
</section> <% end %>
<%= render :partial => "google_code_#{@code}" %>

View File

@ -22,6 +22,8 @@ Orbit::Application.routes.draw do
get 'auth/:provider/callback', to: 'sessions#google_callback' get 'auth/:provider/callback', to: 'sessions#google_callback'
get 'auth/:provider/remove', to: 'sessions#google_remove' get 'auth/:provider/remove', to: 'sessions#google_remove'
get 'auth/google/result', to: 'sessions#google_result' get 'auth/google/result', to: 'sessions#google_result'
get 'auth/google/result', to: 'sessions#google_result'
get 'auth/failure', to: 'sessions#google_faliure'
resources :pages resources :pages
resources :page_parts do resources :page_parts do
member do member do