From 47e5c3ead3be9dcf542061a9eca6e9a48d83f1ad Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 11 Jun 2014 10:57:46 -0400
Subject: [PATCH] update for output of calendar

remove the times from showing
move comments to above the calendars
setup calendars with grid blocks for foundation.
add gitignore file for the netbeans project
---
 .gitignore                                    |  3 ++
 Toolkit/Schedule/Calendar.php                 |  3 +-
 Toolkit/Schedule/application.ini              |  2 +-
 Toolkit/Schedule/templates/departureRow.html  | 16 -------
 .../templates/departuresScheduleCalendar.html | 48 +++++++------------
 Toolkit/Schedule/templates/editSchedule.html  | 12 ++---
 Toolkit/Template/Page/Toolbox.php             | 10 ++--
 static/9.phtml                                |  4 ++
 8 files changed, 36 insertions(+), 62 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 static/9.phtml

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c97ebdb
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/nbproject/private/
+/nbproject/project.xml
+/nbproject/project.properties
\ No newline at end of file
diff --git a/Toolkit/Schedule/Calendar.php b/Toolkit/Schedule/Calendar.php
index 903ad2e..3a036b2 100644
--- a/Toolkit/Schedule/Calendar.php
+++ b/Toolkit/Schedule/Calendar.php
@@ -34,7 +34,7 @@ class Toolkit_Schedule_Calendar
                 $mCal->thisYear()
             )
         );
-        $html = '
+        $html = '<li>
         <table class="calendarWrapper">
           <tr>
             <td valign="top">
@@ -78,6 +78,7 @@ class Toolkit_Schedule_Calendar
           </td>
         </tr>
         </table>
+        </li>
         ';
         return $html;
     }
diff --git a/Toolkit/Schedule/application.ini b/Toolkit/Schedule/application.ini
index 21966c0..a18c7f2 100644
--- a/Toolkit/Schedule/application.ini
+++ b/Toolkit/Schedule/application.ini
@@ -1,7 +1,7 @@
 ; Production server configuration data
 [production]
 ; name of the application
-applicationName = "Boat Schedule"
+applicationName = "Cruise Calendar"
 
 ; flexy options for all the templates used in this application
 ; based on the GLOBALS['flexyOptions']
diff --git a/Toolkit/Schedule/templates/departureRow.html b/Toolkit/Schedule/templates/departureRow.html
index 0c429b8..5ddda04 100644
--- a/Toolkit/Schedule/templates/departureRow.html
+++ b/Toolkit/Schedule/templates/departureRow.html
@@ -2,22 +2,6 @@
     <div class="colorDiv">
         <input id="color{depart[id]}" rel="{depart[id]}" name="color{depart[id]}" value="{depart[color]:h}" />
     </div>
-    <div class="departC edit-field">
-        times:
-        <label class="timeLabel" flexy:foreach="depart[cTimes],time">
-            <span rel="{time[id]}" class="form-element">{time[departure_time]:h}</span>
-            <span class="ui-icon ui-icon-circle-minus removeTime" rel="{time[id]}"></span>
-        </label>
-        <span rel="{depart[id]}" class="ui-icon ui-icon-circle-plus addTime chxTime"></span>
-    </div>
-    <div class="departB edit-field">
-        times:
-        <label class="timeLabel" flexy:foreach="depart[bTimes],time">
-            <span rel="{time[id]}" class="form-element">{time[departure_time]:h}</span>
-            <span class="ui-icon ui-icon-circle-minus removeTime" rel="{time[id]}"></span>
-        </label>
-        <span rel="{depart[id]}" class="ui-icon ui-icon-circle-plus addTime bviTime"></span>
-    </div>
     <div class="departD">
         Calendar Dates
         <img id="departureCal{depart[id]}" rel="{depart[id]}" src="{appBase:h}assets/icons/calendar.png" />
diff --git a/Toolkit/Schedule/templates/departuresScheduleCalendar.html b/Toolkit/Schedule/templates/departuresScheduleCalendar.html
index 3152893..d0e9e8d 100644
--- a/Toolkit/Schedule/templates/departuresScheduleCalendar.html
+++ b/Toolkit/Schedule/templates/departuresScheduleCalendar.html
@@ -12,6 +12,7 @@ table.cals {
 	border-radius: 10px;
 	margin-right: 5px;
 	padding: 2px;
+    width: 100%;
 	}
 .cals td {
 	text-align: center;
@@ -63,38 +64,25 @@ table.cals {
 		<p id="departComment" flexy:if="departByDate[comments]">
 			Note: {departByDate[comments]:h}
 		</p>
-		{departByDate[date]:h} Departures from {departByDate[dock]:h}: 
+		{departByDate[date]:h} Departures from {departByDate[dock]:h}:
 		<ul>
 			<li flexy:foreach="departByDate[times],time">{time[departure_time]:h}</li>
-		</ul>	
+		</ul>
 	</p>
 </div>
 <h2>{scheduleName:h}</h2>
-<div id="calendars">
-{calendarsHtml:h}
-</div>
-<h2>Departures</h2>
-<table id="departures">
-  <tr>
-    <th class="Chx">Departing Charlevoix</th>
-    <th class="comments">Comments</th>
-    <th class="Bvi">Departing Beaver Island</th>
-  </tr>
-  <tr flexy:foreach="departures,depart">
-    <td class="Chx" style="background-color: {depart[color]:h};">
-      {foreach:depart[cTimes],time}
-      <p>{time[departure_time]:h}</p>
-      {end:}
-    </td>
-    <td class="comments" style="background-color: {depart[color]:h};">
-      <?php
-      echo nl2br($depart['comments']);
-      ?>
-    </td>
-    <td class="Bvi" style="background-color: {depart[color]:h};">
-      {foreach:depart[bTimes],time}
-      <p>{time[departure_time]:h}</p>
-      {end:}
-    </td>
-  </tr>
-</table>
+
+    <table id="departures">
+        <tr flexy:foreach="departures,depart">
+          <td class="comments" style="background-color: {depart[color]:h};">
+            <?php
+            echo nl2br($depart['comments']);
+            ?>
+          </td>
+        </tr>
+    </table>
+    <ul class="medium-block-grid-1">
+       {calendarsHtml:h}
+    </ul>
+
+
diff --git a/Toolkit/Schedule/templates/editSchedule.html b/Toolkit/Schedule/templates/editSchedule.html
index 64a5849..d7e1bf8 100644
--- a/Toolkit/Schedule/templates/editSchedule.html
+++ b/Toolkit/Schedule/templates/editSchedule.html
@@ -33,12 +33,12 @@
     <label>
         Year for Schedule
     <select id="schedule_year" name="schedule_year">
-        
+
     </select>
     </label>
 </div>
 <div id="scheduleName" class="edit-field">
-    <input id="scheduleNameText" name="scheduleName" value="{name:h}" > 
+    <input id="scheduleNameText" name="scheduleName" value="{name:h}" >
     <button rel="{scheduleId}" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only nameSave">
       <span class="ui-button-text">Save</span>
     </button>
@@ -50,12 +50,6 @@
     <div class="colorDiv">
         Color
     </div>
-    <div class="departC">
-        Departing Charlevoix
-    </div>
-    <div class="departB">
-        Departing Beaver Island
-    </div>
     <div class="departD">
         Departure Dates
     </div>
@@ -73,7 +67,7 @@
         <input type="hidden" name="dock" id="dock" value="" />
         <input type="hidden" name="departure_id" id="departure_id" value="" />
 		<label for="depart_time">Time</label>
-		<input type="text" name="depart_time" id="depart_time" 
+		<input type="text" name="depart_time" id="depart_time"
                class="text ui-widget-content ui-corner-all noEnterSubmit" />
 	</fieldset>
 	</form>
diff --git a/Toolkit/Template/Page/Toolbox.php b/Toolkit/Template/Page/Toolbox.php
index 1e50f90..b1e386a 100644
--- a/Toolkit/Template/Page/Toolbox.php
+++ b/Toolkit/Template/Page/Toolbox.php
@@ -166,11 +166,11 @@ class Toolkit_Template_Page_Toolbox implements Toolkit_Template_Page_IBody
 		}
 
 		return $breadCrumbs .
-			   $primaryParagraph .
-			   $staticPageContent .
-			   $secondaryParagraphs .
-			   $coupons .
-			   $photoGalleryContent;
+               $primaryParagraph .
+               $secondaryParagraphs .
+               $staticPageContent .
+               $coupons .
+               $photoGalleryContent;
 	}
 
 	//	}}}
diff --git a/static/9.phtml b/static/9.phtml
new file mode 100644
index 0000000..24fc588
--- /dev/null
+++ b/static/9.phtml
@@ -0,0 +1,4 @@
+<?php
+// need to get the config for app loaded
+$schedules = new Toolkit_Schedule_DepartureCalendar();
+echo $schedules->toHtml();
\ No newline at end of file
-- 
2.17.1