developers/orbit-basic
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into ldap

Browse Source 
Conflicts:
	Gemfile
	Gemfile.lock
	config/application.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb
	vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
This commit is contained in:
Christophe Vilayphiou committed 2012-03-19 14:27:15 +08:00
2 parents d5a2de5476 b58db48d26
commit 47215693c4
88 files changed
+1908 -1581
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/assets/javascripts/bulletin_form.js.erb
+8 -5
View File
@@ -1,12 +1,15 @@
$('.bulletin_urls_block a.delete').live('click', function(){
$(this).parents('.list_item').remove();
$('.bulletin_links_block a.remove_existing_record').live('click', function(){
//$(this).parents('.list_item').remove();
$(this).parents('tr.list_item').remove();
});
$('.bulletin_files_block a.delete').live('click', function(){
$(this).parents('.list_item').remove();
$('.bulletin_files_block a.remove_existing_record').live('click', function(){
//$(this).parents('.list_item').remove();
$(this).parents('tr.list_item').remove();
});
$('.action a.remove_existing_record').live('click', function(){
$(this).next('.should_destroy').attr('value', 1);
$("#bulletin_" + $(this).prev().attr('value')).hide();
//$("#bulletin_" + $(this).prev().attr('value')).hide();
$("tr#bulletin_" + $(this).prev().attr('value')).hide();
});
app/assets/javascripts/orbit-1.0.js
+6 -3
View File
@@ -52,12 +52,15 @@ $(document).ready(function(){
/*tinyscrollbar&windows-Size*/
resize();
$('#main-sidebar').css("height", viewportheight-40);
$('#main-sidebar .viewport').css("height", viewportheight-40);
var $mainWrapMarginLeft = parseInt($('#main-wrap').css("margin-left"))-2;
$('#main-sidebar').css("height", viewportheight-30);
$('#main-sidebar .viewport').css("height", viewportheight-30);
$('.post-title').css("width", viewportwidth-495);
$('#main-wrap > .subnav').css("width", viewportwidth-$mainWrapMarginLeft)
$('#main-sidebar').tinyscrollbar();
$('.detal-list').tinyscrollbar();
$('#main-sidebar').tinyscrollbar({size:(viewportheight-44)});
$('#main-sidebar').tinyscrollbar({size:(viewportheight-34)});
mainTablePosition()
/*isotope*/
var $container = $('#isotope');
app/assets/stylesheets/site_items.css.erb
+482 -481
View File
@@ -1,482 +1,483 @@
html, body{
height: 100%;
margin: 0;
padding: 0;
}
html{
background: url(<%= asset_path "body.jpg" %>) no-repeat fixed 0 0 transparent;
background-size: cover;
}
body{
color: #000000;
font-family: Helvetica, '微軟正黑體';
}
#back_banner_link{
background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #787e82), color-stop(0.05, #61676c), color-stop(1, #292c2d) );
background:-moz-linear-gradient( center top -90deg, #787e82 0%, #61676c 5%, #292c2d 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#61676c', endColorstr='#292c2d');
-moz-box-shadow: 0px 1px 5px 0px rgba(0,0,0,.7);
-webkit-box-shadow: 0px 1px 5px 0px rgba(0,0,0,.7);
box-shadow: 0px 1px 5px 0px rgba(0,0,0,.7);
border-top: 1px solid #474a4c;
border-bottom: 1px solid #1d2020;
height: 41px;
width: 100%;
behavior: url(<%= asset_path "PIE.htc" %>);
}
.hmenu{
float: right;
height: 41px;
}
#back_orbit{
background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #70787d), color-stop(1, #3b4043) );
background:-moz-linear-gradient( center top -90deg, #70787d 0%, #3b4043 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#70787d', endColorstr='#3b4043');
-webkit-border-radius: 0px 0px 5px 5px;
-moz-border-radius: 0px 0px 5px 5px;
border-radius: 0px 0px 5px 5px;
-moz-box-shadow: 0px 1px 1px 0px rgba(0,0,0,.7);
-webkit-box-shadow: 0px 1px 1px 0px rgba(0,0,0,.7);
box-shadow: 0px 1px 1px 0px rgba(0,0,0,.7);
cursor: pointer;
float: left;
height: 43px;
margin-left: 10px;
width: 41px;
behavior: url(<%= asset_path "PIE.htc" %>);
}
#back_orbit span{
text-indent: -9999px;
background: url(<%= asset_path "bar_orbit.png" %>) no-repeat scroll 0 0 transparent;
display: block;
height: 43px;
width: 100%;
}
#back_orbit:hover{
background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #fefefe), color-stop(1, #e4e4e4) );
background:-moz-linear-gradient( center top -90deg, #fefefe 0%, #e4e4e4 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fefefe', endColorstr='#e4e4e4');
-webkit-border-radius: 0px;
-moz-border-radius: 0px;
border-radius: 0px;
}
#back_orbit:hover span{
background-position: 0 -44px;
}
#back_orbit:hover #orblist{
display:block;
}
#orblist{
background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #e4e4e4), color-stop(1, #FFFFFF) );
background:-moz-linear-gradient( center top -90deg, #e4e4e4 0%, #FFFFFF 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#e4e4e4', endColorstr='#FFFFFF');
-webkit-border-radius: 0px 3px 3px 3px;
-moz-border-radius: 0px 3px 3px 3px;
border-radius: 0px 3px 3px 3px;
-webkit-box-shadow: 0 3px 3px #000000;
-moz-box-shadow: 0 3px 3px #000000;
box-shadow: 0 3px 3px #000000;
display: none;
margin: 0;
padding: 10px;
position: absolute;
top: 43px;
width: 130px;
}
#orblist li{
border-bottom:1px solid #aaa;
list-style:none;
}
.orblink{
color: #333333;
display: block;
font: 12px/100% arial,sans-serif;
padding: 5px;
text-decoration: none;
}
.orblink:hover{
background:#eee;
color:#333;
}
#log_out{
-moz-box-shadow:inset 1px 0px 0px 0px #73777b;
-webkit-box-shadow:inset 1px 0px 0px 0px #73777b;
box-shadow:inset 1px 0px 0px 0px #73777b;
border-right:1px solid #41474c;
border-left:1px solid #41474c;
float:right;
width:41px;
height:41px;
}
#log_out:hover{
background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #01afde), color-stop(1, #007ec6) );
background:-moz-linear-gradient( center top -90deg, #01afde 0%, #007ec6 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#01afde', endColorstr='#007ec6');
}
#log_out a{
background: url(<%= asset_path "service_btn.png" %>) no-repeat scroll right 0 transparent;
display: block;
height: 41px;
text-indent: -9999px;
width: 41px;
}
#log_out a:hover{
background: url(<%= asset_path "service_btn.png" %>) no-repeat scroll right bottom transparent !important;
}
.lang{
color: #FFFFFF;
float: right;
font-size: 15px;
line-height: 40px;
margin-right: 10px;
}
.lang a{
color:#fff;
text-decoration:none;
}
.lang a:hover{
text-decoration:underline;
}
#back_content{
height: 100%;
}
#back_footer{
background-color: #101010;
bottom: 0;
color: #FFFFFF;
font-size: 11px;
padding: 10px;
position: fixed;
width: 100%;
left: 0;
box-shadow: 0 -3px 4px #000;
}
.items_setup{
padding:42px 0 0 0;
}
#back_sidebar .items_setup .list li{
padding: 6px 0 7px 5px;
}
#back_sidebar .items_setup .list li a{
display: inline;
font-size: 0.9em;
padding: 0;
}
#back_sidebar .items_setup .list li a span{
background:none;
padding:0;
text-shadow:none;
}
.main {
background: none repeat scroll 0 0 #FFFFFF;
height: 100%;
margin-left: 220px;
padding: 0 40px;
position: relative;
}
.main_list {
padding-top: 70px;
}
.main_list ul {
clear:both;
}
#porfile {
padding-top: 100px;
}
/*add_buttom*/
.button_bar {
float: right;
-moz-box-shadow:inset 0px 1px 0px 0px #666, 0px 0px 3px black;
-webkit-box-shadow:inset 0px 1px 0px 0px #666, 0px 0px 3px black;
box-shadow:inset 0px 1px 0px 0px #666, 0px 0px 3px black;
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #4f4f4f), color-stop(1, #000000) );
background:-moz-linear-gradient( center top, #4f4f4f 5%, #000000 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#4f4f4f', endColorstr='#000000');
background-color:#4f4f4f;
-moz-border-radius:5px;
-webkit-border-radius:5px;
border-radius:5px;
display:inline-block;
padding:0;
margin:10px 0 60px;
}
.button_bar a {
text-decoration:none;
text-shadow:0px -1px 0px #000000;
font-size:12px;
color:#EDEDED;
border-right:1px solid #555;
-moz-box-shadow:1px 0px 0px black;
-webkit-box-shadow:1px 0px 0px black;
box-shadow:1px 0px 0px black;
padding: 6px 10px 4px;
display: inline-block;
float: left;
}
.button_bar a:active {
padding: 7px 10px 3px !important;
text-shadow:0px 1px 0px #000000;
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #000000), color-stop(1, #4f4f4f) );
background:-moz-linear-gradient( center top, #000000 5%, #4f4f4f 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#000000', endColorstr='#4f4f4f');
}
.button_bar a:last-child {
border-right:none;
-moz-box-shadow:none;
-webkit-box-shadow:none;
box-shadow:none;
-moz-border-radius:0px 5px 5px 0px;
-webkit-border-radius:0px 5px 5px 0px;
border-radius:0px 5px 5px 0px;
}
.button_bar a:first-child {
-moz-border-radius:5px 0px 0px 5px;
-webkit-border-radius:5px 0px 0px 5px;
border-radius:5px 0px 0px 5px;
}
.button_bar a.new {
padding: 5px 10px;
-moz-border-radius:5px;
-webkit-border-radius:5px;
border-radius:5px;
}
.button_bar a:hover {
color:#FFFFFF;
}
.up {
margin:10px 0;
}
#person {
left: 245px;
position: fixed;
text-align: center;
top: 75px;
width: 140px;
background-color:#FFF;
padding:15px;
border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
-moz-box-shadow: 0px 0px 4px #180902; /* Firefox */
-webkit-box-shadow: 0px 0px 4px #180902;/* Safari 和 Chrome */
box-shadow: 0px 0px 4px #180902; /* Opera 10.5 + */
}
#file {
display:none;
}
#person img {
}
.user_mail {
border: medium none;
border:1px solid #DDDDDD;
color: #666666;
font-size: 12px;
width: 140px;
}
#person label {
display: block;
margin: 15px 0 0;
}
#person label input {
}
#person label #user_admin {
float:right;
margin: 0;
}
#person label span {
text-align:left;
font-size:11px;
color:#888;
display:block;
}
#person select {
border: 1px solid #DDDDDD;
padding: 0;
width: 140px;
}
#porfile .users{
margin-left: 180px;
}
.roles_block {
background: url(<%= asset_path "75.png" %>) repeat left top;
min-width:710px;
margin-bottom:50px;
position:relative;
padding-bottom: 20px;
border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
-moz-box-shadow: 0px 0px 4px #180902; /* Firefox */
-webkit-box-shadow: 0px 0px 4px #180902;/* Safari 和 Chrome */
box-shadow: 0px 0px 4px #180902; /* Opera 10.5 + */
}
.roles_block h2 {
color: #FFFFFF;
font-weight: normal;
margin: 0;
padding: 0;
position: absolute;
text-shadow: 0 3px 2px #000000;
top: -30px;
}
.main hr {
height:8px;
border:none;
margin:0;
border-radius: 5px 5px 0px 0px;
-moz-border-radius: 5px 5px 0px 0px;
-webkit-border-radius: 5px 5px 0px 0px;
border-bottom:1px solid #000;
}
.main2{
padding:70px 0 0;
}
#basic_block hr {
background-color: #666666;
}
#teacher_block hr {
background-color: #0071A9;
}
#student_block hr {
background-color: #AF0045;
}
.info_input {
padding:10px 20px;
}
.info_input table {
color:#fff;
width:100%;
font-size:14px;
}
.info_input table td {
padding:5px 10px 5px 0;
width: 10%;
}
.info_input .list_head {
background:url(<%= asset_path "line.png" %>) left bottom repeat-x;
}
.info_input .list_head td {
}
.info_input .list_item {
color:#AEAEAE;
}
.info_input .add {
display:block;
padding-left:22px;
font-size:12px;
line-height:21px;
height:19px;
background:url(<%= asset_path "icon.png" %>) no-repeat -59px 0;
margin-top: 10px;
color: #DDDDDD;
}
.main table {
width:100%;
}
.main td {
padding-left:20px;
color:#fff;
font-size:14px;
line-height:40px;
}
.main tr.have td{
background: url(<%= asset_path "75.png" %>) repeat left top;
}
.main tr.have td:first-child{
border-radius: 5px 0 0 5px;
-moz-border-radius: 5px 0 0 5px;
-webkit-border-radius: 5px 0 0 5px;
}
.main tr.have td:last-child{
border-radius: 0 5px 5px 0;
-moz-border-radius: 0 5px 5px 0;
-webkit-border-radius: 0 5px 5px 0;
}
.main thead td {
line-height:40px;
font-size:16px;
text-shadow: 0px 1px 1px #3e2914;
}
.main thead td.action {
width:140px;
}
.main tbody td.roles {
background-image: url(<%= asset_path "roles_type.jpg" %>);
background-repeat: repeat-x;
}
.main tbody td.teacher {
background-position: 0 -54px;
}
.main tbody td.student {
background-position: 0 -5px;
}
.main tbody td.action a {
background-image: url(<%= asset_path "icon.png" %>);
display: inline-block;
height: 19px;
margin-right: 10px;
top: 8px;
text-indent: -9999px;
width: 19px;
position: relative;
}
.main tbody td.action a.show {
background-position: left top;
}
.main tbody td.action a.show:hover {
background-position: left -19px;
}
.main tbody td.action a.edit {
background-position: -19px top;
}
.main tbody td.action a.edit:hover {
background-position: -19px -19px;
}
.main tbody td.action a.delete {
background-position: -38px top;
}
.main tbody td.action a.delete:hover {
background-position: -38px -19px;
}
.main tbody td.action a.switch {
background: url(<%= asset_path "switch.png" %>) no-repeat left 3px;
width: 40px;
}
.main tbody tr.disable td.action a.switch {
background-position:left bottom;
}
.main tbody td.action a.delete:hover {
background-position: -38px -19px;
}
.main tbody tr.have {
}
.main tbody tr.disable {
opacity: 0.7;
}
.main tbody tr {
background:none;
height:15px;
}
h1{
margin:0 0 20px;
}
p{
margin:0 0 10px;
}
#back_sidebar .items_setup .list li{
background:url(<%= asset_path "sidebar_li2.jpg" %>) repeat left top;
border:none;
padding: 0 0 0 5px;
}
#back_sidebar .items_setup .list li a{
line-height:31px;
}
#back_sidebar .items_setup .list li:hover{
background:url(<%= asset_path "sidebar_li2.jpg" %>) repeat left top;
border:none;
}
#back_sidebar .items_setup ul .list {
html, body{
height: 100%;
margin: 0;
padding: 0;
}
html{
background: url(<%= asset_path "body.jpg" %>) no-repeat fixed 0 0 transparent;
background-size: cover;
}
body{
color: #000000;
font-family: Helvetica, '微軟正黑體';
}
#back_banner_link{
background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #787e82), color-stop(0.05, #61676c), color-stop(1, #292c2d) );
background:-moz-linear-gradient( center top -90deg, #787e82 0%, #61676c 5%, #292c2d 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#61676c', endColorstr='#292c2d');
-moz-box-shadow: 0px 1px 5px 0px rgba(0,0,0,.7);
-webkit-box-shadow: 0px 1px 5px 0px rgba(0,0,0,.7);
box-shadow: 0px 1px 5px 0px rgba(0,0,0,.7);
border-top: 1px solid #474a4c;
border-bottom: 1px solid #1d2020;
height: 41px;
width: 100%;
behavior: url(<%= asset_path "PIE.htc" %>);
}
.hmenu{
float: right;
height: 41px;
}
#back_orbit{
background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #70787d), color-stop(1, #3b4043) );
background:-moz-linear-gradient( center top -90deg, #70787d 0%, #3b4043 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#70787d', endColorstr='#3b4043');
-webkit-border-radius: 0px 0px 5px 5px;
-moz-border-radius: 0px 0px 5px 5px;
border-radius: 0px 0px 5px 5px;
-moz-box-shadow: 0px 1px 1px 0px rgba(0,0,0,.7);
-webkit-box-shadow: 0px 1px 1px 0px rgba(0,0,0,.7);
box-shadow: 0px 1px 1px 0px rgba(0,0,0,.7);
cursor: pointer;
float: left;
height: 43px;
margin-left: 10px;
width: 41px;
behavior: url(<%= asset_path "PIE.htc" %>);
}
#back_orbit span{
text-indent: -9999px;
background: url(<%= asset_path "bar_orbit.png" %>) no-repeat scroll 0 0 transparent;
display: block;
height: 43px;
width: 100%;
}
#back_orbit:hover{
background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #fefefe), color-stop(1, #e4e4e4) );
background:-moz-linear-gradient( center top -90deg, #fefefe 0%, #e4e4e4 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fefefe', endColorstr='#e4e4e4');
-webkit-border-radius: 0px;
-moz-border-radius: 0px;
border-radius: 0px;
}
#back_orbit:hover span{
background-position: 0 -44px;
}
#back_orbit:hover #orblist{
display:block;
}
#orblist{
background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #e4e4e4), color-stop(1, #FFFFFF) );
background:-moz-linear-gradient( center top -90deg, #e4e4e4 0%, #FFFFFF 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#e4e4e4', endColorstr='#FFFFFF');
-webkit-border-radius: 0px 3px 3px 3px;
-moz-border-radius: 0px 3px 3px 3px;
border-radius: 0px 3px 3px 3px;
-webkit-box-shadow: 0 3px 3px #000000;
-moz-box-shadow: 0 3px 3px #000000;
box-shadow: 0 3px 3px #000000;
display: none;
margin: 0;
padding: 10px;
position: absolute;
top: 43px;
width: 130px;
}
#orblist li{
border-bottom:1px solid #aaa;
list-style:none;
}
.orblink{
color: #333333;
display: block;
font: 12px/100% arial,sans-serif;
padding: 5px;
text-decoration: none;
}
.orblink:hover{
background:#eee;
color:#333;
}
#log_out{
-moz-box-shadow:inset 1px 0px 0px 0px #73777b;
-webkit-box-shadow:inset 1px 0px 0px 0px #73777b;
box-shadow:inset 1px 0px 0px 0px #73777b;
border-right:1px solid #41474c;
border-left:1px solid #41474c;
float:right;
width:41px;
height:41px;
}
#log_out:hover{
background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #01afde), color-stop(1, #007ec6) );
background:-moz-linear-gradient( center top -90deg, #01afde 0%, #007ec6 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#01afde', endColorstr='#007ec6');
}
#log_out a{
background: url(<%= asset_path "service_btn.png" %>) no-repeat scroll right 0 transparent;
display: block;
height: 41px;
text-indent: -9999px;
width: 41px;
}
#log_out a:hover{
background: url(<%= asset_path "service_btn.png" %>) no-repeat scroll right bottom transparent !important;
}
.lang{
color: #FFFFFF;
float: right;
font-size: 15px;
line-height: 40px;
margin-right: 10px;
}
.lang a{
color:#fff;
text-decoration:none;
}
.lang a:hover{
text-decoration:underline;
}
#back_content{
height: 100%;
}
#back_footer{
background-color: #101010;
bottom: 0;
color: #FFFFFF;
display:none;
font-size: 11px;
padding: 10px;
position: fixed;
width: 100%;
left: 0;
box-shadow: 0 -3px 4px #000;
}
.items_setup{
padding:42px 0 0 0;
}
#back_sidebar .items_setup .list li{
padding: 6px 0 7px 5px;
}
#back_sidebar .items_setup .list li a{
display: inline;
font-size: 0.9em;
padding: 0;
}
#back_sidebar .items_setup .list li a span{
background:none;
padding:0;
text-shadow:none;
}
.main {
background: none repeat scroll 0 0 #FFFFFF;
height: 100%;
margin-left: 220px;
padding: 0 40px;
position: relative;
}
.main_list {
padding-top: 70px;
}
.main_list ul {
clear:both;
}
#porfile {
padding-top: 100px;
}
/*add_buttom*/
.button_bar {
float: right;
-moz-box-shadow:inset 0px 1px 0px 0px #666, 0px 0px 3px black;
-webkit-box-shadow:inset 0px 1px 0px 0px #666, 0px 0px 3px black;
box-shadow:inset 0px 1px 0px 0px #666, 0px 0px 3px black;
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #4f4f4f), color-stop(1, #000000) );
background:-moz-linear-gradient( center top, #4f4f4f 5%, #000000 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#4f4f4f', endColorstr='#000000');
background-color:#4f4f4f;
-moz-border-radius:5px;
-webkit-border-radius:5px;
border-radius:5px;
display:inline-block;
padding:0;
margin:10px 0 60px;
}
.button_bar a {
text-decoration:none;
text-shadow:0px -1px 0px #000000;
font-size:12px;
color:#EDEDED;
border-right:1px solid #555;
-moz-box-shadow:1px 0px 0px black;
-webkit-box-shadow:1px 0px 0px black;
box-shadow:1px 0px 0px black;
padding: 6px 10px 4px;
display: inline-block;
float: left;
}
.button_bar a:active {
padding: 7px 10px 3px !important;
text-shadow:0px 1px 0px #000000;
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #000000), color-stop(1, #4f4f4f) );
background:-moz-linear-gradient( center top, #000000 5%, #4f4f4f 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#000000', endColorstr='#4f4f4f');
}
.button_bar a:last-child {
border-right:none;
-moz-box-shadow:none;
-webkit-box-shadow:none;
box-shadow:none;
-moz-border-radius:0px 5px 5px 0px;
-webkit-border-radius:0px 5px 5px 0px;
border-radius:0px 5px 5px 0px;
}
.button_bar a:first-child {
-moz-border-radius:5px 0px 0px 5px;
-webkit-border-radius:5px 0px 0px 5px;
border-radius:5px 0px 0px 5px;
}
.button_bar a.new {
padding: 5px 10px;
-moz-border-radius:5px;
-webkit-border-radius:5px;
border-radius:5px;
}
.button_bar a:hover {
color:#FFFFFF;
}
.up {
margin:10px 0;
}
#person {
left: 245px;
position: fixed;
text-align: center;
top: 75px;
width: 140px;
background-color:#FFF;
padding:15px;
border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
-moz-box-shadow: 0px 0px 4px #180902; /* Firefox */
-webkit-box-shadow: 0px 0px 4px #180902;/* Safari 和 Chrome */
box-shadow: 0px 0px 4px #180902; /* Opera 10.5 + */
}
#file {
display:none;
}
#person img {
}
.user_mail {
border: medium none;
border:1px solid #DDDDDD;
color: #666666;
font-size: 12px;
width: 140px;
}
#person label {
display: block;
margin: 15px 0 0;
}
#person label input {
}
#person label #user_admin {
float:right;
margin: 0;
}
#person label span {
text-align:left;
font-size:11px;
color:#888;
display:block;
}
#person select {
border: 1px solid #DDDDDD;
padding: 0;
width: 140px;
}
#porfile .users{
margin-left: 180px;
}
.roles_block {
background: url(<%= asset_path "75.png" %>) repeat left top;
min-width:710px;
margin-bottom:50px;
position:relative;
padding-bottom: 20px;
border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
-moz-box-shadow: 0px 0px 4px #180902; /* Firefox */
-webkit-box-shadow: 0px 0px 4px #180902;/* Safari 和 Chrome */
box-shadow: 0px 0px 4px #180902; /* Opera 10.5 + */
}
.roles_block h2 {
color: #FFFFFF;
font-weight: normal;
margin: 0;
padding: 0;
position: absolute;
text-shadow: 0 3px 2px #000000;
top: -30px;
}
.main hr {
height:8px;
border:none;
margin:0;
border-radius: 5px 5px 0px 0px;
-moz-border-radius: 5px 5px 0px 0px;
-webkit-border-radius: 5px 5px 0px 0px;
border-bottom:1px solid #000;
}
.main2{
padding:70px 0 0;
}
#basic_block hr {
background-color: #666666;
}
#teacher_block hr {
background-color: #0071A9;
}
#student_block hr {
background-color: #AF0045;
}
.info_input {
padding:10px 20px;
}
.info_input table {
color:#fff;
width:100%;
font-size:14px;
}
.info_input table td {
padding:5px 10px 5px 0;
width: 10%;
}
.info_input .list_head {
background:url(<%= asset_path "line.png" %>) left bottom repeat-x;
}
.info_input .list_head td {
}
.info_input .list_item {
color:#AEAEAE;
}
.info_input .add {
display:block;
padding-left:22px;
font-size:12px;
line-height:21px;
height:19px;
background:url(<%= asset_path "icon.png" %>) no-repeat -59px 0;
margin-top: 10px;
color: #DDDDDD;
}
.main table {
width:100%;
}
.main td {
padding-left:20px;
color:#fff;
font-size:14px;
line-height:40px;
}
.main tr.have td{
background: url(<%= asset_path "75.png" %>) repeat left top;
}
.main tr.have td:first-child{
border-radius: 5px 0 0 5px;
-moz-border-radius: 5px 0 0 5px;
-webkit-border-radius: 5px 0 0 5px;
}
.main tr.have td:last-child{
border-radius: 0 5px 5px 0;
-moz-border-radius: 0 5px 5px 0;
-webkit-border-radius: 0 5px 5px 0;
}
.main thead td {
line-height:40px;
font-size:16px;
text-shadow: 0px 1px 1px #3e2914;
}
.main thead td.action {
width:140px;
}
.main tbody td.roles {
background-image: url(<%= asset_path "roles_type.jpg" %>);
background-repeat: repeat-x;
}
.main tbody td.teacher {
background-position: 0 -54px;
}
.main tbody td.student {
background-position: 0 -5px;
}
.main tbody td.action a {
background-image: url(<%= asset_path "icon.png" %>);
display: inline-block;
height: 19px;
margin-right: 10px;
top: 8px;
text-indent: -9999px;
width: 19px;
position: relative;
}
.main tbody td.action a.show {
background-position: left top;
}
.main tbody td.action a.show:hover {
background-position: left -19px;
}
.main tbody td.action a.edit {
background-position: -19px top;
}
.main tbody td.action a.edit:hover {
background-position: -19px -19px;
}
.main tbody td.action a.delete {
background-position: -38px top;
}
.main tbody td.action a.delete:hover {
background-position: -38px -19px;
}
.main tbody td.action a.switch {
background: url(<%= asset_path "switch.png" %>) no-repeat left 3px;
width: 40px;
}
.main tbody tr.disable td.action a.switch {
background-position:left bottom;
}
.main tbody td.action a.delete:hover {
background-position: -38px -19px;
}
.main tbody tr.have {
}
.main tbody tr.disable {
opacity: 0.7;
}
.main tbody tr {
background:none;
height:15px;
}
h1{
margin:0 0 20px;
}
p{
margin:0 0 10px;
}
#back_sidebar .items_setup .list li{
background:url(<%= asset_path "sidebar_li2.jpg" %>) repeat left top;
border:none;
padding: 0 0 0 5px;
}
#back_sidebar .items_setup .list li a{
line-height:31px;
}
#back_sidebar .items_setup .list li:hover{
background:url(<%= asset_path "sidebar_li2.jpg" %>) repeat left top;
border:none;
}
#back_sidebar .items_setup ul .list {
}
app/controllers/admin/sessions_controller.rb
+8
View File
@@ -0,0 +1,8 @@
class SessionsController < Devise::SessionsController
def create
super
reset_session
end
end
app/controllers/orbit_backend_controller.rb
+1
View File
@@ -4,6 +4,7 @@ class OrbitBackendController< ApplicationController
# before_filter {|c| c.front_end_available(@app_title)}
before_filter :check_user_can_use,:except => [:public]
include OrbitCoreLib::PermissionUnility
include AdminHelper
layout 'admin'
app/controllers/orbit_frontend_component_controller.rb
+1 -1
View File
@@ -1,7 +1,7 @@
class OrbitFrontendComponentController< ApplicationController
before_filter :setup_vars
before_filter {|c| c.front_end_available(@app_title)}
layout 'module_widget'
layout :false
def setup_vars
@app_title = request.fullpath.split('/')[2]
app/controllers/pages_controller.rb
+5 -1
View File
@@ -30,7 +30,11 @@ class PagesController < ApplicationController
end
def index_from_link
redirect_to "/#{@item.full_name}"
if params[:page]
redirect_to "/#{@item.full_name}?page=#{params[:page]}"
else
redirect_to "/#{@item.full_name}"
end
end
def show_from_link
app/models/session.rb
+12
View File
@@ -0,0 +1,12 @@
class Session
include Mongoid::Document
include Mongoid::Timestamps
def self.sweep(time = 1.hour)
if time.is_a?(String)
time = time.split.inject { |count, unit| count.to_i.send(unit) }
end
delete_all "updated_at < '#{time.ago.to_s(:db)}' OR created_at < '#{2.days.ago.to_s(:db)}'"
end
end
app/views/layouts/_side_bar.html.erb
+12 -2
View File
@@ -9,6 +9,7 @@
<%= content_tag :li, link_to(t('admin.add_new'), new_panel_announcement_back_end_bulletin_path), :class => active_for_action('bulletins', 'new') %>
<%= content_tag :li, link_to(t('admin.categories'), panel_announcement_back_end_bulletin_categorys_path), :class => active_for_action('bulletin_categorys', 'index') %>
<%= content_tag :li, link_to(t('admin.tags'), panel_announcement_back_end_tags_path), :class => active_for_action('tags', 'index') %>
<%= content_tag :li, link_to(t('announcement.bulletin.fact_check_setting'), panel_announcement_back_end_fact_checks_setting_path), :class => active_for_action('tags', 'index') %>
<% end -%>
<% end -%>
@@ -16,16 +17,25 @@
<%= link_to content_tag(:i, nil, :class => 'icons-member') + t('admin.member'), admin_users_path %>
<% end -%>
<%= content_tag :li, :class => active_for_controllers(nil) do -%>
<%= content_tag :li, :class => active_for_controllers('page_contexts') do -%>
<%= link_to content_tag(:i, nil, :class => 'icons-page') + t('admin.page'), panel_page_content_back_end_page_contexts_path %>
<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('page_contexts')) do -%>
<%= content_tag :li, link_to(t('admin.all_articles'), panel_page_content_back_end_page_contexts_path), :class => active_for_action('page_context', 'index') %>
<% end -%>
<% end -%>
<%= content_tag :li, :class => active_for_controllers('designs') do -%>
<%= link_to content_tag(:i, nil, :class => 'icons-window-block') + t('admin.design'), admin_designs_path %>
<% end -%>
<%= content_tag :li, :class => active_for_controllers(nil) do -%>
<%= content_tag :li, :class => active_for_controllers('web_links', 'tags', 'web_link_categorys') do -%>
<%= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.link'), panel_web_resource_back_end_web_links_path %>
<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('web_links', 'tags', 'web_link_categorys')) do -%>
<%= content_tag :li, link_to(t('admin.all_articles'), panel_web_resource_back_end_web_links_path), :class => active_for_action('web_link', 'index') %>
<%= content_tag :li, link_to(t('admin.add_new'), new_panel_web_resource_back_end_web_link_path), :class => active_for_action('web_link', 'new') %>
<%= content_tag :li, link_to(t('admin.categories'), panel_web_resource_back_end_web_link_categorys_path), :class => active_for_action('web_link_categorys', 'index') %>
<%= content_tag :li, link_to(t('admin.tags'), panel_web_resource_back_end_tags_path), :class => active_for_action('tags', 'index') %>
<% end -%>
<% end -%>
<%= content_tag :li, :class => active_for_controllers(nil) do -%>