[Chorem-commits] r444 - trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports

20 Oct 2014

Author: jcouteau
Date: 2014-10-20 15:50:11 +0200 (Mon, 20 Oct 2014)
New Revision: 444

Url: http://forge.chorem.org/projects/chorem/repository/revisions/444

Log:
Fix sales funnel forms


Modified:
   trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-cancel.html
   trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-draftToSent.html
   trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-leadToDraft.html
   trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToAccepted.html
   trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToRejected.html

Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-cancel.html
===================================================================

--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-cancel.html	2014-10-20 13:19:50 UTC (rev 443)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-cancel.html	2014-10-20 13:50:11 UTC (rev 444)
@@ -24,13 +24,21 @@
     <h3>Proposition commerciale annulée</h3>
 </div>
 <div class="modal-body">
-    <form class="form-horizontal">
-        <fieldset>
-            <label for="cancelledDate">Date d'annulation</label>
-            <input type="text" ui-date ui-date-format="dd/mm/yy" ng-model="toCancel.cancelledDate" id="cancelledDate" class="datepicker" />
-            <label for="cancelledReason">Raison</label>
-            <input type="text" ng-model="toCancel.cancelledReason" name="cancelledReason" id="cancelledReason" value="" class="text ui-widget-content ui-corner-all" />
-        </fieldset>
+    <form class="form-horizontal" role="form">
+        <div class="form-group">
+            <label for="cancelledDate" class="control-label col-sm-4">Date d'annulation</label>
+            <div class="col-sm-4">
+                <input type="text" ui-date ui-date-format="dd/mm/yy" ng-model="toCancel.cancelledDate"
+                       id="cancelledDate" class="datepicker form-control" />
+            </div>
+        </div>
+        <div class="form-group">
+            <label for="cancelledReason" class="control-label col-sm-4">Raison</label>
+            <div class="col-sm-4">
+                <input type="text" ng-model="toCancel.cancelledReason" name="cancelledReason"
+                       id="cancelledReason" value="" class="text form-control" />
+            </div>
+        </div>
     </form>
 </div>
 <div class="modal-footer">

Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-draftToSent.html
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-draftToSent.html	2014-10-20 13:19:50 UTC (rev 443)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-draftToSent.html	2014-10-20 13:50:11 UTC (rev 444)
@@ -26,8 +26,13 @@
 <div class="modal-body">
   <form class="form-horizontal">
     <fieldset>
-      <label for="sendDate">Date d'envoi</label>
-      <input type="text" ui-date ui-date-format="dd/mm/yy" ng-model="draft.sendingDate" id="sendDate" class="datepicker" />
+        <div class="form-group">
+            <label for="sendDate" class="control-label col-sm-4">Date d'envoi</label>
+            <div class="col-sm-4">
+                <input type="text" ui-date ui-date-format="dd/mm/yy" ng-model="draft.sendingDate"
+                       id="sendDate" class="datepicker form-control" />
+            </div>
+        </div>
     </fieldset>
   </form>
 </div>

Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-leadToDraft.html
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-leadToDraft.html	2014-10-20 13:19:50 UTC (rev 443)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-leadToDraft.html	2014-10-20 13:50:11 UTC (rev 444)
@@ -26,10 +26,20 @@
 <div class="modal-body">
   <form class="form-horizontal">
     <fieldset>
-      <label for="sendingDate">Date d'envoi</label>
-      <input type="text" ui-date ui-date-format="dd/mm/yy" ng-model="lead.sendingDate" id="sendingDate" class="datepicker" />
-      <label for="reference">Référence</label>
-      <input type="text" ng-model="lead.reference" id="reference" class="text ui-widget-content ui-corner-all" />
+        <div class="form-group">
+            <label for="sendingDate" class="control-label col-sm-4">Date d'envoi</label>
+            <div class="col-sm-4">
+                <input type="text" ui-date ui-date-format="dd/mm/yy" ng-model="lead.sendingDate"
+                       id="sendingDate" class="datepicker form-control" />
+            </div>
+        </div>
+        <div class="form-group">
+            <label for="reference" class="control-label col-sm-4">Référence</label>
+            <div class="col-sm-4">
+                <input type="text" ng-model="lead.reference" id="reference"
+                       class="text ui-widget-content ui-corner-all form-control" />
+            </div>
+        </div>
     </fieldset>
   </form>
 </div>

Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToAccepted.html
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToAccepted.html	2014-10-20 13:19:50 UTC (rev 443)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToAccepted.html	2014-10-20 13:50:11 UTC (rev 444)
@@ -26,8 +26,13 @@
 <div class="modal-body">
     <form class="form-horizontal">
         <fieldset>
-            <label for="acceptedDate">Date d'acceptation</label>
-            <input type="text" ui-date ui-date-format="dd/mm/yy" ng-model="sent.acceptedDate" id="acceptedDate" class="datepicker" />
+            <div class="form-group">
+                <label for="acceptedDate" class="control-label col-sm-4">Date d'acceptation</label>
+                <div class="col-sm-4">
+                    <input type="text" ui-date ui-date-format="dd/mm/yy" ng-model="sent.acceptedDate"
+                           id="acceptedDate" class="datepicker form-control" />
+                </div>
+            </div>
         </fieldset>
     </form>
 </div>

Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToRejected.html
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToRejected.html	2014-10-20 13:19:50 UTC (rev 443)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToRejected.html	2014-10-20 13:50:11 UTC (rev 444)
@@ -26,8 +26,13 @@
 <div class="modal-body">
     <form class="form-horizontal">
         <fieldset>
-            <label for="rejectedDate">Date de rejet</label>
-            <input type="text" ui-date ui-date-format="dd/mm/yy" ng-model="sent.rejectedDate" id="rejectedDate" class="datepicker" />
+            <div class="form-group">
+                <label for="rejectedDate" class="control-label col-sm-4">Date de rejet</label>
+                <div class="col-sm-4">
+                    <input type="text" ui-date ui-date-format="dd/mm/yy" ng-model="sent.rejectedDate"
+                           id="rejectedDate" class="datepicker form-control" />
+                </div>
+            </div>
         </fieldset>
     </form>
 </div>

    

[Chorem-commits] r444 - trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports

jcouteau＠users.chorem.org