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

minor update for gallery and calendar backend

This commit is contained in:
devin 2012-11-20 18:04:23 +08:00 committed by Harry Bomrah
parent 747b0d4620
commit 1c0fd0e199
4 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb vendored
View File

@ -242,7 +242,8 @@ var calendarAPI = function(){
this.loadMonthView = function(month,year){ this.loadMonthView = function(month,year){
$("#range_selection").hide(); $("#range_selection").hide();
$("#navigation").show(); $("#navigation").show();
$("#sec1").removeClass("span8").addClass("span3"); $("#sec1").removeClass("span7").addClass("span3");
$("#sec3").removeClass("span5").addClass("span4");
$("#sec2").show(); $("#sec2").show();
c.view = "month"; c.view = "month";
if(!month){ if(!month){
@ -512,7 +513,7 @@ var calendarAPI = function(){
this.loadDayView = function(day,month,year){ this.loadDayView = function(day,month,year){
$("#range_selection").hide(); $("#range_selection").hide();
$("#navigation").show(); $("#navigation").show();
$("#sec1").removeClass("span8").addClass("span3"); $("#sec1").removeClass("span7").addClass("span3");
$("#sec2").show(); $("#sec2").show();
c.view = "day"; c.view = "day";
if(!day){ if(!day){
@ -594,7 +595,8 @@ var calendarAPI = function(){
$('#view_holder').load(url, function() { $('#view_holder').load(url, function() {
$("#navigation").hide(); $("#navigation").hide();
$("#range_selection").html($("#agenda_date_range").html()).show(); $("#range_selection").html($("#agenda_date_range").html()).show();
$("#sec1").removeClass("span3").addClass("span8"); $("#sec1").removeClass("span3").addClass("span7");
$("#sec3").removeClass("span4").addClass("span5");
$("#sec2").hide(); $("#sec2").hide();
bindHandlers(); bindHandlers();
}) })

2
vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css vendored
View File

@ -1,7 +1,7 @@
/* orbit calendar */ /* orbit calendar */
#orbit_calendar { #orbit_calendar {
padding: 10px 8px; padding: 10px 8px;
min-width: 960px;
transition: all 0.3s ease; transition: all 0.3s ease;
-webkit-transition: all 0.3s ease; -webkit-transition: all 0.3s ease;
-moz-transition: all 0.3s ease; -moz-transition: all 0.3s ease;

4
vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/agenda_view.html.erb vendored
View File

@ -42,7 +42,7 @@
<div id="calendar_agenda"> <div id="calendar_agenda">
<% @datesets.each_with_index do |dateset,i| %> <% @datesets.each_with_index do |dateset,i| %>
<div class="row-fluid"> <div class="row-fluid">
<div class="span3"> <div class="span4">
<h4><%= Date::MONTHNAMES[@calendartitle[i][0]] + " - " + @calendartitle[i][1].to_s %></h4> <h4><%= Date::MONTHNAMES[@calendartitle[i][0]] + " - " + @calendartitle[i][1].to_s %></h4>
<div class="tiny_calendar"> <div class="tiny_calendar">
<table class="table"> <table class="table">
@ -71,7 +71,7 @@
</table> </table>
</div> </div>
</div> </div>
<div class="span9"> <div class="span8">
<table class="table event_list"> <table class="table event_list">
<thead> <thead>
<tr height="0"> <tr height="0">

15
vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css vendored
View File

@ -90,7 +90,7 @@
-moz-transition: all, 0.3s ease; -moz-transition: all, 0.3s ease;
} }
.rgalbum .albumname { .rgalbum .albumname {
font-size: 15px; font-size: 18px;
padding: 6px 0; padding: 6px 0;
display: block; display: block;
transition: background 0.3s ease; transition: background 0.3s ease;
@ -105,14 +105,14 @@
.rgp .rgtitle { margin: 0 0 10px 0; } .rgp .rgtitle { margin: 0 0 10px 0; }
/* Photo Edit */ /* Photo Edit */
.albumname_edit label, .albumname_edit .rginput, .rgphoto_edit img, .rgphoto_edit .rginput { float: left; } .albumname_edit label, .albumname_edit .rginput, .rgphoto_edit > a, .rgphoto_edit .rginput { float: left; }
.rgphoto_edit, .albumname_edit { .rgphoto_edit, .albumname_edit {
clear: both; clear: both;
overflow: hidden; overflow: hidden;
margin-bottom: 10px; margin-bottom: 10px;
} }
.albumname_edit label { .albumname_edit label {
width: 120px; width: 150px;
margin: 0 10px 0 0; margin: 0 10px 0 0;
text-align: right; text-align: right;
padding: 0; padding: 0;
@ -398,7 +398,7 @@
.rgih26 { width: 208px; } .rgih26 { width: 208px; }
.rgih26 span { } .rgih26 span { }
.rgih26 input { width: 376px; } .rgih26 input { width: 356px; }
.rgih26.focus { } .rgih26.focus { }
.rgih26.focus span { } .rgih26.focus span { }
.rgih68 { width: 396px; } .rgih68 { width: 396px; }
@ -408,7 +408,7 @@
.rgih68.focus span { } .rgih68.focus span { }
.rgih98 { width: 396px; } .rgih98 { width: 396px; }
.rgih98 span { } .rgih98 span { }
.rgih98 textarea { width: 376px; height: 80px; } .rgih98 textarea { width: 356px; height: 110px; }
.rgih98.focus { } .rgih98.focus { }
.rgih98.focus span { } .rgih98.focus span { }
@ -476,7 +476,7 @@
.tag_search { .tag_search {
position: absolute; position: absolute;
left: -1px; left: -1px;
bottom: -32px; bottom: -30px;
width: 200px; width: 200px;
height: 32px; height: 32px;
background-color: #f5f5f5; background-color: #f5f5f5;
@ -552,3 +552,6 @@
padding-left: 12px; padding-left: 12px;
padding-right: 12px; padding-right: 12px;
} }
.o_album_edit form {
margin-left: 8px;
}