forked from saurabh/orbit4-5
Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
This commit is contained in:
commit
3aa4922632
Binary file not shown.
|
After Width: | Height: | Size: 4.4 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 110 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 30 KiB |
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
@ -36,6 +36,10 @@ class SessionsController < ApplicationController
|
|||
end
|
||||
|
||||
def google_callback
|
||||
error = params[:error] rescue nil
|
||||
if error == "access_denied"
|
||||
redirect_to auth_failure_path and return
|
||||
end
|
||||
auth = env["omniauth.auth"]
|
||||
user = Google.find_by("google_uid" => auth.uid).user rescue 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
|
||||
end
|
||||
|
||||
def google_faliure
|
||||
@code = 2
|
||||
render "google_result"
|
||||
end
|
||||
|
||||
def connect_account(auth)
|
||||
if !current_user.nil?
|
||||
google = Google.new
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ class User
|
|||
has_many :assets
|
||||
has_many :user_actions, :dependent => :destroy
|
||||
|
||||
index({ confirmation_token: 1}, { unique: true })
|
||||
# index({ confirmation_token: 1}, { unique: true })
|
||||
scope :unapproved, ->{ where(approved: false) }
|
||||
|
||||
has_secure_password
|
||||
|
|
|
|||
|
|
@ -1,26 +1,20 @@
|
|||
html {
|
||||
font-size: 100%;
|
||||
}
|
||||
|
||||
body {
|
||||
font-family: $sub-font;
|
||||
margin-top: 40px; // needed for Orbit bar
|
||||
font-size: inherit;
|
||||
}
|
||||
|
||||
a {}
|
||||
|
||||
a:hover, a:focus {
|
||||
a {} a:hover,
|
||||
a:focus {
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
a:focus {}
|
||||
|
||||
img {
|
||||
a:focus {} img {
|
||||
max-width: 100%;
|
||||
height: auto;
|
||||
}
|
||||
|
||||
.admin-edit {
|
||||
clear: both;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,20 +1,15 @@
|
|||
@charset "utf-8";
|
||||
|
||||
@charset 'utf-8';
|
||||
//
|
||||
// Widget
|
||||
//
|
||||
|
||||
// Widget
|
||||
// ## gerenral styles
|
||||
.w-ad-banner {
|
||||
position: relative;
|
||||
|
||||
.cursor {
|
||||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Widget 1
|
||||
.ad-banner-widget-1 {
|
||||
.w-ad-banner__wrap {
|
||||
|
|
@ -28,50 +23,43 @@
|
|||
height: auto;
|
||||
}
|
||||
.w-ad-banner__caption {
|
||||
background: $theme-color-main;
|
||||
color: $theme-white;
|
||||
z-index: 200;
|
||||
padding: 0.5em 1em;
|
||||
|
||||
padding: .5em 1em;
|
||||
color: $theme-white;
|
||||
background: $theme-color-main;
|
||||
h2 {
|
||||
font-family: $main-font;
|
||||
font-size: $w-caption-font-size;
|
||||
margin: 0.5em 0;
|
||||
margin: .5em 0;
|
||||
}
|
||||
|
||||
p {
|
||||
font-family: $main-font;
|
||||
font-size: $w-caption-desc;
|
||||
}
|
||||
|
||||
}
|
||||
.w-ad-banner__pager {
|
||||
@include list-reset();
|
||||
position: absolute;
|
||||
right: 1em;
|
||||
z-index: 120;
|
||||
top: 1em;
|
||||
z-index: 100;
|
||||
|
||||
right: 1em;
|
||||
@include list-reset();
|
||||
li {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
a {
|
||||
background: $theme-color-main;
|
||||
display: inline-block;
|
||||
margin-right: 0.25em;
|
||||
width: 0.8em;
|
||||
height: 0.8em;
|
||||
width: .8em;
|
||||
height: .8em;
|
||||
margin-right: .25em;
|
||||
opacity: .5;
|
||||
border-radius: 50%;
|
||||
opacity: 0.5;
|
||||
background: $theme-color-main;
|
||||
}
|
||||
|
||||
.active-slide a {
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Widget 2
|
||||
.ad-banner-widget-2 {
|
||||
.w-ad-banner__wrap {
|
||||
|
|
@ -84,44 +72,39 @@
|
|||
width: 100%;
|
||||
height: auto;
|
||||
}
|
||||
.youtube {
|
||||
}
|
||||
.youtube, .cycle-youtube {
|
||||
.youtube,
|
||||
.cycle-youtube {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
object, embed{
|
||||
object,
|
||||
embed {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
.w-ad-banner__pager {
|
||||
@include list-reset();
|
||||
position: absolute;
|
||||
z-index: 102;
|
||||
right: 1em;
|
||||
bottom: 1em;
|
||||
z-index: 102;
|
||||
|
||||
@include list-reset();
|
||||
li {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
a {
|
||||
background: $theme-color-main;
|
||||
display: inline-block;
|
||||
margin-right: 0.25em;
|
||||
width: 0.8em;
|
||||
height: 0.8em;
|
||||
width: .8em;
|
||||
height: .8em;
|
||||
margin-right: .25em;
|
||||
opacity: .5;
|
||||
border-radius: 50%;
|
||||
opacity: 0.5;
|
||||
background: $theme-color-main;
|
||||
}
|
||||
|
||||
.active-slide a {
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Widget 3
|
||||
.ad-banner-widget-3 {
|
||||
.w-ad-banner__wrap {
|
||||
|
|
@ -135,31 +118,29 @@
|
|||
height: auto;
|
||||
}
|
||||
.w-ad-banner__pager {
|
||||
@include list-reset();
|
||||
position: absolute;
|
||||
z-index: 120;
|
||||
right: 1em;
|
||||
bottom: 1em;
|
||||
z-index: 100;
|
||||
|
||||
@include list-reset();
|
||||
li {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
a {
|
||||
background: $theme-color-main;
|
||||
display: inline-block;
|
||||
margin-right: 0.25em;
|
||||
width: 0.8em;
|
||||
height: 0.8em;
|
||||
width: .8em;
|
||||
height: .8em;
|
||||
margin-right: .25em;
|
||||
opacity: .5;
|
||||
border-radius: 50%;
|
||||
opacity: 0.5;
|
||||
background: $theme-color-main;
|
||||
}
|
||||
.active-slide a {
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.cycle-slide-active {
|
||||
z-index: 101 !important;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
@charset "utf-8";
|
||||
|
||||
@charset 'utf-8';
|
||||
//
|
||||
// Widget
|
||||
//
|
||||
|
||||
// Announcement widget
|
||||
// ## Gerneral styles for widgets
|
||||
.w-annc {
|
||||
|
|
@ -19,18 +17,16 @@
|
|||
margin-bottom: 30px;
|
||||
}
|
||||
.label {
|
||||
font-size: 0.75rem;
|
||||
font-size: .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;
|
||||
.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;
|
||||
}
|
||||
i {
|
||||
color: $theme-gray;
|
||||
|
|
@ -43,7 +39,7 @@
|
|||
background: $theme-color-third;
|
||||
}
|
||||
.w-annc__subtitle {
|
||||
font-size: 0.8125em;
|
||||
font-size: .8125em;
|
||||
color: $theme-gray;
|
||||
}
|
||||
.w-annc__entry-title {
|
||||
|
|
@ -51,15 +47,14 @@
|
|||
}
|
||||
.w-annc__title {
|
||||
font-family: $sub-font;
|
||||
color: $theme-color-main;
|
||||
font-size: .8125rem;
|
||||
text-decoration: none;
|
||||
font-size: 0.8125rem;
|
||||
color: $theme-color-main;
|
||||
&:hover {
|
||||
color: darken($theme-color-main, 10%);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Widget-1
|
||||
.widget-announcement-1 {
|
||||
.w-annc__img-wrap {
|
||||
|
|
@ -68,11 +63,10 @@
|
|||
}
|
||||
.w-annc__title {
|
||||
font-family: $main-font;
|
||||
line-height: 1.3;
|
||||
font-size: 1.2rem;
|
||||
line-height: 1.3;
|
||||
}
|
||||
}
|
||||
|
||||
// Widget-2
|
||||
.widget-announcement-2 {
|
||||
.w-annc__img-wrap {
|
||||
|
|
@ -81,59 +75,55 @@
|
|||
}
|
||||
.w-annc__title {
|
||||
font-family: $main-font;
|
||||
line-height: 1.3;
|
||||
font-size: 1.2rem;
|
||||
line-height: 1.3;
|
||||
}
|
||||
}
|
||||
|
||||
// Widget-3
|
||||
.widget-announcement-3 {
|
||||
.w-annc__img-wrap {
|
||||
height: 200px;
|
||||
margin: 0 0 1em 0;
|
||||
margin: 0 0 1em;
|
||||
}
|
||||
.w-annc__title {
|
||||
font-family: $main-font;
|
||||
line-height: 1.3;
|
||||
font-size: 1.2rem;
|
||||
line-height: 1.3;
|
||||
}
|
||||
}
|
||||
|
||||
// Widget-4
|
||||
.widget-announcement-4 {
|
||||
.w-annc__title {
|
||||
font-family: $main-font;
|
||||
line-height: 1.3;
|
||||
font-size: 1.2rem;
|
||||
line-height: 1.3;
|
||||
}
|
||||
.w-annc__list > .w-annc__item:nth-child(3n+1) {
|
||||
clear: both;
|
||||
}
|
||||
.w-annc__img-wrap {
|
||||
height: 200px;
|
||||
margin: 0 0 1em 0;
|
||||
margin: 0 0 1em;
|
||||
}
|
||||
}
|
||||
|
||||
// Widget-5
|
||||
.widget-announcement-5 {
|
||||
.w-annc__title {
|
||||
font-family: $main-font;
|
||||
line-height: 1.3;
|
||||
font-size: 1.2rem;
|
||||
line-height: 1.3;
|
||||
}
|
||||
.w-annc__item {
|
||||
border-bottom: 1px dashed lighten($theme-gray, 65%);
|
||||
padding-bottom: 1em;
|
||||
margin-bottom: 1em;
|
||||
padding-bottom: 1em;
|
||||
border-bottom: 1px dashed lighten($theme-gray, 65%);
|
||||
}
|
||||
}
|
||||
|
||||
// Widget-6
|
||||
.widget-announcement-6 {
|
||||
.w-annc__item {
|
||||
margin-bottom: 0.8em;
|
||||
padding-bottom: 0.8em;
|
||||
margin-bottom: .8em;
|
||||
padding-bottom: .8em;
|
||||
border-bottom: 1px dashed lighten($theme-gray, 65%);
|
||||
}
|
||||
.w-annc__entry-title {
|
||||
|
|
@ -143,18 +133,17 @@
|
|||
.w-annc__status,
|
||||
.w-annc__title,
|
||||
.w-annc__postdate-wrap {
|
||||
font-size: 0.8125rem;
|
||||
font-size: .8125rem;
|
||||
}
|
||||
.w-annc__status {
|
||||
display: inline-block;
|
||||
}
|
||||
}
|
||||
|
||||
// Widget-7
|
||||
.widget-announcement-7 {
|
||||
.w-annc__item {
|
||||
margin-bottom: 0.8em;
|
||||
padding-bottom: 0.8em;
|
||||
margin-bottom: .8em;
|
||||
padding-bottom: .8em;
|
||||
border-bottom: 1px dashed lighten($theme-gray, 65%);
|
||||
}
|
||||
.w-annc__entry-title {
|
||||
|
|
@ -164,95 +153,90 @@
|
|||
.w-annc__status,
|
||||
.w-annc__title,
|
||||
.w-annc__postdate-wrap {
|
||||
font-size: 0.75rem;
|
||||
font-size: .75rem;
|
||||
}
|
||||
.w-annc__status {
|
||||
display: inline-block;
|
||||
}
|
||||
}
|
||||
|
||||
// Widget-8
|
||||
// ## Table
|
||||
.widget-announcement-8 {
|
||||
.w-annc__th {
|
||||
color: #fff;
|
||||
font-size: .8125em;
|
||||
color: $theme-white;
|
||||
border: 0;
|
||||
background: $theme-color-main;
|
||||
font-size: 0.8125em;
|
||||
border: none;
|
||||
}
|
||||
.w-annc__status {
|
||||
font-size: .75rem;
|
||||
display: inline-block;
|
||||
font-size: 0.75rem;
|
||||
}
|
||||
td {
|
||||
font-size: 0.8125em;
|
||||
font-size: .8125em;
|
||||
}
|
||||
a:hover {
|
||||
text-decoration: none;
|
||||
}
|
||||
}
|
||||
|
||||
// Widget-9
|
||||
// ## Table
|
||||
.widget-announcement-9 {
|
||||
.w-annc__th {
|
||||
color: #fff;
|
||||
font-size: .8125em;
|
||||
color: $theme-white;
|
||||
border: 0;
|
||||
background: $theme-color-main;
|
||||
font-size: 0.8125em;
|
||||
border: none;
|
||||
}
|
||||
.w-annc__status {
|
||||
font-size: .75rem;
|
||||
display: inline-block;
|
||||
font-size: 0.75rem;
|
||||
}
|
||||
td {
|
||||
font-size: 0.8125em;
|
||||
font-size: .8125em;
|
||||
}
|
||||
a:hover {
|
||||
text-decoration: none;
|
||||
}
|
||||
}
|
||||
|
||||
// Widget-10
|
||||
.widget-announcement-10 {
|
||||
.w-annc__item {
|
||||
margin-bottom: 0.8em;
|
||||
padding-bottom: 0.8em;
|
||||
margin-bottom: .8em;
|
||||
padding-bottom: .8em;
|
||||
border-bottom: 1px dashed lighten($theme-gray, 65%);
|
||||
}
|
||||
.w-annc__entry-title {
|
||||
margin: 0;
|
||||
}
|
||||
.w-annc__postdate-wrap {
|
||||
font-size: 0.8125em;
|
||||
font-size: .8125em;
|
||||
}
|
||||
.w-annc__status {
|
||||
font-size: .75rem;
|
||||
display: inline-block;
|
||||
font-size: 0.75rem;
|
||||
}
|
||||
}
|
||||
|
||||
// Widget-11
|
||||
// ## Table
|
||||
.widget-announcement-11 {
|
||||
.w-annc__th {
|
||||
color: #fff;
|
||||
font-size: .8125em;
|
||||
color: $theme-white;
|
||||
border: 0;
|
||||
background: $theme-color-main;
|
||||
font-size: 0.8125em;
|
||||
border: none;
|
||||
}
|
||||
.w-annc__status {
|
||||
font-size: .75rem;
|
||||
display: inline-block;
|
||||
font-size: 0.75rem;
|
||||
}
|
||||
td {
|
||||
font-size: 0.8125em;
|
||||
font-size: .8125em;
|
||||
}
|
||||
a:hover {
|
||||
text-decoration: none;
|
||||
}
|
||||
}
|
||||
|
||||
// Widget-12
|
||||
.widget-announcement-12 {
|
||||
.w-annc__list {
|
||||
|
|
@ -267,8 +251,8 @@
|
|||
}
|
||||
}
|
||||
.w-annc__item {
|
||||
margin-bottom: 0.8em;
|
||||
padding-bottom: 0.8em;
|
||||
margin-bottom: .8em;
|
||||
padding-bottom: .8em;
|
||||
border-bottom: 1px dashed lighten($theme-gray, 65%);
|
||||
}
|
||||
.w-annc__entry-title {
|
||||
|
|
@ -278,16 +262,15 @@
|
|||
}
|
||||
}
|
||||
.w-annc__postdate-wrap {
|
||||
font-size: 0.8125em;
|
||||
font-size: .8125em;
|
||||
}
|
||||
.w-annc__status {
|
||||
display: inline-block;
|
||||
}
|
||||
.w-annc__postdate {
|
||||
font-size: 0.8125rem;
|
||||
font-size: .8125rem;
|
||||
}
|
||||
}
|
||||
|
||||
// Announcement index
|
||||
// ## General style for index pages
|
||||
.i-annc {
|
||||
|
|
@ -311,26 +294,29 @@
|
|||
.i-annc__item {
|
||||
margin-bottom: 30px;
|
||||
}
|
||||
.i-annc__img {
|
||||
width: 100%;
|
||||
max-width: 100%;
|
||||
height: auto;
|
||||
}
|
||||
.label {
|
||||
font-size: 0.75rem;
|
||||
font-size: .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;
|
||||
.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 {
|
||||
color: $theme-gray;
|
||||
}
|
||||
}
|
||||
.i-annc__subtitle {
|
||||
font-size: 0.8125em;
|
||||
font-size: .8125em;
|
||||
color: $theme-gray;
|
||||
}
|
||||
.i-annc__entry-title {
|
||||
|
|
@ -338,44 +324,41 @@
|
|||
}
|
||||
.i-annc__title {
|
||||
font-family: $sub-font;
|
||||
color: $theme-color-main;
|
||||
font-size: .8125rem;
|
||||
text-decoration: none;
|
||||
font-size: 0.8125rem;
|
||||
color: $theme-color-main;
|
||||
&:hover {
|
||||
color: darken($theme-color-main, 10%);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Index-1
|
||||
.index-announcement-1 {
|
||||
.i-annc__th {
|
||||
color: #fff;
|
||||
font-size: .8125em;
|
||||
color: $theme-white;
|
||||
border: 0;
|
||||
background: $theme-color-main;
|
||||
font-size: 0.8125em;
|
||||
border: none;
|
||||
}
|
||||
td {
|
||||
font-size: 0.8125rem;
|
||||
font-size: .8125rem;
|
||||
}
|
||||
.i-annc__title:hover {
|
||||
text-decoration: none;
|
||||
}
|
||||
}
|
||||
|
||||
// Index-2
|
||||
.i-announcement-2 {
|
||||
.index-announcement-2,
|
||||
.index-announcement-3 {
|
||||
.i-annc__img-wrap {
|
||||
height: 200px;
|
||||
margin: 0 0 1em 0;
|
||||
margin: 0 0 1em;
|
||||
}
|
||||
.i-annc__title {
|
||||
font-family: $main-font;
|
||||
line-height: 1.3;
|
||||
font-size: 1.2rem;
|
||||
line-height: 1.3;
|
||||
}
|
||||
}
|
||||
|
||||
// Announcement show
|
||||
.s-annc {
|
||||
.s-annc__show-title {
|
||||
|
|
@ -385,20 +368,20 @@
|
|||
border-bottom: 1px solid $theme-gray-light;
|
||||
@include clearfix;
|
||||
.s-annc__meta--item {
|
||||
font-size: 0.875rem;
|
||||
margin-right: 1em;
|
||||
margin-bottom: 0.6em;
|
||||
font-size: .875rem;
|
||||
float: left;
|
||||
margin-right: 1em;
|
||||
margin-bottom: .6em;
|
||||
i {
|
||||
color: darken($theme-gray-light, 10%);
|
||||
}
|
||||
}
|
||||
.s-annc__tag-wrap {
|
||||
position: relative;
|
||||
float: none;
|
||||
clear: both;
|
||||
margin-right: 0;
|
||||
padding-left: 1.6em;
|
||||
clear: both;
|
||||
float: none;
|
||||
i {
|
||||
position: absolute;
|
||||
top: 7px;
|
||||
|
|
@ -412,8 +395,8 @@
|
|||
}
|
||||
}
|
||||
.s-annc__post-wrap {
|
||||
@include clearfix;
|
||||
margin-bottom: 2em;
|
||||
@include clearfix;
|
||||
}
|
||||
.s-annc__related-wrap {
|
||||
padding-top: 1em;
|
||||
|
|
@ -427,22 +410,64 @@
|
|||
padding-bottom: 6px;
|
||||
padding-left: 1.6em;
|
||||
i {
|
||||
margin: 8px 0 0 -1.6em;
|
||||
float: left;
|
||||
margin: 8px 0 0 -1.6em;
|
||||
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;
|
||||
max-width: 9.375rem;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
}
|
||||
//
|
||||
// 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;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,13 +7,11 @@
|
|||
@import "base/pagination";
|
||||
@import "base/orbitbar-override";
|
||||
@import "base/global";
|
||||
|
||||
// Layout
|
||||
@import "layout/header";
|
||||
@import "layout/slide";
|
||||
@import "layout/content";
|
||||
@import "layout/footer";
|
||||
|
||||
// // Modules
|
||||
@import "modules/menu";
|
||||
@import "modules/ad_banner";
|
||||
|
|
@ -24,7 +22,7 @@
|
|||
@import "modules/archives";
|
||||
@import "modules/member";
|
||||
@import "modules/personal_plugin";
|
||||
|
||||
// Widget
|
||||
@import "widget/breadcrumb";
|
||||
@import "widget/sitemenu";
|
||||
|
||||
|
|
|
|||
|
|
@ -10,3 +10,4 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
margin-bottom: 12px;
|
||||
padding: 8px .8em;
|
||||
padding-bottom: 8px;
|
||||
color: #fff;
|
||||
color: $theme-white;
|
||||
border-radius: .2em;
|
||||
background: $theme-color-second;
|
||||
&:hover {
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
}
|
||||
.sitemenu__link.level-1 {
|
||||
margin-right: .25rem;
|
||||
color: #fff;
|
||||
color: $theme-white;
|
||||
}
|
||||
.sitemenu___dropdown-toggle {
|
||||
font-size: 0.75rem;
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
background: $theme-color-main;
|
||||
}
|
||||
.sitemenu__link.level-2 {
|
||||
color: #fff;
|
||||
color: $theme-white;
|
||||
font-size: 0.8125rem;
|
||||
padding: 4px 0.625rem;
|
||||
&:hover {
|
||||
|
|
@ -50,3 +50,4 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -14,10 +14,13 @@
|
|||
<tbody data-level="0" data-list="acts">
|
||||
<tr>
|
||||
<td>{{category}}</td>
|
||||
<td>{{act_start_date}} ~ <br /> {{act_end_date}}</td>
|
||||
<td>{{act_start_date}} ~
|
||||
<br /> {{act_end_date}}</td>
|
||||
<td>{{title}}</td>
|
||||
<td>{{sign_start_date}} ~ <br /> {{sign_end_date}}</td>
|
||||
<td>{{sign_up}}</i></td>
|
||||
<td>{{sign_start_date}} ~
|
||||
<br /> {{sign_end_date}}</td>
|
||||
<td>{{sign_up}}</i>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
@ -5,12 +5,14 @@
|
|||
<tr>
|
||||
<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">{{category-head}}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody data-level="0" data-list="announcements">
|
||||
<tr>
|
||||
<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>{{category}}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
<div class="i-annc index-announcement-2 {{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">
|
||||
<div class="i-annc__img-wrap bullseye">
|
||||
<li class="i-annc__item row">
|
||||
<div class="i-annc__img-wrap col-sm-4">
|
||||
<img class="i-annc__img" src="{{img_src}}" alt="{{img_description}}">
|
||||
</div>
|
||||
<div class="i-annc__content-wrap">
|
||||
<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>
|
||||
|
|
|
|||
|
|
@ -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}}
|
||||
|
|
@ -3,18 +3,26 @@
|
|||
{
|
||||
"filename" : "annc_index1",
|
||||
"name" : {
|
||||
"zh_tw" : "1. 標準表格列表 ( 模組標題, 日期, 標題 )",
|
||||
"en" : "1. Standard Table List (widget-title, postdate, title)"
|
||||
"zh_tw" : "1. 標準表格列表 ( 模組標題, 日期, 標題, 類別 )",
|
||||
"en" : "1. Standard Table List (widget-title, postdate, title, category)"
|
||||
},
|
||||
"thumbnail" : "annc_index1_thumbs.png"
|
||||
},
|
||||
{
|
||||
"filename" : "annc_index2",
|
||||
"name" : {
|
||||
"zh_tw" : "2. 標準圖片 ( 模組標題, 日期, 標題, 圖片, 閱讀更多, 標籤 )",
|
||||
"en" : "2. Standard Image + Text (widget-title, postdate, title, image)"
|
||||
"zh_tw" : "2. 右圖左文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
|
||||
"en" : "2. Balanced Image + Text(Right) (widget-title, image, status, postdate, category, title, subtitle)"
|
||||
},
|
||||
"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" : [
|
||||
|
|
@ -113,6 +121,14 @@
|
|||
"en" : "12. 1 Image + Title List (widget-title, status, title, postdate)"
|
||||
},
|
||||
"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"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
<li class="s-annc__related-file">
|
||||
<i class="fa fa-fw fa-paperclip"></i>
|
||||
<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>
|
||||
</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 |
|
|
@ -12,7 +12,7 @@
|
|||
</a>
|
||||
</h4>
|
||||
</div>
|
||||
<div id="collapse" class="panel-collapse collapse">
|
||||
<div id="collapse" class="panel-collapse collapse in">
|
||||
<div class="panel-body">
|
||||
<dl class="dl-horizontal index-archive-item-group" data-list="archives" data-level="1">
|
||||
<dt class="index-archive-item-list">
|
||||
|
|
|
|||
|
|
@ -166,7 +166,7 @@
|
|||
<i class="icon-remove"> <%= t("update_manager_.update_faild") %></i>
|
||||
</div>
|
||||
<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>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<%#= content_for :page_specific_css do -%>
|
||||
<%# content_for :page_specific_css do -%>
|
||||
<%= stylesheet_link_tag "basic/icon" %>
|
||||
<%= stylesheet_link_tag "lib/orbit_bar/orbit-bar" %>
|
||||
<%# end -%>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
|
|
@ -1,3 +1,5 @@
|
|||
<section id="main-wrap">
|
||||
<% content_for :page_specific_css do -%>
|
||||
<%= stylesheet_link_tag "google_oauth" %>
|
||||
<% end %>
|
||||
<%= render :partial => "google_code_#{@code}" %>
|
||||
</section>
|
||||
|
||||
|
|
|
|||
|
|
@ -22,6 +22,8 @@ Orbit::Application.routes.draw do
|
|||
get 'auth/:provider/callback', to: 'sessions#google_callback'
|
||||
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/failure', to: 'sessions#google_faliure'
|
||||
resources :pages
|
||||
resources :page_parts do
|
||||
member do
|
||||
|
|
|
|||
Loading…
Reference in New Issue