From 3fbbbbc3eb0b5bfe2da956a8eac8ac6da9e1fe0a Mon Sep 17 00:00:00 2001
From: rulingcom <rulingcom@tp.rulingcom.com>
Date: Wed, 8 Jan 2014 17:52:16 +0800
Subject: [PATCH] UI Changes for Calendar - Ray's Changes

---
 .../back_end/events/index.html.erb            | 12 ++-
 .../front_end/events/index.html.erb           | 73 +++++++++----------
 2 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/vendor/built_in_modules/calendar_new/app/views/panel/calendar_new/back_end/events/index.html.erb b/vendor/built_in_modules/calendar_new/app/views/panel/calendar_new/back_end/events/index.html.erb
index 77e50d89..394de79c 100644
--- a/vendor/built_in_modules/calendar_new/app/views/panel/calendar_new/back_end/events/index.html.erb
+++ b/vendor/built_in_modules/calendar_new/app/views/panel/calendar_new/back_end/events/index.html.erb
@@ -15,8 +15,12 @@
 						<button class="btn" id="today_btn">Today</button>
 					</div>
 					<div class="btn-group">
-						<button class="btn" id="prev_month_btn"><span class="icon-chevron-left"></span></button>
-						<button class="btn" id="next_month_btn"><span class="icon-chevron-right"></span></button>
+						<button class="btn" id="prev_month_btn">
+							<i class="icon-chevron-left"></i>
+						</button>
+						<button class="btn" id="next_month_btn">
+							<i class="icon-chevron-right"></i>
+						</button>
 					</div>
 				</div>
 			</div>
@@ -35,7 +39,9 @@
 					<button class="btn mode_switch" data-mode="agenda" >agenda</button>
 				</div>
 				<div class="btn-group">
-					<button id="refresh_btn" class="btn icon-refresh"></button>
+					<button id="refresh_btn" class="btn">
+						<i class="icons-cycle"></i>
+					</button>
 				</div>
 			</div>
 		</div>
diff --git a/vendor/built_in_modules/calendar_new/app/views/panel/calendar_new/front_end/events/index.html.erb b/vendor/built_in_modules/calendar_new/app/views/panel/calendar_new/front_end/events/index.html.erb
index 6ee5af25..b9b694c6 100644
--- a/vendor/built_in_modules/calendar_new/app/views/panel/calendar_new/front_end/events/index.html.erb
+++ b/vendor/built_in_modules/calendar_new/app/views/panel/calendar_new/front_end/events/index.html.erb
@@ -6,49 +6,44 @@
 <%= stylesheet_link_tag "fullcalendar"%>
 <%= stylesheet_link_tag "calendar"%>
 
-<div id="orbit_calendar" class="month_view">
-	<div class="row-fluid cal-fn">
-		<div class="span3" id='sec1'>
-			<div class="btn-toolbar" id="navigation" style="margin:0;">
-				<div id="calendar-nav">
-					<div class="btn-group">
-						<button class="btn" id="today_btn">Today</button>
-					</div>
-					<div class="btn-group">
-						<button class="btn" id="prev_month_btn"><span class="icon-chevron-left"></span></button>
-						<button class="btn" id="next_month_btn"><span class="icon-chevron-right"></span></button>
-					</div>
-				</div>
-			</div>
-			<div class="form-inline" id="range_selection" style="display:none;margin:0;">
-			</div>
-		</div>
-		<div class="span5" id='sec2'>
-			<h3 id="current_title" class="current_day_title"></h4>
-		</div>
-		<div class="span4" id='sec3'>
-			<div class="btn-toolbar" style="margin:0; text-align:right;">
-				<div class="btn-group calendar_mode">
-					<button class="btn mode_switch" data-mode="agendaDay" >day</button>
-					<button class="btn mode_switch" data-mode="agendaWeek" >week</button>
-					<button class="btn active mode_switch" data-mode="month" >month</button>
-					<button class="btn mode_switch" data-mode="agenda" >agenda</button>
-				</div>
-				<div class="btn-group">
-					<button id="refresh_btn" class="btn icon-refresh"></button>
-				</div>
-			</div>
-		</div>
-	</div>
-	<div id="view_holder">
-		<div id="calendar"></div>
-		<div id="calendar_agenda"></div>
-	</div>
+<div id="orbit_calendar">
+  <div id='sec1' class="cal-fn">
+    <div class="btn-toolbar" id="navigation">
+      <div id="calendar-nav">
+        <button class="btn" id="today_btn">Today</button>
+        <div class="btn-group">
+          <button class="btn" id="prev_month_btn">
+            <i class="icon-chevron-left"></i>
+          </button>
+          <button class="btn" id="next_month_btn">
+            <i class="icon-chevron-right"></i>
+          </button>
+        </div>
+      </div>
+    </div>
+    <div class="form-inline" id="range_selection"></div>
+  </div>
+  <div id='sec3' class="btn-toolbar">
+    <div class="btn-group calendar_mode">
+      <button class="btn mode_switch" data-mode="agendaDay" >day</button>
+      <button class="btn mode_switch" data-mode="agendaWeek" >week</button>
+      <button class="btn active mode_switch" data-mode="month" >month</button>
+      <button class="btn mode_switch" data-mode="agenda" >agenda</button>
+    </div>
+    <button id="refresh_btn" class="btn">
+      <i class="icons-cycle"></i>
+    </button>
+  </div>
+  <div id="view_holder">
+    <h3 id="current_title" class="current_day_title"></h3>
+    <div id="calendar"></div>
+    <div id="calendar_agenda"></div>
+  </div>
 </div>
 <div id="event_quick_view" class="modal" style="width: 300px; display:none; margin:0 0 0 0;"></div>
 <div id="event_create_space" class="modal" style="right: 8px; bottom: 50px; left: auto; top: auto; width: 400px; margin: 0;display:none;"></div>
 <div id="calendar-loading">Loading...</div>
 
 <script type="text/javascript">
-	var calendar = new Calendar("#calendar");
+  var calendar = new Calendar("#calendar");
 </script>