diff --git a/app/assets/images/PIE.htc b/app/assets/images/PIE.htc
new file mode 100644
index 00000000..00b63838
--- /dev/null
+++ b/app/assets/images/PIE.htc
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/assets/images/bar_orbit.png b/app/assets/images/bar_orbit.png
index feaca6b8..eb0c95ee 100644
Binary files a/app/assets/images/bar_orbit.png and b/app/assets/images/bar_orbit.png differ
diff --git a/app/assets/images/service_btn.png b/app/assets/images/service_btn.png
index 8a386406..bfe156e4 100644
Binary files a/app/assets/images/service_btn.png and b/app/assets/images/service_btn.png differ
diff --git a/app/assets/javascripts/rc.js b/app/assets/javascripts/rc.js
new file mode 100644
index 00000000..37472e93
--- /dev/null
+++ b/app/assets/javascripts/rc.js
@@ -0,0 +1,120 @@
+$(document).ready(function(){
+ dropmenu();
+ tab();
+ tooltip();
+ accordion();
+});
+
+function dropmenu(){
+ if( !$('.rc_dm').length ){
+ return;
+ }
+ $('.rc_dm').each(function(){
+ $(this)
+ .find('.dm_ctrl')
+ .click(function(){
+ var target = $(this).attr('rel');
+ var w = $(this).outerWidth();
+ var h = $(this).outerHeight();
+ var p = $(this).position();
+
+ $('.dm_list').not('#'+target).hide();
+ $('#'+target)
+ .css({
+ width: w,
+ zIndex: 999,
+ left: p.left,
+ top: p.top + h
+ })
+ .toggle();
+
+ return false;
+ });
+ });
+ $(document).click(function(){
+ $('.dm_list').hide();
+ });
+}
+
+function tab(){
+ if( !$('.rc_tab').length ){
+ return;
+ }
+ $('.rc_tab').each(function(){
+ $(this).find('.tab_ctrl:first').addClass('recent');
+ $(this).find('.tab_content:not(:first)').hide();
+ $(this).find('.tab_ctrl').click(function(){
+ var target = $(this).attr('href');
+ $(this)
+ .parents('.rc_tab')
+ .find('.tab_content').hide()
+ .end()
+ .find('.tab_ctrl').removeClass('recent');
+ $(this).addClass('recent');
+ $(target).show();
+ return false;
+ });
+ });
+}
+
+function tooltip(){
+ if( !$('.rc_tip').length ){
+ return;
+ }
+ $('.rc_tip').each(function(){
+ $(this).css({position: 'relative'});
+ var t = $(this).data('tip');
+
+ $(this)
+ .mouseover(function(){
+ var th = $(this).find('.td').outerHeight();
+ var p = $(this).offset();
+
+ $(this).append(''+t+' ');
+ $(this).find('.td').show().css('display','inline-block');
+ $(document).mousemove(function(e){
+ $(this).find('.td').css({
+ left: e.pageX - p.left + 16,
+ top: e.pageY - p.top - th - 20
+ });
+ });
+ })
+ .mouseout(function(){
+ $(this).find('.td').hide().detach();
+ });
+ });
+}
+
+function accordion(){
+ if( !$('.rc_accor').length ){
+ return;
+ }
+ $('.rc_accor').each(function(){
+ $(this).find('.ac_ctrl:first').addClass('recent');
+ $(this).find('.ac_content:not(:first)').hide();
+ if($(this).hasClass('av')){
+ $(this).find('.ac_ctrl').click(function(){
+ var index = $(this).parents('.av').find('.ac_ctrl').index(this);
+ $(this).siblings('.ac_ctrl').removeClass('recent');
+ $(this).addClass('recent');
+ $(this).parents('.rc_accor').find('.ac_content:not(:eq('+index+'))').stop().slideUp();
+ $(this).parents('.rc_accor').find('.ac_content:eq('+index+')').stop().slideToggle();
+ return false;
+ });
+ } else if($(this).hasClass('ah')){
+ var w = $(this).find('.ac_content').css('width');
+ $(this).find('.ac_content:not(:eq(0))').css({width:0});
+ $(this).find('.ac_ctrl').click(function(){
+ var index = $(this).parents('.ah').find('.ac_ctrl').index(this);
+ $(this).siblings('.ac_ctrl').removeClass('recent');
+ $(this).addClass('recent');
+ $(this).parents('.rc_accor').find('.ac_content:not(:eq('+index+'))').stop().animate({width:0});
+ $(this).parents('.rc_accor').find('.ac_content:eq('+index+')').stop().show().animate({width:w});
+ return false;
+ });
+ }
+
+
+
+ });
+}
diff --git a/app/assets/javascripts/rss.js b/app/assets/javascripts/rss.js
index a9d8ff32..737b08b7 100644
--- a/app/assets/javascripts/rss.js
+++ b/app/assets/javascripts/rss.js
@@ -393,9 +393,9 @@ modalWindow : function(settings,callbackFn){
}else{tempwidth="auto";}
$rss("body").append('
');
- $rss("#rgsheath").css({background: "#000", width: "100%", position: "fixed", top: 0, left: 0,opacity:0.9,'z-index':199});
+ $rss("#rgsheath").css({background: "#000", width: "100%", position: "fixed", top: 0, left: 0,opacity:0.5,'z-index':199});
$rss("body").append('
');
- $rss("#rgWindow").css({"position": "fixed", "z-index": "999", "background": "#fff", "border": "solid 3px #ccc", "padding": "20px", "overflow": "hidden", "border-radius": "12px", "-webkit-border-radius": "12px", "-moz-border-radius": "12px", "-ms-border-radius": "12px", "box-shadow": "0 0 20px rgba(0,0,0,0.9)","-webkit-box-shadow": "0 0 20px rgba(0,0,0,0.9)","-moz-box-shadow": "0 0 20px rgba(0,0,0,0.9)","-ms-box-shadow": "0 0 20px rgba(0,0,0,0.9)"});
+ $rss("#rgWindow").css({"position": "fixed", "z-index": "999", "background": "#fff", "border": "solid 1px #ccc", "padding": "10px", "border-radius": "5px", "-webkit-border-radius": "5px", "-moz-border-radius": "5px", "-ms-border-radius": "5px", "box-shadow": "0 0 20px rgba(0,0,0,0.7)","-webkit-box-shadow": "0 0 20px rgba(0,0,0,0.7)","-moz-box-shadow": "0 0 20px rgba(0,0,0,0.7)","-ms-box-shadow": "0 0 20px rgba(0,0,0,0.7)"});
var rgWTop = (rgmaskHeight-20)/2;
var rgWLeft = (rgmaskWidth-20)/2;
$rss("#rgWindow").css({top:rgWTop+"px", left:rgWLeft+"px"});
@@ -433,8 +433,8 @@ modalWindow : function(settings,callbackFn){
$rss("#rgWindow").empty().show();
var closebtn = "";
if(closeBtn)
- closebtn='X ';
- $rss("#rgWindow").animate({"width":tempwidth+"px","height":tempheight+"px",top:rgWTop+"px", left:rgWLeft+"px"},500,function(){$rss("#rgWindow").html(closebtn+""+dhtml+"
");
+ closebtn='X ';
+ $rss("#rgWindow").animate({"width":tempwidth+"px","height":tempheight+"px",top:rgWTop+"px", left:rgWLeft+"px"},500,function(){$rss("#rgWindow").html(closebtn+""+dhtml+"
");
$rss("#close_modal").mouseover(function(){$rss(this).css("color","#999");}).mouseout(function(){$rss(this).css("color","#666");})
$rss("#close_modal").click(function(){
$rss("#rgWindow").empty();
diff --git a/app/assets/javascripts/site_editor.js b/app/assets/javascripts/site_editor.js
index 98405564..ef4acc85 100644
--- a/app/assets/javascripts/site_editor.js
+++ b/app/assets/javascripts/site_editor.js
@@ -7,4 +7,5 @@
//= require jquery
//= require jquery_ujs
//= require page_edit
-//= require side_bar_history
\ No newline at end of file
+//= require side_bar_history
+//= require rc
\ No newline at end of file
diff --git a/app/assets/stylesheets/admin_back_end.css.erb b/app/assets/stylesheets/admin_back_end.css.erb
index 405281b4..5aecff45 100644
--- a/app/assets/stylesheets/admin_back_end.css.erb
+++ b/app/assets/stylesheets/admin_back_end.css.erb
@@ -14,39 +14,69 @@ body{
}
#back_banner_link{
- background: url(<%= asset_path "orbitbar1.png" %>) repeat-x scroll 0 0;
- height: 50px;
- left: 0;
- position: fixed;
- top: 0;
+ 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%;
- z-index: 5;
+ behavior: url(<%= asset_path "PIE.htc" %>);
}
.hmenu{
- height: 40px;
- position: absolute;
- right: 0;
- top: 1px;
- width: 250px;
+ float: right;
+ height: 41px;
}
#back_orbit{
- background: url(<%= asset_path "bar_orbit.png" %>) no-repeat scroll 0 0 transparent;
- cursor:pointer;
+ 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;
- left: 10px;
- position: relative;
+ 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-position:0 -43px;
- box-shadow: 0 3px 3px #000000;
+ 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: none repeat scroll 0 0 #FFFFFF;
- border-radius: 0 3px 3px 3px;
+ 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;
@@ -70,30 +100,37 @@ body{
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;
- border: medium none !important;
- display: block !important;
- height: 40px !important;
- line-height: normal !important;
- padding: 0 !important;
- position: absolute;
- right: 0px;
- text-indent: -10000px;
- top: 0px;
- width: 43px !important;
+ 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;
- font-size: 15px;
- line-height: 40px;
- position: absolute;
- right: 55px;
- top: 0;
+ color: #FFFFFF;
+ float: right;
+ font-size: 15px;
+ line-height: 40px;
+ margin-right: 10px;
}
.lang a{
color:#fff;
@@ -589,4 +626,40 @@ hr.student_block {
position: absolute;
top: -15%;
width: 130%;
+}
+#rgContent .main2{
+ padding:0;
+}
+#rgContent h1{
+ border-bottom: 1px dashed #CCCCCC;
+ color: #333333;
+ font-size: 19px;
+ font-weight: bold;
+ margin: 0 0 20px;
+ padding: 0 0 10px;
+ text-align: center;
+}
+#rgContent label {
+ color: #888888;
+ display: block;
+ font-size: 12px;
+ margin: 25px 0 5px;
+ width: 100%;
+}
+#rgContent input {
+ color: #888888;
+ width: 98%;
+}
+#rgContent .button_bar {
+ float: none;
+ text-align: center;
+ width:100%;
+ margin:30px 0 0;
+}
+#rgContent .button_bar a {
+ float: none;
+ display:block;
+}
+#close_modal{
+ display:none !important;
}
\ No newline at end of file
diff --git a/app/assets/stylesheets/reset.css b/app/assets/stylesheets/reset.css
index 44f2ae77..612cab19 100644
--- a/app/assets/stylesheets/reset.css
+++ b/app/assets/stylesheets/reset.css
@@ -42,3 +42,7 @@ input:focus, select:focus, textarea:focus {
height:0;
visibility:hidden;
}
+.fixed {
+ position: fixed;
+ z-index: 100;
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/site_items.css.erb b/app/assets/stylesheets/site_items.css.erb
index 151dabde..38b0a185 100644
--- a/app/assets/stylesheets/site_items.css.erb
+++ b/app/assets/stylesheets/site_items.css.erb
@@ -1,445 +1,482 @@
-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: url(<%= asset_path "orbitbar1.png" %>) repeat-x scroll 0 0;
- height: 50px;
- left: 0;
- position: fixed;
- top: 0;
- width: 100%;
- z-index: 5;
-}
-.hmenu{
- height: 40px;
- position: absolute;
- right: 0;
- top: 1px;
- width: 250px;
-}
-#back_orbit{
- background: url(<%= asset_path "bar_orbit.png" %>) no-repeat scroll 0 0 transparent;
- cursor:pointer;
- height: 43px;
- left: 10px;
- position: relative;
- width: 41px;
-}
-#back_orbit:hover{
- background-position:0 -43px;
- box-shadow: 0 3px 3px #000000;
-}
-#back_orbit:hover #orblist{
- display:block;
-}
-#orblist{
- background: none repeat scroll 0 0 #FFFFFF;
- border-radius: 0 3px 3px 3px;
- 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 a{
- background: url(<%= asset_path "service_btn.png" %>) no-repeat scroll right 0 transparent;
- border: medium none !important;
- display: block !important;
- height: 40px !important;
- line-height: normal !important;
- padding: 0 !important;
- position: absolute;
- right: 0px;
- text-indent: -10000px;
- top: 0px;
- width: 43px !important;
-}
-#log_out a:hover{
- background: url(<%= asset_path "service_btn.png" %>) no-repeat scroll right bottom transparent !important;
-}
-.lang{
- color: #FFFFFF;
- font-size: 15px;
- line-height: 40px;
- position: absolute;
- right: 55px;
- top: 0;
-}
-.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;
+ 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 {
}
\ No newline at end of file
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index 693243c2..33c927ac 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -19,7 +19,7 @@ class PagesController < ApplicationController
end
def show
- begin
+ #begin
item = Item.first(:conditions => {:full_name => params[:page_name]})
case item._type
when 'Page'
@@ -28,9 +28,9 @@ class PagesController < ApplicationController
when 'Link'
redirect_to "http://#{item[:url]}"
end
- rescue
- render :file => "#{Rails.root}/public/404.html", :status => :not_found
- end
+ #rescue
+ # render :file => "#{Rails.root}/public/404.html", :status => :not_found
+ #end
end
end
diff --git a/app/views/admin/assets/_asset.html.erb b/app/views/admin/assets/_asset.html.erb
index b29bc51d..7aad2ef8 100644
--- a/app/views/admin/assets/_asset.html.erb
+++ b/app/views/admin/assets/_asset.html.erb
@@ -13,5 +13,5 @@
-
+
\ No newline at end of file
diff --git a/app/views/admin/assets/_form.html.erb b/app/views/admin/assets/_form.html.erb
index 3ee7c644..72199ceb 100644
--- a/app/views/admin/assets/_form.html.erb
+++ b/app/views/admin/assets/_form.html.erb
@@ -9,6 +9,6 @@
-<%= f.label :data, t('admin.data') %>
+<%= f.label :data, t('admin.data'), :class => 'file' %>
<%= f.file_field :data %>
\ No newline at end of file
diff --git a/app/views/admin/assets/_new.html.erb b/app/views/admin/assets/_new.html.erb
index 4f15fafc..49e638c8 100644
--- a/app/views/admin/assets/_new.html.erb
+++ b/app/views/admin/assets/_new.html.erb
@@ -9,7 +9,7 @@
<%= link_back %>
<%= f.submit t(:create) %>
<% else %>
- <%= t(:create) %>
+ <%= t(:create) %>
<% end %>
<% end %>
diff --git a/app/views/admin/users/_sub_role_selector.html.erb b/app/views/admin/users/_sub_role_selector.html.erb
index 6d7924ca..2305cb47 100644
--- a/app/views/admin/users/_sub_role_selector.html.erb
+++ b/app/views/admin/users/_sub_role_selector.html.erb
@@ -1,4 +1,4 @@
<% role.sub_roles.each do |sub_role| %>
- <%= sub_role.i18n_variable[I18n.locale] %>
- <%= check_box_tag "user[sub_role_ids][]", sub_role.id, @user.sub_role_ids.include?(sub_role.id), :class => 'sub_role_select' %>
+ <%= f.label sub_role.i18n_variable[I18n.locale], :for => "check_sub_role_#{sub_role.id}", :class => 'sub_role_select' %>
+ <%= check_box_tag "user[sub_role_ids][]", sub_role.id, @user.sub_role_ids.include?(sub_role.id), :id => "check_sub_role_#{sub_role.id}", :class => 'sub_role_select' %>
<% end %>
\ No newline at end of file
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index 63137048..d800ab5d 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -1,31 +1,37 @@
-
-
-
-
- <%= @title || APP_CONFIG['orbit'] %>
-
- <%= stylesheet_link_tag "admin" %>
- <%= javascript_include_tag "admin" %>
- <%= yield :page_specific_css %>
- <%= yield :page_specific_javascript %>
- <%= csrf_meta_tag %>
-
-
-
-
<%= render 'layouts/drop_down_menu' %>
-
-
-
-
-
-
- <%= yield %>
-
-
<%= yield :tertiary %>
-
-
-
-
+
+
+
+
+ <%= @title || APP_CONFIG['orbit'] %>
+
+
+ <%= stylesheet_link_tag "admin" %>
+ <%= javascript_include_tag "admin" %>
+ <%= yield :page_specific_css %>
+ <%= yield :page_specific_javascript %>
+ <%= csrf_meta_tag %>
+
+
+
+
+ Orbit Icon
+ <%= render 'layouts/drop_down_menu' %>
+
+
+
+
+
+
+
+ <%= yield %>
+
+
<%= yield :tertiary %>
+
+
+
+
diff --git a/app/views/layouts/site_editor.html.erb b/app/views/layouts/site_editor.html.erb
index f419fb02..f4df75c4 100644
--- a/app/views/layouts/site_editor.html.erb
+++ b/app/views/layouts/site_editor.html.erb
@@ -1,32 +1,38 @@
-
-
-
-
- <%= @title || APP_CONFIG['orbit'] %>
-
- <%= stylesheet_link_tag "site_editor" %>
- <%= javascript_include_tag "site_editor" %>
- <%= yield :page_specific_css %>
- <%= yield :page_specific_javascript %>
- <%= csrf_meta_tag %>
-
-
-
-
-
<%= render 'layouts/drop_down_menu' %>
-
-
-
-
-
-
<%= yield :tertiary %>
-
-
-
-
-
+
+
+
+
+ <%= @title || APP_CONFIG['orbit'] %>
+
+
+ <%= stylesheet_link_tag "site_editor" %>
+ <%= javascript_include_tag "site_editor" %>
+ <%= yield :page_specific_css %>
+ <%= yield :page_specific_javascript %>
+ <%= csrf_meta_tag %>
+
+
+
+
+
+ Orbit Icon
+ <%= render 'layouts/drop_down_menu' %>
+
+
+
+
+
+
+
<%= yield :tertiary %>
+
+
+
+
+
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 48f4d956..d1b671e5 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -10,7 +10,7 @@ PrototypeR4::Application.configure do
config.whiny_nils = true
# Show full error reports and disable caching
- config.consider_all_requests_local = true
+ config.consider_all_requests_local = false
#config.action_view.debug_rjs = true
config.action_controller.perform_caching = false
diff --git a/lib/parsers/parser_back_end.rb b/lib/parsers/parser_back_end.rb
index d11ce9b2..48b6a1df 100644
--- a/lib/parsers/parser_back_end.rb
+++ b/lib/parsers/parser_back_end.rb
@@ -107,7 +107,7 @@ module ParserBackEnd
c.define_tag 'menu' do |tag|
home = get_homepage
menu = page.design.layout.menu
- menu_level(home, 1, menu, true)
+ menu_level(home, 0, menu, true)
end
end
end
diff --git a/lib/parsers/parser_common.rb b/lib/parsers/parser_common.rb
index e96c9201..70006eb3 100644
--- a/lib/parsers/parser_common.rb
+++ b/lib/parsers/parser_common.rb
@@ -1,23 +1,33 @@
module ParserCommon
def menu_level(page, current, menu, edit = false)
+ res = ''
if current <= menu.levels
- res = ""
end
end
@@ -26,8 +36,11 @@ module ParserCommon
res << menu.values["li_class_#{current}"]
res << "_#{i}" if i
res << ">"
- res << "#{page.name} "
- res << menu_level(page, current + 1, menu, edit) if page.children.size > 0 && !page.is_home?
+ if page.children.size > 0
+ res << menu_level(page, current + 1, menu, edit)
+ else
+ res << "#{page.name} "
+ end
res << ""
end
diff --git a/lib/parsers/parser_front_end.rb b/lib/parsers/parser_front_end.rb
index 660a779b..3452f4fc 100644
--- a/lib/parsers/parser_front_end.rb
+++ b/lib/parsers/parser_front_end.rb
@@ -104,7 +104,7 @@ module ParserFrontEnd
ret << "
"
else
part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s } rescue nil
- ret << part.content
+ ret << part.content rescue nil
end
ret
end
@@ -118,7 +118,7 @@ module ParserFrontEnd
c.define_tag 'menu' do |tag|
home = get_homepage
menu = page.design.layout.menu
- menu_level(home, 1, menu)
+ menu_level(home, 0, menu)
end
end
end
diff --git a/lib/tasks/pages.rake b/lib/tasks/pages.rake
new file mode 100644
index 00000000..8a43f420
--- /dev/null
+++ b/lib/tasks/pages.rake
@@ -0,0 +1,66 @@
+# encoding: utf-8
+
+namespace :pages do
+
+ task :build => :environment do
+
+ Item.delete_all
+
+
+ var_10 = I18nVariable.create!( :document_class => 'Home', :key => 'home', :en => 'Homepage', :zh_tw => '首頁')
+ var_13 = I18nVariable.create!( :document_class => 'PagePart', :key => 'main_content', :en => 'This is the homepage', :zh_tw => '這是首頁', :parent_id => var_10.id )
+
+
+ design = Design.new(:title => "Fraisier", :author => "Paul", :intro => "Strawberry cake")
+
+ design.build_default_css(:file => File.open("#{Rails.root}/lib/fraisier/default.css"))
+
+ # image = design.images.build(:file => File.open("#{Rails.root}/lib/fraisier/img/buttons.gif"))
+ #
+ # js = design.javascripts.build(:file => File.open("#{Rails.root}/lib/fraisier/inettuts.js"))
+ #
+ theme = design.themes.build(:file => File.open("#{Rails.root}/lib/fraisier/themes/default.css"))
+ theme_1 = design.themes.build(:file => File.open("#{Rails.root}/lib/fraisier/themes/red.css"))
+
+ design.build_layout
+ design.layout.file = File.open("#{Rails.root}/lib/fraisier/layout.html")
+
+ design.layout.save
+ theme.save
+ theme_1.save
+ # image.save
+ # js.save
+
+ design.save
+
+
+
+ design_1 = Design.new(:title => "Bob", :author => "Me", :intro => "Moran")
+
+ design_1.build_default_css(:file => File.open("#{Rails.root}/lib/fraisier/default.css"))
+
+ # image = design.images.build(:file => File.open("#{Rails.root}/lib/fraisier/img/buttons.gif"))
+ #
+ # js = design.javascripts.build(:file => File.open("#{Rails.root}/lib/fraisier/inettuts.js"))
+ #
+ theme = design_1.themes.build(:file => File.open("#{Rails.root}/lib/fraisier/themes/default.css"))
+ theme_1 = design_1.themes.build(:file => File.open("#{Rails.root}/lib/fraisier/themes/red.css"))
+
+ design_1.build_layout
+ design_1.layout.file = File.open("#{Rails.root}/lib/fraisier/layout.html")
+
+ design_1.layout.save
+ theme.save
+ theme_1.save
+ # image.save
+ # js.save
+
+ design_1.save
+
+
+ home = Page.create!( :i18n_variable_id => var_10.id, :design_id => design_1.id, :name => 'home', :is_published => true, :theme_id => theme.id )
+ home.page_parts.create!( :name => 'content_1', :content => File.open("#{Rails.root}/lib/template/home.page").read, :kind => 'text', :i18n_variable_id => var_13.id )
+
+ end
+
+end