updated with fullcalendar.css, added front end page
Conflicts: vendor/built_in_modules/calendar_new/init.rb
This commit is contained in:
		
							parent
							
								
									4ff5724379
								
							
						
					
					
						commit
						3d3d5ed144
					
				|  | @ -63,6 +63,7 @@ | ||||||
| 	<div class="row-fluid"> | 	<div class="row-fluid"> | ||||||
| 		<div class="span8"> | 		<div class="span8"> | ||||||
| 		</div> | 		</div> | ||||||
|  | <%if is_manager?%> | ||||||
| 		<div class="span4"> | 		<div class="span4"> | ||||||
| 			<%= link_to "Add", new_panel_calendar_back_end_event_path, :class => "btn btn-primary pull-right", :id=>"create_event_btn", :ref=>"add-btn" %> | 			<%= link_to "Add", new_panel_calendar_back_end_event_path, :class => "btn btn-primary pull-right", :id=>"create_event_btn", :ref=>"add-btn" %> | ||||||
| 		</div> | 		</div> | ||||||
|  | @ -76,5 +77,6 @@ | ||||||
| <script type="text/javascript"> | <script type="text/javascript"> | ||||||
| 	var calendar = new calendarAPI(); | 	var calendar = new calendarAPI(); | ||||||
| </script> | </script> | ||||||
|  | <%end%> | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -1,12 +1,7 @@ | ||||||
| /* | /*! | ||||||
|  * FullCalendar v1.5.4 Stylesheet |  * FullCalendar v1.6.1 Stylesheet | ||||||
|  * |  * Docs & License: http://arshaw.com/fullcalendar/ | ||||||
|  * Copyright (c) 2011 Adam Shaw |  * (c) 2013 Adam Shaw | ||||||
|  * Dual licensed under the MIT and GPL licenses, located in |  | ||||||
|  * MIT-LICENSE.txt and GPL-LICENSE.txt respectively. |  | ||||||
|  * |  | ||||||
|  * Date: Tue Sep 4 23:38:33 2012 -0700 |  | ||||||
|  * |  | ||||||
|  */ |  */ | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|  | @ -79,11 +74,8 @@ html .fc, | ||||||
| 	margin-right: -1px; | 	margin-right: -1px; | ||||||
| 	} | 	} | ||||||
| 	 | 	 | ||||||
| .fc-header .fc-corner-right { | .fc-header .fc-corner-right,  /* non-theme */ | ||||||
| 	margin-right: 1px; /* back to normal */ | .fc-header .ui-corner-right { /* theme */ | ||||||
| 	} |  | ||||||
| 	 |  | ||||||
| .fc-header .ui-corner-right { |  | ||||||
| 	margin-right: 0; /* back to normal */ | 	margin-right: 0; /* back to normal */ | ||||||
| 	} | 	} | ||||||
| 	 | 	 | ||||||
|  | @ -124,17 +116,17 @@ html .fc, | ||||||
| 
 | 
 | ||||||
| .fc-widget-header,    /* <th>, usually */ | .fc-widget-header,    /* <th>, usually */ | ||||||
| .fc-widget-content {  /* <td>, usually */ | .fc-widget-content {  /* <td>, usually */ | ||||||
| 	border: 1px solid #ccc; | 	border: 1px solid #ddd; | ||||||
| 	} | 	} | ||||||
| 	 | 	 | ||||||
| .fc-state-highlight { /* <td> today cell */ /* TODO: add .fc-today to <th> */ | .fc-state-highlight { /* <td> today cell */ /* TODO: add .fc-today to <th> */ | ||||||
| 	background: #ffc; | 	background: #fcf8e3; | ||||||
| 	} | 	} | ||||||
| 	 | 	 | ||||||
| .fc-cell-overlay { /* semi-transparent rectangle while dragging */ | .fc-cell-overlay { /* semi-transparent rectangle while dragging */ | ||||||
| 	background: #9cf; | 	background: #bce8f1; | ||||||
| 	opacity: .2; | 	opacity: .3; | ||||||
| 	filter: alpha(opacity=20); /* for IE */ | 	filter: alpha(opacity=30); /* for IE */ | ||||||
| 	} | 	} | ||||||
| 	 | 	 | ||||||
| 
 | 
 | ||||||
|  | @ -145,43 +137,54 @@ html .fc, | ||||||
| .fc-button { | .fc-button { | ||||||
| 	position: relative; | 	position: relative; | ||||||
| 	display: inline-block; | 	display: inline-block; | ||||||
|  | 	padding: 0 .6em; | ||||||
|  | 	overflow: hidden; | ||||||
|  | 	height: 1.9em; | ||||||
|  | 	line-height: 1.9em; | ||||||
|  | 	white-space: nowrap; | ||||||
| 	cursor: pointer; | 	cursor: pointer; | ||||||
| 	} | 	} | ||||||
| 	 | 	 | ||||||
| .fc-state-default { /* non-theme */ | .fc-state-default { /* non-theme */ | ||||||
| 	border-style: solid; | 	border: 1px solid; | ||||||
| 	border-width: 1px 0; |  | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| .fc-button-inner { | .fc-state-default.fc-corner-left { /* non-theme */ | ||||||
| 	position: relative; | 	border-top-left-radius: 4px; | ||||||
| 	float: left; | 	border-bottom-left-radius: 4px; | ||||||
| 	overflow: hidden; |  | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| .fc-state-default .fc-button-inner { /* non-theme */ | .fc-state-default.fc-corner-right { /* non-theme */ | ||||||
| 	border-style: solid; | 	border-top-right-radius: 4px; | ||||||
| 	border-width: 0 1px; | 	border-bottom-right-radius: 4px; | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| .fc-button-content { | /* | ||||||
| 	position: relative; | 	Our default prev/next buttons use HTML entities like ‹ › « » | ||||||
| 	float: left; | 	and we'll try to make them look good cross-browser. | ||||||
| 	height: 1.9em; | */ | ||||||
| 	line-height: 1.9em; | 
 | ||||||
| 	padding: 0 .6em; | .fc-text-arrow { | ||||||
| 	white-space: nowrap; | 	margin: 0 .1em; | ||||||
|  | 	font-size: 2em; | ||||||
|  | 	font-family: "Courier New", Courier, monospace; | ||||||
|  | 	vertical-align: baseline; /* for IE7 */ | ||||||
|  | 	} | ||||||
|  | 
 | ||||||
|  | .fc-button-prev .fc-text-arrow, | ||||||
|  | .fc-button-next .fc-text-arrow { /* for ‹ › */ | ||||||
|  | 	font-weight: bold; | ||||||
| 	} | 	} | ||||||
| 	 | 	 | ||||||
| /* icon (for jquery ui) */ | /* icon (for jquery ui) */ | ||||||
| 	 | 	 | ||||||
| .fc-button-content .fc-icon-wrap { | .fc-button .fc-icon-wrap { | ||||||
| 	position: relative; | 	position: relative; | ||||||
| 	float: left; | 	float: left; | ||||||
| 	top: 50%; | 	top: 50%; | ||||||
| 	} | 	} | ||||||
| 	 | 	 | ||||||
| .fc-button-content .ui-icon { | .fc-button .ui-icon { | ||||||
| 	position: relative; | 	position: relative; | ||||||
| 	float: left; | 	float: left; | ||||||
| 	margin-top: -50%; | 	margin-top: -50%; | ||||||
|  | @ -189,68 +192,58 @@ html .fc, | ||||||
| 	*top: -50%; | 	*top: -50%; | ||||||
| 	} | 	} | ||||||
| 	 | 	 | ||||||
| /* gloss effect */ | /* | ||||||
|  |   button states | ||||||
|  |   borrowed from twitter bootstrap (http://twitter.github.com/bootstrap/) | ||||||
|  | */ | ||||||
| 
 | 
 | ||||||
| .fc-state-default .fc-button-effect { | .fc-state-default { | ||||||
| 	position: absolute; | 	background-color: #f5f5f5; | ||||||
| 	top: 50%; | 	background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); | ||||||
| 	left: 0; | 	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6)); | ||||||
| 	} | 	background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); | ||||||
| 	 | 	background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); | ||||||
| .fc-state-default .fc-button-effect span { | 	background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); | ||||||
| 	position: absolute; | 	background-repeat: repeat-x; | ||||||
| 	top: -100px; | 	border-color: #e6e6e6 #e6e6e6 #bfbfbf; | ||||||
| 	left: 0; | 	border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); | ||||||
| 	width: 500px; | 	color: #333; | ||||||
| 	height: 100px; | 	text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); | ||||||
| 	border-width: 100px 0 0 1px; | 	box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); | ||||||
| 	border-style: solid; |  | ||||||
| 	border-color: #fff; |  | ||||||
| 	background: #444; |  | ||||||
| 	opacity: .09; |  | ||||||
| 	filter: alpha(opacity=9); |  | ||||||
| 	} |  | ||||||
| 	 |  | ||||||
| /* button states (determines colors)  */ |  | ||||||
| 	 |  | ||||||
| .fc-state-default, |  | ||||||
| .fc-state-default .fc-button-inner { |  | ||||||
| 	border-style: solid; |  | ||||||
| 	border-color: #ccc #bbb #aaa; |  | ||||||
| 	background: #F3F3F3; |  | ||||||
| 	color: #000; |  | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| .fc-state-hover, | .fc-state-hover, | ||||||
| .fc-state-hover .fc-button-inner { | .fc-state-down, | ||||||
| 	border-color: #999; | .fc-state-active, | ||||||
|  | .fc-state-disabled { | ||||||
|  | 	color: #333333; | ||||||
|  | 	background-color: #e6e6e6; | ||||||
|  | 	} | ||||||
|  | 
 | ||||||
|  | .fc-state-hover { | ||||||
|  | 	color: #333333; | ||||||
|  | 	text-decoration: none; | ||||||
|  | 	background-position: 0 -15px; | ||||||
|  | 	-webkit-transition: background-position 0.1s linear; | ||||||
|  | 	   -moz-transition: background-position 0.1s linear; | ||||||
|  | 	     -o-transition: background-position 0.1s linear; | ||||||
|  | 	        transition: background-position 0.1s linear; | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| .fc-state-down, | .fc-state-down, | ||||||
| .fc-state-down .fc-button-inner { | .fc-state-active { | ||||||
| 	border-color: #555; | 	background-color: #cccccc; | ||||||
| 	background: #777; | 	background-image: none; | ||||||
| 	} | 	outline: 0; | ||||||
| 	 | 	box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); | ||||||
| .fc-state-active, |  | ||||||
| .fc-state-active .fc-button-inner { |  | ||||||
| 	border-color: #555; |  | ||||||
| 	background: #777; |  | ||||||
| 	color: #fff; |  | ||||||
| 	} |  | ||||||
| 	 |  | ||||||
| .fc-state-disabled, |  | ||||||
| .fc-state-disabled .fc-button-inner { |  | ||||||
| 	color: #999; |  | ||||||
| 	border-color: #ddd; |  | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| .fc-state-disabled { | .fc-state-disabled { | ||||||
| 	cursor: default; | 	cursor: default; | ||||||
| 	} | 	background-image: none; | ||||||
| 	 | 	opacity: 0.65; | ||||||
| .fc-state-disabled .fc-button-effect { | 	filter: alpha(opacity=65); | ||||||
| 	display: none; | 	box-shadow: none; | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	 | 	 | ||||||
|  | @ -259,47 +252,38 @@ html .fc, | ||||||
| ------------------------------------------------------------------------*/ | ------------------------------------------------------------------------*/ | ||||||
| 	  | 	  | ||||||
| .fc-event { | .fc-event { | ||||||
| 	border-style: solid; | 	border: 1px solid #3a87ad; /* default BORDER color */ | ||||||
| 	border-width: 0; | 	background-color: #3a87ad; /* default BACKGROUND color */ | ||||||
|  | 	color: #fff;               /* default TEXT color */ | ||||||
| 	font-size: .85em; | 	font-size: .85em; | ||||||
| 	cursor: default; | 	cursor: default; | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
|  | a.fc-event { | ||||||
|  | 	text-decoration: none; | ||||||
|  | 	} | ||||||
|  | 	 | ||||||
| a.fc-event, | a.fc-event, | ||||||
| .fc-event-draggable { | .fc-event-draggable { | ||||||
| 	cursor: pointer; | 	cursor: pointer; | ||||||
| 	} | 	} | ||||||
| 	 | 	 | ||||||
| a.fc-event { |  | ||||||
| 	text-decoration: none; |  | ||||||
| 	} |  | ||||||
| 	 |  | ||||||
| .fc-rtl .fc-event { | .fc-rtl .fc-event { | ||||||
| 	text-align: right; | 	text-align: right; | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| .fc-event-skin { |  | ||||||
| 	border-color: #36c;     /* default BORDER color */ |  | ||||||
| 	background-color: #36c; /* default BACKGROUND color */ |  | ||||||
| 	color: #fff;            /* default TEXT color */ |  | ||||||
| 	} |  | ||||||
| 	 |  | ||||||
| .fc-event-inner { | .fc-event-inner { | ||||||
| 	position: relative; |  | ||||||
| 	width: 100%; | 	width: 100%; | ||||||
| 	height: 100%; | 	height: 100%; | ||||||
| 	border-style: solid; |  | ||||||
| 	border-width: 0; |  | ||||||
| 	overflow: hidden; | 	overflow: hidden; | ||||||
| 	} | 	} | ||||||
| 	 | 	 | ||||||
| .fc-event-time, | .fc-event-time, | ||||||
| .fc-event-title { | .fc-event-title { | ||||||
| 	padding: 3px 1px; | 	padding: 0 1px; | ||||||
| 	background-color: #eee; | 	} | ||||||
| } |  | ||||||
| 	 | 	 | ||||||
| .fc .ui-resizable-handle { /*** TODO: don't use ui-resizable anymore, change class ***/ | .fc .ui-resizable-handle { | ||||||
| 	display: block; | 	display: block; | ||||||
| 	position: absolute; | 	position: absolute; | ||||||
| 	z-index: 99999; | 	z-index: 99999; | ||||||
|  | @ -318,6 +302,20 @@ a.fc-event { | ||||||
| 	margin-bottom: 1px; | 	margin-bottom: 1px; | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
|  | .fc-ltr .fc-event-hori.fc-event-start, | ||||||
|  | .fc-rtl .fc-event-hori.fc-event-end { | ||||||
|  | 	border-left-width: 1px; | ||||||
|  | 	border-top-left-radius: 3px; | ||||||
|  | 	border-bottom-left-radius: 3px; | ||||||
|  | 	} | ||||||
|  | 
 | ||||||
|  | .fc-ltr .fc-event-hori.fc-event-end, | ||||||
|  | .fc-rtl .fc-event-hori.fc-event-start { | ||||||
|  | 	border-right-width: 1px; | ||||||
|  | 	border-top-right-radius: 3px; | ||||||
|  | 	border-bottom-right-radius: 3px; | ||||||
|  | 	} | ||||||
|  | 	 | ||||||
| /* resizable */ | /* resizable */ | ||||||
| 	 | 	 | ||||||
| .fc-event-hori .ui-resizable-e { | .fc-event-hori .ui-resizable-e { | ||||||
|  | @ -342,66 +340,6 @@ a.fc-event { | ||||||
| 	 | 	 | ||||||
| 	 | 	 | ||||||
| 	 | 	 | ||||||
| /* Fake Rounded Corners (for buttons and events) |  | ||||||
| ------------------------------------------------------------*/ |  | ||||||
| 	 |  | ||||||
| .fc-corner-left { |  | ||||||
| 	margin-left: 1px; |  | ||||||
| 	} |  | ||||||
| 	 |  | ||||||
| .fc-corner-left .fc-button-inner, |  | ||||||
| .fc-corner-left .fc-event-inner { |  | ||||||
| 	margin-left: -1px; |  | ||||||
| 	} |  | ||||||
| 	 |  | ||||||
| .fc-corner-right { |  | ||||||
| 	margin-right: 1px; |  | ||||||
| 	} |  | ||||||
| 	 |  | ||||||
| .fc-corner-right .fc-button-inner, |  | ||||||
| .fc-corner-right .fc-event-inner { |  | ||||||
| 	margin-right: -1px; |  | ||||||
| 	} |  | ||||||
| 	 |  | ||||||
| .fc-corner-top { |  | ||||||
| 	margin-top: 1px; |  | ||||||
| 	} |  | ||||||
| 	 |  | ||||||
| .fc-corner-top .fc-event-inner { |  | ||||||
| 	margin-top: -1px; |  | ||||||
| 	} |  | ||||||
| 	 |  | ||||||
| .fc-corner-bottom { |  | ||||||
| 	margin-bottom: 1px; |  | ||||||
| 	} |  | ||||||
| 	 |  | ||||||
| .fc-corner-bottom .fc-event-inner { |  | ||||||
| 	margin-bottom: -1px; |  | ||||||
| 	} |  | ||||||
| 	 |  | ||||||
| 	 |  | ||||||
| 	 |  | ||||||
| /* Fake Rounded Corners SPECIFICALLY FOR EVENTS |  | ||||||
| -----------------------------------------------------------------*/ |  | ||||||
| 	 |  | ||||||
| .fc-corner-left .fc-event-inner { |  | ||||||
| 	border-left-width: 1px; |  | ||||||
| 	} |  | ||||||
| 	 |  | ||||||
| .fc-corner-right .fc-event-inner { |  | ||||||
| 	border-right-width: 1px; |  | ||||||
| 	} |  | ||||||
| 	 |  | ||||||
| .fc-corner-top .fc-event-inner { |  | ||||||
| 	border-top-width: 1px; |  | ||||||
| 	} |  | ||||||
| 	 |  | ||||||
| .fc-corner-bottom .fc-event-inner { |  | ||||||
| 	border-bottom-width: 1px; |  | ||||||
| 	} |  | ||||||
| 	 |  | ||||||
| 	 |  | ||||||
| 	 |  | ||||||
| /* Reusable Separate-border Table | /* Reusable Separate-border Table | ||||||
| ------------------------------------------------------------*/ | ------------------------------------------------------------*/ | ||||||
| 
 | 
 | ||||||
|  | @ -438,6 +376,15 @@ table.fc-border-separate { | ||||||
| 	text-align: center; | 	text-align: center; | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
|  | .fc .fc-week-number { | ||||||
|  | 	width: 22px; | ||||||
|  | 	text-align: center; | ||||||
|  | 	} | ||||||
|  | 
 | ||||||
|  | .fc .fc-week-number div { | ||||||
|  | 	padding: 0 2px; | ||||||
|  | 	} | ||||||
|  | 	 | ||||||
| .fc-grid .fc-day-number { | .fc-grid .fc-day-number { | ||||||
| 	float: right; | 	float: right; | ||||||
| 	padding: 0 2px; | 	padding: 0 2px; | ||||||
|  | @ -494,6 +441,10 @@ table.fc-border-separate { | ||||||
| 	font-weight: normal; | 	font-weight: normal; | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
|  | .fc-agenda .fc-week-number { | ||||||
|  | 	font-weight: bold; | ||||||
|  | 	} | ||||||
|  | 	 | ||||||
| .fc-agenda .fc-day-content { | .fc-agenda .fc-day-content { | ||||||
| 	padding: 2px 2px 1px; | 	padding: 2px 2px 1px; | ||||||
| 	} | 	} | ||||||
|  | @ -568,12 +519,16 @@ table.fc-border-separate { | ||||||
| 	border-width: 0 1px; | 	border-width: 0 1px; | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| .fc-event-vert .fc-event-head, | .fc-event-vert.fc-event-start { | ||||||
| .fc-event-vert .fc-event-content { | 	border-top-width: 1px; | ||||||
| 	position: relative; | 	border-top-left-radius: 3px; | ||||||
| 	z-index: 2; | 	border-top-right-radius: 3px; | ||||||
| 	width: 100%; | 	} | ||||||
| 	overflow: hidden; | 
 | ||||||
|  | .fc-event-vert.fc-event-end { | ||||||
|  | 	border-bottom-width: 1px; | ||||||
|  | 	border-bottom-left-radius: 3px; | ||||||
|  | 	border-bottom-right-radius: 3px; | ||||||
| 	} | 	} | ||||||
| 	 | 	 | ||||||
| .fc-event-vert .fc-event-time { | .fc-event-vert .fc-event-time { | ||||||
|  | @ -581,6 +536,11 @@ table.fc-border-separate { | ||||||
| 	font-size: 10px; | 	font-size: 10px; | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
|  | .fc-event-vert .fc-event-inner { | ||||||
|  | 	position: relative; | ||||||
|  | 	z-index: 2; | ||||||
|  | 	} | ||||||
|  | 	 | ||||||
| .fc-event-vert .fc-event-bg { /* makes the event lighter w/ a semi-transparent overlay  */ | .fc-event-vert .fc-event-bg { /* makes the event lighter w/ a semi-transparent overlay  */ | ||||||
| 	position: absolute; | 	position: absolute; | ||||||
| 	z-index: 1; | 	z-index: 1; | ||||||
|  | @ -589,8 +549,8 @@ table.fc-border-separate { | ||||||
| 	width: 100%; | 	width: 100%; | ||||||
| 	height: 100%; | 	height: 100%; | ||||||
| 	background: #fff; | 	background: #fff; | ||||||
| 	opacity: .3; | 	opacity: .25; | ||||||
| 	filter: alpha(opacity=30); | 	filter: alpha(opacity=25); | ||||||
| 	} | 	} | ||||||
| 	 | 	 | ||||||
| .fc .ui-draggable-dragging .fc-event-bg, /* TODO: something nicer like .fc-opacity */ | .fc .ui-draggable-dragging .fc-event-bg, /* TODO: something nicer like .fc-opacity */ | ||||||
|  |  | ||||||
|  | @ -1,9 +1,11 @@ | ||||||
| <script type="text/javascript" src="http://code.jquery.com/ui/1.10.3/jquery-ui.js"></script> | <script type="text/javascript" src="http://code.jquery.com/ui/1.10.3/jquery-ui.js"></script> | ||||||
| <%= stylesheet_link_tag 'fullcalendar'%> |  | ||||||
| <%= stylesheet_link_tag 'calendar'%> |  | ||||||
| <%= javascript_include_tag 'fullcalendar' %> | <%= javascript_include_tag 'fullcalendar' %> | ||||||
| <%= javascript_include_tag 'calendar' %> | <%= javascript_include_tag 'calendar' %> | ||||||
| <%= javascript_include_tag 'bootstrap-datetimepicker' %> | <%= javascript_include_tag 'bootstrap-datetimepicker' %> | ||||||
|  | 
 | ||||||
|  | <%= stylesheet_link_tag "fullcalendar"%> | ||||||
|  | <%= stylesheet_link_tag "calendar"%> | ||||||
|  | 
 | ||||||
| <div id="orbit_calendar" class="month_view"> | <div id="orbit_calendar" class="month_view"> | ||||||
| 	<div class="row-fluid cal-fn"> | 	<div class="row-fluid cal-fn"> | ||||||
| 		<div class="span3" id='sec1'> | 		<div class="span3" id='sec1'> | ||||||
|  | @ -50,6 +52,7 @@ | ||||||
| 	<div class="row-fluid"> | 	<div class="row-fluid"> | ||||||
| 		<div class="span8"> | 		<div class="span8"> | ||||||
| 		</div> | 		</div> | ||||||
|  | <%if is_manager?%> | ||||||
| 		<div class="span4"> | 		<div class="span4"> | ||||||
| 			<%= link_to "Add", new_panel_calendar_new_back_end_event_path, :class => "btn btn-primary pull-right", :id=>"create_event_btn", :ref=>"add-btn" %> | 			<%= link_to "Add", new_panel_calendar_new_back_end_event_path, :class => "btn btn-primary pull-right", :id=>"create_event_btn", :ref=>"add-btn" %> | ||||||
| 		</div> | 		</div> | ||||||
|  | @ -59,3 +62,4 @@ | ||||||
| <script type="text/javascript"> | <script type="text/javascript"> | ||||||
| 	var calendar = new Calendar("#calendar"); | 	var calendar = new Calendar("#calendar"); | ||||||
| </script> | </script> | ||||||
|  | <%end%> | ||||||
|  | @ -0,0 +1,65 @@ | ||||||
|  | <script type="text/javascript" src="http://code.jquery.com/ui/1.10.3/jquery-ui.js"></script> | ||||||
|  | <%= javascript_include_tag 'fullcalendar' %> | ||||||
|  | <%= javascript_include_tag 'calendar' %> | ||||||
|  | <%= javascript_include_tag 'bootstrap-datetimepicker' %> | ||||||
|  | 
 | ||||||
|  | <%= 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> | ||||||
|  | <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> | ||||||
|  | <div class="form-actions form-fixed"> | ||||||
|  | 	<div class="row-fluid"> | ||||||
|  | 		<div class="span8"> | ||||||
|  | 		</div> | ||||||
|  | <%if is_manager?%> | ||||||
|  | 		<div class="span4"> | ||||||
|  | 			<%= link_to "Add", new_panel_calendar_new_back_end_event_path, :class => "btn btn-primary pull-right", :id=>"create_event_btn", :ref=>"add-btn" %> | ||||||
|  | 		</div> | ||||||
|  | 	</div> | ||||||
|  | </div> | ||||||
|  | 
 | ||||||
|  | <script type="text/javascript"> | ||||||
|  | 	var calendar = new Calendar("#calendar"); | ||||||
|  | </script> | ||||||
|  | <%end%> | ||||||
|  | @ -1,5 +1,6 @@ | ||||||
| en: | en: | ||||||
|   calendar: |   calendar: | ||||||
|  |      all: All | ||||||
|      calendar: Calendar |      calendar: Calendar | ||||||
|      calendars: Calendars |      calendars: Calendars | ||||||
|      color: Color |      color: Color | ||||||
|  |  | ||||||
|  | @ -6,6 +6,10 @@ Rails.application.routes.draw do | ||||||
| 	      	match 'events/agenda' => 'events#agenda',  :as => :agenda | 	      	match 'events/agenda' => 'events#agenda',  :as => :agenda | ||||||
| 	      	resources :events | 	      	resources :events | ||||||
| 	      end | 	      end | ||||||
|  |               namespace :front_end do | ||||||
|  |                 match 'events/agenda' => 'events#agenda',  :as => :agenda | ||||||
|  |                 resources :events | ||||||
|  |               end | ||||||
| 	  end | 	  end | ||||||
| 	end | 	end | ||||||
| end | end | ||||||
|  |  | ||||||
|  | @ -10,6 +10,17 @@ module CalendarNew | ||||||
|     intro "I am intro" |     intro "I am intro" | ||||||
|     update_info 'some update_info' |     update_info 'some update_info' | ||||||
| 
 | 
 | ||||||
|  |     authorizable | ||||||
|  |     categorizable | ||||||
|  |     taggable | ||||||
|  |     category_customizable | ||||||
|  | 
 | ||||||
|  |    front_end do | ||||||
|  |       app_page 'events'  do  | ||||||
|  |         frontend_i18n "calendar_new.frontend.events" | ||||||
|  |       end | ||||||
|  |     end | ||||||
|  |      | ||||||
|     side_bar do |     side_bar do | ||||||
|       head_label_i18n  'calendar.calendar',:icon_class=>"icons-calendar" |       head_label_i18n  'calendar.calendar',:icon_class=>"icons-calendar" | ||||||
|       available_for [:admin,:guest,:manager,:sub_manager] |       available_for [:admin,:guest,:manager,:sub_manager] | ||||||
|  | @ -18,17 +29,28 @@ module CalendarNew | ||||||
| 
 | 
 | ||||||
|       head_link_path "panel_calendar_new_back_end_events_path" |       head_link_path "panel_calendar_new_back_end_events_path" | ||||||
| 
 | 
 | ||||||
|       context_link 'calendar.new_category', |       context_link 'calendar.categories', | ||||||
|                             :link_path=>"new_panel_calendar_new_back_end_event_category_path" , |                             :link_path=>"admin_module_app_categories_path(get_module_app)" , | ||||||
|                             :priority=>3, |                             :priority=>3, | ||||||
|                             :active_for_action=>{:event_categories=>:new}, |                             :active_for_category => 'CalendarNew', | ||||||
|                             :available_for => [:manager] |                             :available_for => [:manager] | ||||||
| 
 | 
 | ||||||
|       context_link 'calendar.categories', |       context_link 'calendar.categories', | ||||||
|                             :link_path=>"panel_calendar_new_back_end_event_categories_path" , |                             :link_path=>"admin_module_app_categories_path(get_module_app)" , | ||||||
|                             :priority=>2, |                             :priority=>3, | ||||||
|                             :active_for_action=>{:event_categories=>:index}, |                             :active_for_category => 'CalendarNew', | ||||||
|                             :available_for => [:manager] |                             :available_for => [:manager] | ||||||
|  |       context_link 'tags', | ||||||
|  |                             :link_path=>"admin_module_tags_path(module_app_id: get_module_app)" , | ||||||
|  |                             :priority=>4, | ||||||
|  |                             :active_for_tag => 'CalendarNew', | ||||||
|  |                             :available_for => [:manager] | ||||||
|  | 
 | ||||||
|  |       context_link 'module_authorization', | ||||||
|  |                             :link_path=>"admin_authorizations_path(get_module_app.key)", | ||||||
|  |                             :priority=>6, | ||||||
|  |                             :available_for => [:manager] | ||||||
|  | 
 | ||||||
|     end |     end | ||||||
|   end |   end | ||||||
| end | end | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue