From b5c16cafe687b15a607bfb9b993a7168db1868c6 Mon Sep 17 00:00:00 2001
From: Ryan O'Hara <ryan@silverstripe.com>
Date: Thu, 16 Aug 2012 16:18:41 +1200
Subject: [PATCH] ENHANCEMENT: Add styling to Embargo and expiry fields. Change
 date format to dd-mm-yyyy

---
 code/DMSDocument.php           |   4 +--
 css/DMSDocumentCMSFields.css   |  10 ++++++++
 images/calendar-month.png      | Bin 0 -> 624 bytes
 images/clock-frame.png         | Bin 0 -> 853 bytes
 scss/DMSDocumentCMSFields.scss |  43 +++++++++++++++++++++++++++++++++
 5 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100755 images/calendar-month.png
 create mode 100755 images/clock-frame.png

diff --git a/code/DMSDocument.php b/code/DMSDocument.php
index 91eeddb..0655834 100644
--- a/code/DMSDocument.php
+++ b/code/DMSDocument.php
@@ -533,13 +533,13 @@ class DMSDocument extends DataObject implements DMSDocumentInterface {
 		elseif (!empty($this->EmbargoedUntilDate)) $embargoValue = 'Date';
 		$embargo = new OptionsetField('Embargo','Embargo',array('None'=>'None','Published'=>'Hide document until page is published','Indefinitely'=>'Hide document indefinitely','Date'=>'Hide until set date'),$embargoValue);
 		$embargoDatetime = DatetimeField::create('EmbargoedUntilDate','');
-		$embargoDatetime->getDateField()->setConfig('showcalendar', true)->setConfig('dateformat', 'yyyy-MM-dd')->setConfig('datavalueformat', 'yyyy-MM-dd');
+		$embargoDatetime->getDateField()->setConfig('showcalendar', true)->setConfig('dateformat', 'dd-MM-yyyy')->setConfig('datavalueformat', 'dd-MM-yyyy');
 
 		$expiryValue = 'None';
 		if (!empty($this->ExpireAtDate)) $expiryValue = 'Date';
 		$expiry = new OptionsetField('Expiry','Expiry',array('None'=>'None','Date'=>'Set document to expire on'),$expiryValue);
 		$expiryDatetime = DatetimeField::create('ExpireAtDate','');
-		$expiryDatetime->getDateField()->setConfig('showcalendar', true)->setConfig('dateformat', 'yyyy-MM-dd')->setConfig('datavalueformat', 'yyyy-MM-dd');
+		$expiryDatetime->getDateField()->setConfig('showcalendar', true)->setConfig('dateformat', 'dd-MM-yyyy')->setConfig('datavalueformat', 'dd-MM-yyyy');
 
 		// This adds all the actions details into a group.
 		// Embargo, History, etc to go in here
diff --git a/css/DMSDocumentCMSFields.css b/css/DMSDocumentCMSFields.css
index 5c6a5ca..19a8840 100644
--- a/css/DMSDocumentCMSFields.css
+++ b/css/DMSDocumentCMSFields.css
@@ -31,6 +31,14 @@ form.small #ActionsPanel .middleColumn { margin-left: 120px; }
 #ActionsPanel .fieldgroup-field { float: none; width: auto; }
 #ActionsPanel .fieldgroup-field .fieldholder-small label { float: none; width: auto; margin: 0; padding: 0; }
 #ActionsPanel .fieldgroup-field .fieldholder-small label.ss-ui-button { float: left; margin: 0 10px 0 0; }
+#ActionsPanel .fieldgroup-field .embargo li, #ActionsPanel .fieldgroup-field .expiry li { float: none; width: 100%; margin-left: 8px; }
+#ActionsPanel .fieldgroup-field .embargo li label, #ActionsPanel .fieldgroup-field .expiry li label { padding-left: 10px; }
+#ActionsPanel .fieldgroup-field .embargo .embargoDatetime, #ActionsPanel .fieldgroup-field .embargo .expiryDatetime, #ActionsPanel .fieldgroup-field .expiry .embargoDatetime, #ActionsPanel .fieldgroup-field .expiry .expiryDatetime { margin-top: 0; margin-left: 34px; }
+#ActionsPanel .fieldgroup-field .embargo .embargoDatetime .field.date, #ActionsPanel .fieldgroup-field .embargo .embargoDatetime .field.time, #ActionsPanel .fieldgroup-field .embargo .expiryDatetime .field.date, #ActionsPanel .fieldgroup-field .embargo .expiryDatetime .field.time, #ActionsPanel .fieldgroup-field .expiry .embargoDatetime .field.date, #ActionsPanel .fieldgroup-field .expiry .embargoDatetime .field.time, #ActionsPanel .fieldgroup-field .expiry .expiryDatetime .field.date, #ActionsPanel .fieldgroup-field .expiry .expiryDatetime .field.time { display: inline-block; width: auto; }
+#ActionsPanel .fieldgroup-field .embargo .embargoDatetime .field.date .middleColumn, #ActionsPanel .fieldgroup-field .embargo .expiryDatetime .field.date .middleColumn, #ActionsPanel .fieldgroup-field .expiry .embargoDatetime .field.date .middleColumn, #ActionsPanel .fieldgroup-field .expiry .expiryDatetime .field.date .middleColumn { background: url("../images/calendar-month.png") 90px 7px no-repeat; }
+#ActionsPanel .fieldgroup-field .embargo .embargoDatetime .field.time .middleColumn, #ActionsPanel .fieldgroup-field .embargo .expiryDatetime .field.time .middleColumn, #ActionsPanel .fieldgroup-field .expiry .embargoDatetime .field.time .middleColumn, #ActionsPanel .fieldgroup-field .expiry .expiryDatetime .field.time .middleColumn { background: url("../images/clock-frame.png") 90px 7px no-repeat; }
+#ActionsPanel .fieldgroup-field .embargo .embargoDatetime .middleColumn, #ActionsPanel .fieldgroup-field .embargo .expiryDatetime .middleColumn, #ActionsPanel .fieldgroup-field .expiry .embargoDatetime .middleColumn, #ActionsPanel .fieldgroup-field .expiry .expiryDatetime .middleColumn { margin-left: 0; width: auto; border: none; }
+#ActionsPanel .fieldgroup-field .embargo .embargoDatetime .middleColumn input, #ActionsPanel .fieldgroup-field .embargo .expiryDatetime .middleColumn input, #ActionsPanel .fieldgroup-field .expiry .embargoDatetime .middleColumn input, #ActionsPanel .fieldgroup-field .expiry .expiryDatetime .middleColumn input { width: 80px; margin-right: 40px; }
 #ActionsPanel .ss-uploadfield-files .ss-uploadfield-item-preview { background: url("../images/app_icons/generic_32.png") -10px -6px no-repeat; }
 #ActionsPanel .ss-uploadfield-files .ss-uploadfield-item-name span.name { width: 260px; }
 #ActionsPanel .ss-uploadfield-files .ss-uploadfield-item-actions .ss-uploadfield-item-cancel { width: auto; text-indent: 0; }
@@ -41,3 +49,5 @@ form.small #ActionsPanel .middleColumn { margin-left: 120px; }
 #Form_ItemEditForm fieldset table.ss-gridfield-table tr th.main { min-width: 175px; }
 #Form_ItemEditForm fieldset table.ss-gridfield-table tr th.main.col-action_SetOrderID { width: 60px; min-width: 60px; }
 #Form_ItemEditForm fieldset table.ss-gridfield-table tr td { white-space: normal; }
+
+#ui-datepicker-div { border: 1px solid #DDD; }
diff --git a/images/calendar-month.png b/images/calendar-month.png
new file mode 100755
index 0000000000000000000000000000000000000000..4e37d50c4ecebeab49ca106b7d1745f3f43f7366
GIT binary patch
literal 624
zcmV-$0+0QPP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!5=lfsRCwByQ%!3VQ4~GTd1fXtDGihs
zW7~XMVkA;YK@bYbraN)bA7H^BQ1Az2kzdl4bfF8kg_30<C{hBG(6rVznw2J@l*Er@
zp7*|)#3^=RFWkBJ-Fwe@=e?OhTL^q1e?w08g!~0ZUVrucx*lT~EA#`XP$TzFsYJ=P
z3)Nii!*d}%!)Mp@Yz36%FSoy%s#Km8_x8|gwNPANFWf7Y3VwoOwfeWWu~GO`E(f?S
zf4F_qxxB=;iwiWiwlKTAj8VVu$6x93Ea6N|Fi?tP&>0NybaxjIYc<?9O?+QmL}X`Y
zO7JM3M>-zIotYW%Ea8Gz6pX3Z+1^Gl6vA&R3~6o6%}ojT8pGi*;5gvfi2`I@f2D3{
zjA5))?goZKM|r!y59-k-&NPn4V;%jqmz$d)oWa0bOu&ngdlyKj)5v5pI!~oi+S!uH
zBoc{)&UuzGjF8?DjS(?NqfvCbUA+tEy<Sf%;Ji<7g%xnlv+xv5jvz-~^TE=RF4Rv?
zk*8hR-Zz_A%Vu?cP_IuENI!w$vBEw-*9xpa0EZ_hT0zLNP_u2VKp%nc;~xbc!TnfF
z$7Z{Y9KCn8!{cK-URiO~G#V2ESHY0}1&hA}kG<9DXa!o$*_l?r_VMUws(@#e5GH>^
zvZGWiE=0tT5)1S5_#fk0qKz<?W!xPC-8IX4jT_ic!Z7xa00RJiFg|cI*>|o00000<
KMNUMnLSTY?2^jSN

literal 0
HcmV?d00001

diff --git a/images/clock-frame.png b/images/clock-frame.png
new file mode 100755
index 0000000000000000000000000000000000000000..2e3d03c10cba076f50adac5c96937832846edcc0
GIT binary patch
literal 853
zcmV-b1FHOqP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!_en%SRCwA<Q(H?LQ4s#Jn=3|*i7`eo
zDGH4>ZSx{xsUnG5P*9;FYBBu<zLoxpzWN6W#eiC(Prml07R86s(t3$e(`pml#7H(~
z-I_~hw%!K59nPNfeKTifj&5vh3_6_-f*@#~;3PZ(;3CxEzvT!gl}crcAQ4b5m%(0-
zJ2Mfwyk76~iHV6<t*xz3ip8R~q1WpXkH^0+E-ua|5{b|BYlEQjp4i^r&QY2CVq|1w
zCL9jGxw^V?rBW#*lS!o0X~?n+tJUfXg@OZ=skpnl%j5*1B>H?lPNipbbaW;d48Gpm
zi$T6rVX3Qwq9}MA2tYI%adLW!j3gltcp4Bzu}C5kiwLDs$>s5Qdi(oB;qC1$luc&X
zJsvc>-T1w~ucdFd+wsuvht6U_EEYpwUthSnxw)6QEZ`p>e>rt{cnGyzfvvF-7K&&h
zqN=KQ1){av`v4`KKvz4)@bJ(Sb6KFNrKQEscdd0bXom|#Owf95ZB6qx$kUbTo0^cx
zoWbpO`<bh!k4={I$mMeI*3{lc^w!sF#bbYCMQYs{Wx{6_<r2)*Q>!=&DkQX7s9ckW
z2L=!dg%F;cM0Itw2I>StgM->x<}jB9WKq=9W-b0+6kxDcY0)AJ3z(Un#)nAcHUkz{
zsY7akYa_6L%+deEVtd<my93#j1Tz(oQ>~@SGnxGj98M=rk`in-I}Q#Gx0%ZV-y)Gn
z)ZuWVd{sdqeGY*}nvF>}W~95PekGw$bQV}yiAI?#HZ(Nkv)MBPsLS2mJsoG#ISP3N
z)m2rnm`%`AT~tNIe(VSm?KL*KvAn$WaeaL)N(1;+ynYzRTU$Q_%3SE_3AU4mbecut
zAc^B6335(>(P-8NDiV3WytFhQr72y_X0t_|Rt>;xGMVgD<)F{k(KS2!cBr%SS=+sb
zhRw|{@wvHot2;YCH}d)XCmOO0{k~)YkzgY@2v&o^V59MEqn0}FKWEBPqN>N~p`FwE
ff{-Sh{}W&U0<VIGD|eHA00000NkvXXu0mjf8BB}H

literal 0
HcmV?d00001

diff --git a/scss/DMSDocumentCMSFields.scss b/scss/DMSDocumentCMSFields.scss
index 0760617..797c259 100644
--- a/scss/DMSDocumentCMSFields.scss
+++ b/scss/DMSDocumentCMSFields.scss
@@ -155,6 +155,45 @@ form.small .field .TreeDropdownField,
 				}
 			}
 		}
+		.embargo, .expiry{
+			li{
+				float: none;
+				width: 100%;
+				margin-left: 8px;
+				label{
+					padding-left: 10px;
+				}	
+			}
+			.embargoDatetime, .expiryDatetime{
+				margin-top: 0;
+				margin-left: 34px;
+				.field{
+					&.date, &.time{
+						display: inline-block;
+						width: auto;
+					}
+					&.date{
+						.middleColumn{
+							background: url('../images/calendar-month.png') 90px 7px no-repeat;
+						}
+					}
+					&.time{
+						.middleColumn{
+							background: url('../images/clock-frame.png') 90px 7px no-repeat;
+						}
+					}
+				}
+				.middleColumn{
+					margin-left: 0;
+					width: auto;
+					border: none;
+					input{
+						width: 80px;
+						margin-right: 40px;
+					}
+				}
+			}
+		}
 	}
 	.ss-uploadfield-files{
 		.ss-uploadfield-item-preview{
@@ -205,4 +244,8 @@ form.small .field .TreeDropdownField,
 			}
 		}
 	}
+}
+
+#ui-datepicker-div{
+	border: 1px solid #DDD;
 }
\ No newline at end of file