From ac4bfc6c23cebf39c8833b7ad7748294719ea5aa Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 17 Jun 2013 07:12:37 +0200
Subject: [PATCH] fix layout of date selection field

---
 views/bootstrap/class.AddDocument.php    | 2 +-
 views/bootstrap/class.AddEvent.php       | 4 ++--
 views/bootstrap/class.EditDocument.php   | 4 ++--
 views/bootstrap/class.EditEvent.php      | 4 ++--
 views/bootstrap/class.SetExpires.php     | 4 ++--
 views/bootstrap/class.UpdateDocument.php | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index 23834ee64..7bb6aa4a3 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -157,7 +157,7 @@ function addFiles()
 		<tr>
 			<td><?php printMLText("expires");?>:</td>
 			<td>
-        <span class="input-append date" id="expirationdate" data-date="<?php echo date('d-m-Y'); ?>" data-date-format="dd-mm-yyyy" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
+        <span class="input-append date span12" id="expirationdate" data-date="<?php echo date('d-m-Y'); ?>" data-date-format="dd-mm-yyyy" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
           <input class="span3" size="16" name="expdate" type="text" value="<?php echo date('d-m-Y'); ?>">
           <span class="add-on"><i class="icon-calendar"></i></span>
         </span>&nbsp;
diff --git a/views/bootstrap/class.AddEvent.php b/views/bootstrap/class.AddEvent.php
index c129e5cdc..a9e3005fd 100644
--- a/views/bootstrap/class.AddEvent.php
+++ b/views/bootstrap/class.AddEvent.php
@@ -76,7 +76,7 @@ function checkForm()
 		<tr>
 			<td><?php printMLText("from");?>:</td>
 			<td><?php //$this->printDateChooser(-1, "from");?>
-    		<span class="input-append date" id="fromdate" data-date="<?php echo $expdate; ?>" data-date-format="dd-mm-yyyy">
+    		<span class="input-append date span12" id="fromdate" data-date="<?php echo $expdate; ?>" data-date-format="dd-mm-yyyy">
       		<input class="span6" size="16" name="from" type="text" value="<?php echo $expdate; ?>">
       		<span class="add-on"><i class="icon-calendar"></i></span>
     		</span>
@@ -85,7 +85,7 @@ function checkForm()
 		<tr>
 			<td><?php printMLText("to");?>:</td>
 			<td><?php //$this->printDateChooser(-1, "to");?>
-    		<span class="input-append date" id="todate" data-date="<?php echo $expdate; ?>" data-date-format="dd-mm-yyyy">
+    		<span class="input-append date span12" id="todate" data-date="<?php echo $expdate; ?>" data-date-format="dd-mm-yyyy">
       		<input class="span6" size="16" name="to" type="text" value="<?php echo $expdate; ?>">
       		<span class="add-on"><i class="icon-calendar"></i></span>
     		</span>
diff --git a/views/bootstrap/class.EditDocument.php b/views/bootstrap/class.EditDocument.php
index 81c727c10..2391bcfd3 100644
--- a/views/bootstrap/class.EditDocument.php
+++ b/views/bootstrap/class.EditDocument.php
@@ -122,10 +122,10 @@ function checkForm()
 		<tr>
 			<td><?php printMLText("expires");?>:</td>
 			<td>
-        <span class="input-append date" id="expirationdate" data-date="<?php echo date('d-m-Y'); ?>" data-date-format="dd-mm-yyyy" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
+        <span class="input-append date span12" id="expirationdate" data-date="<?php echo date('d-m-Y'); ?>" data-date-format="dd-mm-yyyy" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
           <input class="span3" size="16" name="expdate" type="text" value="<?php echo $expdate; ?>">
           <span class="add-on"><i class="icon-calendar"></i></span>
-        </span>&nbsp;
+        </span><br />
         <label class="checkbox inline">
 				  <input type="checkbox" name="expires" value="false"<?php if (!$document->expires()) print " checked";?>><?php printMLText("does_not_expire");?><br>
         </label>
diff --git a/views/bootstrap/class.EditEvent.php b/views/bootstrap/class.EditEvent.php
index c3a66794b..ec1bc6e6d 100644
--- a/views/bootstrap/class.EditEvent.php
+++ b/views/bootstrap/class.EditEvent.php
@@ -82,7 +82,7 @@ function checkForm()
 		<tr>
 			<td><?php printMLText("from");?>:</td>
 			<td><?php //$this->printDateChooser($event["start"], "from");?>
-    		<span class="input-append date" id="fromdate" data-date="<?php echo date('d-m-Y', $event["start"]); ?>" data-date-format="dd-mm-yyyy">
+    		<span class="input-append date span12" id="fromdate" data-date="<?php echo date('d-m-Y', $event["start"]); ?>" data-date-format="dd-mm-yyyy">
       		<input class="span6" size="16" name="from" type="text" value="<?php echo date('d-m-Y', $event["start"]); ?>">
       		<span class="add-on"><i class="icon-calendar"></i></span>
     		</span>
@@ -91,7 +91,7 @@ function checkForm()
 		<tr>
 			<td><?php printMLText("to");?>:</td>
 			<td><?php //$this->printDateChooser($event["stop"], "to");?>
-    		<span class="input-append date" id="todate" data-date="<?php echo date('d-m-Y', $event["stop"]); ?>" data-date-format="dd-mm-yyyy">
+    		<span class="input-append date span12" id="todate" data-date="<?php echo date('d-m-Y', $event["stop"]); ?>" data-date-format="dd-mm-yyyy">
       		<input class="span6" size="16" name="to" type="text" value="<?php echo date('d-m-Y', $event["stop"]); ?>">
       		<span class="add-on"><i class="icon-calendar"></i></span>
     		</span>
diff --git a/views/bootstrap/class.SetExpires.php b/views/bootstrap/class.SetExpires.php
index 4d98bed6b..594e4837d 100644
--- a/views/bootstrap/class.SetExpires.php
+++ b/views/bootstrap/class.SetExpires.php
@@ -57,10 +57,10 @@ class SeedDMS_View_SetExpires extends SeedDMS_Bootstrap_Style {
 <tr>
 	<td><?php printMLText("expires");?>:</td>
 	<td>
-    <span class="input-append date" id="expirationdate" data-date="<?php echo $expdate; ?>" data-date-format="dd-mm-yyyy" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
+    <span class="input-append date span12" id="expirationdate" data-date="<?php echo $expdate; ?>" data-date-format="dd-mm-yyyy" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
       <input class="span4" size="16" name="expdate" type="text" value="<?php echo $expdate; ?>">
       <span class="add-on"><i class="icon-calendar"></i></span>
-    </span>&nbsp;
+    </span><br />
     <label class="checkbox inline">
 		  <input type="checkbox" name="expires" value="false"<?php if (!$document->expires()) print " checked";?>><?php printMLText("does_not_expire");?><br>
     </label>
diff --git a/views/bootstrap/class.UpdateDocument.php b/views/bootstrap/class.UpdateDocument.php
index 115d4f48c..537e44a07 100644
--- a/views/bootstrap/class.UpdateDocument.php
+++ b/views/bootstrap/class.UpdateDocument.php
@@ -149,10 +149,10 @@ function checkForm()
 		<tr>
 			<td><?php printMLText("expires");?>:</td>
 			<td class="standardText">
-        <span class="input-append date" id="expirationdate" data-date="<?php echo date('d-m-Y'); ?>" data-date-format="dd-mm-yyyy" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
+        <span class="input-append date span12" id="expirationdate" data-date="<?php echo date('d-m-Y'); ?>" data-date-format="dd-mm-yyyy" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
           <input class="span3" size="16" name="expdate" type="text" value="<?php echo date('d-m-Y'); ?>">
           <span class="add-on"><i class="icon-calendar"></i></span>
-        </span>&nbsp;
+        </span><br />
         <label class="checkbox inline">
 				  <input type="checkbox" name="expires" value="false"<?php if (!$document->expires()) print " checked";?>><?php printMLText("does_not_expire");?><br>
         </label>