From 8b1cb0ed3f026ed518d1441cf64c30003c72f0ae Mon Sep 17 00:00:00 2001
From: "olivaq@gmail.com" <>
Date: Tue, 1 Feb 2011 16:23:26 +0100
Subject: [PATCH] updated timing function

---
 app/controllers/slides_controller.php | 23 +++----------------
 app/views/slides/add.ctp              | 23 ++++---------------
 app/views/slides/edit.ctp             | 33 ++++++++++++---------------
 app/views/slides/index.ctp            |  4 +---
 4 files changed, 23 insertions(+), 60 deletions(-)

diff --git a/app/controllers/slides_controller.php b/app/controllers/slides_controller.php
index 9a2ddf5..8702d60 100644
--- a/app/controllers/slides_controller.php
+++ b/app/controllers/slides_controller.php
@@ -140,29 +140,12 @@ class SlidesController extends AppController {
 					}
 				}
 			}
+			
 			if($this->Slide->save($this->data))
 			{
 				$this->Session->setFlash('Slide opprettet');
-				$this->Session->write("NewSlide", $this->Slide->id);
 				
-				if($this->data['Slide']['simple'])
-				{
-					$this->data['DisplayTime'][0]['slide_id'] = $this->Slide->id;
-					
-					if($this->data['DisplayTime'][0]['start'])
-						$this->data['DisplayTime'][0]['start'] = strtotime($this->data['DisplayTime'][0]['start']);
-					else
-						$this->data['DisplayTime'][0]['start'] = 0;
-						
-					if($this->data['DisplayTime'][0]['stop'])
-						$this->data['DisplayTime'][0]['stop'] = strtotime($this->data['DisplayTime'][0]['stop']);
-					else
-						$this->data['DisplayTime'][0]['stop'] = 999999999999999999;
-					
-					$this->Slide->DisplayTime->save($this->data['DisplayTime'][0]);
-					
-					$this->redirect('index');
-				}
+				$this->Session->write("NewSlide", $this->Slide->id);
 				
 				$this->redirect('timing/' . $this->Slide->id);
 			}
@@ -218,4 +201,4 @@ class SlidesController extends AppController {
 		}
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/app/views/slides/add.ctp b/app/views/slides/add.ctp
index a7a8c74..1471153 100644
--- a/app/views/slides/add.ctp
+++ b/app/views/slides/add.ctp
@@ -16,32 +16,19 @@ echo $form->file('Upload.file');
 <legend>Start/stop</legend>
 <?php
 
-echo '<p>La feltet stå tomt for å ikke ha noe spesielt start/stopp tidspunkt</p>';
+echo '<p>Skal sliden bare være synlig i et bestemt tidsintervall?</p>';
 
-
-echo '<div id="simplebox">';
-echo $form->label('simple','Use simple timing:');
-echo $form->checkbox('simple');
-echo '</div>';
-
-echo $form->hidden('DisplayTime.0.slide_id');
-echo $form->input('DisplayTime.0.start', array('class'=>'date'));
-echo $form->input('DisplayTime.0.stop', array('class'=>'date'));
+echo $form->input('start', array('class'=>'date'));
+echo $form->input('stop', array('class'=>'date'));
 
 ?>
 </fieldset>
 <script type="text/javascript">
 	$(function(){
-		$(".date").datepicker({dateFormat:"yy-mm-dd 00:00:00",
-					onSelect:function(){
-						if(!$("#SlideSimple").attr('checked')){
-							$("#SlideSimple").attr('checked', true);
-							//$("#simplebox").effect('bounce',250);
-						}
-					}});
+		$(".date").datepicker({dateFormat:"yy-mm-dd 00:00:00"});
 	});
 </script>
 <?php 
 echo $form->end('Create');
 
-?>
\ No newline at end of file
+?>
diff --git a/app/views/slides/edit.ctp b/app/views/slides/edit.ctp
index 4dcc11b..5b25402 100644
--- a/app/views/slides/edit.ctp
+++ b/app/views/slides/edit.ctp
@@ -18,31 +18,26 @@ echo $form->input('url');
 <fieldset>
 <legend>Start/stop</legend>
 <?php
+echo '<p>Skal sliden bare være synlig i et bestemt tidsintervall?</p>';
 
-echo '<p>La feltet stå tomt for å ikke ha noe spesielt start/stopp tidspunkt</p>';
-
-
-echo '<div id="simplebox">';
-echo $form->label('simple','Use simple timing:');
-echo $form->checkbox('simple');
-echo '</div>';
-
-echo $form->hidden('DisplayTime.0.id');
-echo $form->hidden('DisplayTime.0.slide_id');
-echo $form->input('DisplayTime.0.start', array('class'=>'date'));
-echo $form->input('DisplayTime.0.stop', array('class'=>'date'));
+echo $form->input('start', array('class'=>'date'));
+echo $form->input('stop', array('class'=>'date'));
 
 ?>
 </fieldset>
 <script type="text/javascript">
 	$(function(){
-		$(".date").datepicker({dateFormat:"yy-mm-dd 00:00:00",
-					onSelect:function(){
-						if(!$("#SlideSimple").attr('checked')){
-							$("#SlideSimple").attr('checked', true);
-							//$("#simplebox").effect('bounce',250);
-						}
-					}});
+		$(".date").datepicker({dateFormat:"yy-mm-dd 00:00:00"});
+	});
+</script>
+<?php 
+echo $form->end('Create');
+
+?>
+</fieldset>
+<script type="text/javascript">
+	$(function(){
+		$(".date").datepicker({dateFormat:"yy-mm-dd 00:00:00"});
 	});
 </script>
 <?php 
diff --git a/app/views/slides/index.ctp b/app/views/slides/index.ctp
index df352c9..b0c2a4a 100644
--- a/app/views/slides/index.ctp
+++ b/app/views/slides/index.ctp
@@ -41,9 +41,7 @@
 		<h3><?php echo $slide['Slide']['title']; ?></h3>
 		<p>
 			<?php echo $html->link('Edit', '/slides/edit/' . $slide['Slide']['id']) ?>
-<?php if(!$slide['Slide']['simple']):?>
 			<?php echo $html->link('Set timing', '/slides/timing/' . $slide['Slide']['id']) ?>
-<?php endif; ?>
 			<?php echo $html->link('Enable', '/slides/enable/' . $slide['Slide']['id']) ?>
 		</p>
 		<img src="<?php echo $slide['Slide']['thumbnail']?$slide['Slide']['thumbnail']:Router::url('/img/nothumb.png')?>" />"
@@ -59,4 +57,4 @@ $(function(){
 	$("#Slide<?php echo $newslide ?>").effect("bounce",250);
 });
 <?php endif; ?>
-</script>
\ No newline at end of file
+</script>