From b08df0468873fa5e6f69a0737d3557bd1de0daa1 Mon Sep 17 00:00:00 2001 From: plegall Date: Sun, 21 Aug 2005 21:23:17 +0000 Subject: [PATCH] - modification : adaptation of template variables and blocks in comments page to display comment by comment instead of picture by picture. - [template cclear] comments.tpl copied and adapted from template default. Return to home new icon. As asked by chrisaga, special id #commentsPage in comments.tpl to set the #content margin-left to 0 (since no #menubar to display). - [template cclear] FORM.filter rules taken from template default (these rules have been written some time ago by yoDan. - [template cclear] bug fixed on #theImage : display:block must be used only on IMG and not on the P>A (yes, in BSF you can have HTML in picture and categories descriptions) git-svn-id: http://piwigo.org/svn/trunk@848 68402e56-0260-453c-a942-63ccdbb3a9ee --- comments.php | 10 ++- doc/ChangeLog | 6 ++ template/cclear/admin/comments.tpl | 2 +- template/cclear/comments.tpl | 131 ++++++++++++++++++++--------- template/cclear/content.css | 44 +++++++++- template/cclear/default-layout.css | 33 ++++++++ template/cclear/image.css | 2 +- template/cclear/theme/home.png | Bin 0 -> 1590 bytes 8 files changed, 180 insertions(+), 48 deletions(-) create mode 100644 template/cclear/theme/home.png diff --git a/comments.php b/comments.php index 115bf8572..6b949eb31 100644 --- a/comments.php +++ b/comments.php @@ -425,11 +425,13 @@ SELECT id, uppercats } $template->assign_block_vars( - 'picture.comment', + 'comment', array( - 'COMMENT_AUTHOR' => $author, - 'COMMENT_DATE'=>format_date($comment['date'],'mysql_datetime',true), - 'COMMENT'=>parse_comment_content($comment['content']), + 'U_PICTURE' => add_session_id($url), + 'TN_SRC' => $thumbnail_src, + 'AUTHOR' => $author, + 'DATE'=>format_date($comment['date'],'mysql_datetime',true), + 'CONTENT'=>parse_comment_content($comment['content']), )); } } diff --git a/doc/ChangeLog b/doc/ChangeLog index cb664a37e..a2fba5ef3 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,9 @@ +2005-08-21 Pierrick LE GALL + + * modification : adaptation of template variables and blocks in + comments page to display comment by comment instead of picture by + picture. + 2005-08-20 Pierrick LE GALL * improvement : dedicated page for user comments validation/reject diff --git a/template/cclear/admin/comments.tpl b/template/cclear/admin/comments.tpl index 93e5c4ed9..d903c332a 100644 --- a/template/cclear/admin/comments.tpl +++ b/template/cclear/admin/comments.tpl @@ -1,6 +1,6 @@

{lang:User comments validation}

-
+ diff --git a/template/cclear/comments.tpl b/template/cclear/comments.tpl index 085c0860a..2ea1dc1bb 100644 --- a/template/cclear/comments.tpl +++ b/template/cclear/comments.tpl @@ -1,47 +1,96 @@ - -

{L_COMMENT_TITLE}

- - -
- [ - - {last_day_option.OPTION}{T_SEPARATION} - - {L_COMMENT_STATS} - ] - - [ {L_COMMENT_RETURN} ] - -
- - - +
- -
{picture.TITLE_IMG}
+
-
- {picture.THUMB_ALT_IMG} -
+
+
    +
  • {lang:home}
    • +
+

{lang:User comments}

+
- -
- -

- -

- - {picture.comment.COMMENT_AUTHOR} - {picture.comment.COMMENT_DATE} -
+ -
{picture.comment.COMMENT}
- - +
+ {lang:Filter} + + + + + + + + + +
+ +
+ + {lang:Display} + + + + + + + +
+ + - -
- - -
- + +
{NAVBAR}
+ +
+ + +
+ +

{comment.AUTHOR} - {comment.DATE}

+
{comment.CONTENT}
+
+
+ + + +
+ +
+ +
diff --git a/template/cclear/content.css b/template/cclear/content.css index 355358ba3..0ed06dd4c 100644 --- a/template/cclear/content.css +++ b/template/cclear/content.css @@ -5,6 +5,10 @@ margin-bottom: 1em; /* when it's longer than menu bar */ } +#commentsPage #content { + margin: 1em; +} + #content H2 { margin-bottom: 1ex; } @@ -96,7 +100,7 @@ doesn't work :-((*/ /* actions */ ul.categoryActions { text-align: center; - margin: 0; + margin: 1px 1px 0 0; padding: 0; text-indent: 0; } @@ -113,3 +117,41 @@ ul.categoryActions { border: none; } +/* User comments */ + +#content DIV.comment { + margin: 5px; + border: 1px solid gray; +} + +#content DIV.comment > A.illustration { + display: block; + float: left; + margin: 5px; +} + +#content DIV.comment > A.illustration IMG { + border: 1px solid gray; +} + +#content DIV.comment P.commentHeader { + text-align: right; + margin: 0.5em 0.5em 0 0; +} + +#content DIV.comment UL.actions { + text-align: center; + margin: 0.2em; + clear: left; +} + +#content DIV.comment > UL.actions > LI { + display: inline; +} + +#content DIV.comment BLOCKQUOTE { + margin: 1em 1em 1em 150px; /* margin-left corresponds to maximum thumbnail width */ + border: 1px solid #d3d3d3; + border-left: 2px solid gray; + padding: 0.5em; +} diff --git a/template/cclear/default-layout.css b/template/cclear/default-layout.css index d8af28a93..e15db32c6 100644 --- a/template/cclear/default-layout.css +++ b/template/cclear/default-layout.css @@ -176,3 +176,36 @@ form#categoryOrdering ul.categoryActions { } form#cat_modify table { width: auto; } + +/** + * Filter forms are displayed label by label with the input (or select...) + * below the label + */ +FORM.filter FIELDSET { + padding: 10px; +} + +FORM.filter FIELDSET LABEL { + display: block; + float: left; + width: auto; + margin-right: 10px; + padding: 0; +} + +FORM.filter>FIELDSET>LABEL>INPUT, FORM.filter>FIELDSET>LABEL>SELECT { + display: block; +} + +FORM.filter FIELDSET P, FORM.filter FIELDSET>INPUT { + clear: left; + display: block; +} + +FORM.filter FIELDSET { + border: 1px solid gray; +} + +FORM.filter FIELDSET + INPUT { + margin-top: 10px; +} diff --git a/template/cclear/image.css b/template/cclear/image.css index 4c587f205..74f9e1a66 100644 --- a/template/cclear/image.css +++ b/template/cclear/image.css @@ -58,7 +58,7 @@ de l'image... clear: left; } -#theImage * { +#theImage>IMG { display: block; margin: 0 auto; } diff --git a/template/cclear/theme/home.png b/template/cclear/theme/home.png new file mode 100644 index 0000000000000000000000000000000000000000..a7714756b0540bc535f98c56a245ec0b6112df5d GIT binary patch literal 1590 zcmV-62Fdw}P)i8HR(gsR>hc-mNd=?Ef5=P zWwbL?i!wOnGRzD!%=W2- z(3yRoGUI|8r-6ygFUtNI|7W-i9D#=-$7!IPIq4d^I$v>)*MR%}(|_%5*Mck1>4X;y zzHElJ)Qjxd8tIOW&RQFh#KYu_+IyE&E?icZco0D_eqrz=P{?p?Ex{`Ir<~)IDjVAx zNT2z7UJmWgMeS`OhL~t1-m8^U&%%l^HW@hnW(X(F2h@l~_>&nA0n@7_vWD%h$Z;+x zefJNz^p$7o;`JMAMGKKxiij>zE-X~%i`?f{to5vb*t!=F&r4Es*PKjceOFAfS_%1b7G11~h%#^}%Np3HD`{ah0 zU7KAzGO9@_p_j^KI0?8Y%hNXuzTeX->8YbNxz^?eOG20A8+%a8b6p3C?s=Z}froM3 z59582`J@rI=@7YwyX5wb_ocg4th-gB;Zap!H}DoP5dq?a;|4v?f4hpI-8o5;X35tz zvy#*^-S9YVgWsdMxdkoH1A(Y(h}sGd(02C&RM&U1@Zn1=6rjHwxpLEV;wH`s%?7VJ z5r)**y{Sv=(a*;&6dZY3WM;9N+dYR_fA2wR^F~O^AURM)LV;Wip)gHI770liCnl*E z`^sl4SyAHvu-Q4`3jhc1iL|95qO`IgSN$OD`WfrD>_z-CA*6s|7OfYLp}fTP>PKkU`w|@;o%rG{OarLLGzIlw0W$@& z%qrc3PtkwiIf4oKoYB`Mt3|fcnb8H%S}#&4nbf!S(a_jTQeMGKF-@?LV47m)D})v> z3t)<>hft=qZx51dL_?sdPFBmf=T2$+;7OzgH+h`fryrxVbhFZsR>3vJ)MMsR3YdCS zJua?d_R>j4Pdq_!c@8BfW_Q|=I1y$6rsmDkfE7zA3m^WP;?fi%_VMo5l4y!$B+fvF#gWVkj~nB zmylncRn5Bd)4<+AkVa9#H3P7Sv6dW)$xY@k}eC?k%tme%7lBU7Y(d4AA+7U$#aZa3b zxX4*Bk!!acC(et$az;b3Om1BZAJydfQlZR5wsBi4nbGJ^YC}GDpMKT3`mU~UPUn8GeyQpwlI&IzgpM6QB9v^^sE zO@j-kYMDK;E`Q{y$DiEPfA>HBhtRKG>%hR4zy9c(JqOPnL*9NaFE2hFxw`5#q940T zPLDj6=janTuFvJ1-|{TIpZSh1&flyV9v<00Jo5W5j*pLTo133+7ZGi5Ynk4$ZD91k z(C1F=8@m5om44*^{M*BB=GsMban64Df@kbsh70000PbVXQnQ*UN; ocVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy07*qoM6N<$g6x#{1^@s6 literal 0 HcmV?d00001