From be850ce0be1566bcd086a52f6a9753c567b592c6 Mon Sep 17 00:00:00 2001 From: devin Date: Tue, 20 Nov 2012 18:04:23 +0800 Subject: [PATCH 1/2] minor update for gallery and calendar backend --- .../app/assets/javascripts/calendarAPI.js.erb | 8 +++++--- .../calendar/app/assets/stylesheets/calendar.css | 2 +- .../calendar/back_end/cals/agenda_view.html.erb | 4 ++-- .../gallery/app/assets/stylesheets/gallery.css | 15 +++++++++------ 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb b/vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb index 181a757b..a1ab3b6c 100644 --- a/vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb +++ b/vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb @@ -242,7 +242,8 @@ var calendarAPI = function(){ this.loadMonthView = function(month,year){ $("#range_selection").hide(); $("#navigation").show(); - $("#sec1").removeClass("span8").addClass("span3"); + $("#sec1").removeClass("span7").addClass("span3"); + $("#sec3").removeClass("span5").addClass("span4"); $("#sec2").show(); c.view = "month"; if(!month){ @@ -512,7 +513,7 @@ var calendarAPI = function(){ this.loadDayView = function(day,month,year){ $("#range_selection").hide(); $("#navigation").show(); - $("#sec1").removeClass("span8").addClass("span3"); + $("#sec1").removeClass("span7").addClass("span3"); $("#sec2").show(); c.view = "day"; if(!day){ @@ -594,7 +595,8 @@ var calendarAPI = function(){ $('#view_holder').load(url, function() { $("#navigation").hide(); $("#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(); bindHandlers(); }) diff --git a/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css b/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css index fd25b10e..0adf7e93 100644 --- a/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css +++ b/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css @@ -1,7 +1,7 @@ /* orbit calendar */ #orbit_calendar { padding: 10px 8px; - + min-width: 960px; transition: all 0.3s ease; -webkit-transition: all 0.3s ease; -moz-transition: all 0.3s ease; diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/agenda_view.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/agenda_view.html.erb index 0a57ae8c..5a0dc703 100644 --- a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/agenda_view.html.erb +++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/agenda_view.html.erb @@ -42,7 +42,7 @@
<% @datesets.each_with_index do |dateset,i| %>
-
+

<%= Date::MONTHNAMES[@calendartitle[i][0]] + " - " + @calendartitle[i][1].to_s %>

@@ -71,7 +71,7 @@
-
+
diff --git a/vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css b/vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css index 0b5bdc34..86a189fd 100755 --- a/vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css +++ b/vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css @@ -90,7 +90,7 @@ -moz-transition: all, 0.3s ease; } .rgalbum .albumname { - font-size: 15px; + font-size: 18px; padding: 6px 0; display: block; transition: background 0.3s ease; @@ -105,14 +105,14 @@ .rgp .rgtitle { margin: 0 0 10px 0; } /* 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 { clear: both; overflow: hidden; margin-bottom: 10px; } .albumname_edit label { - width: 120px; + width: 150px; margin: 0 10px 0 0; text-align: right; padding: 0; @@ -398,7 +398,7 @@ .rgih26 { width: 208px; } .rgih26 span { } -.rgih26 input { width: 376px; } +.rgih26 input { width: 356px; } .rgih26.focus { } .rgih26.focus span { } .rgih68 { width: 396px; } @@ -408,7 +408,7 @@ .rgih68.focus span { } .rgih98 { width: 396px; } .rgih98 span { } -.rgih98 textarea { width: 376px; height: 80px; } +.rgih98 textarea { width: 356px; height: 110px; } .rgih98.focus { } .rgih98.focus span { } @@ -476,7 +476,7 @@ .tag_search { position: absolute; left: -1px; - bottom: -32px; + bottom: -30px; width: 200px; height: 32px; background-color: #f5f5f5; @@ -552,3 +552,6 @@ padding-left: 12px; padding-right: 12px; } +.o_album_edit form { + margin-left: 8px; +} From 2cc1ed1db7c63d735ad2a28ea3aa0d6252e27072 Mon Sep 17 00:00:00 2001 From: devin Date: Wed, 21 Nov 2012 11:16:23 +0800 Subject: [PATCH 2/2] calendar js minor update --- .../calendar/app/assets/javascripts/calendarAPI.js.erb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb b/vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb index a1ab3b6c..0f9923ca 100644 --- a/vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb +++ b/vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb @@ -389,7 +389,8 @@ var calendarAPI = function(){ this.loadWeekView = function(week,year){ $("#range_selection").hide(); $("#navigation").show(); - $("#sec1").removeClass("span8").addClass("span3"); + $("#sec1").removeClass("span7").addClass("span3"); + $("#sec3").removeClass("span5").addClass("span4"); $("#sec2").show(); c.view = "week"; if(!week){ @@ -514,6 +515,7 @@ var calendarAPI = function(){ $("#range_selection").hide(); $("#navigation").show(); $("#sec1").removeClass("span7").addClass("span3"); + $("#sec3").removeClass("span5").addClass("span4"); $("#sec2").show(); c.view = "day"; if(!day){