Committer: mchervonniy
LJSUP-10439: Service page for delayed entriesU trunk/cgi-bin/bml/scheme/global.look U trunk/htdocs/stc/lj_base.css U trunk/templates/Widgets/entry_chooser.tmpl
Modified: trunk/cgi-bin/bml/scheme/global.look =================================================================== --- trunk/cgi-bin/bml/scheme/global.look 2011-11-22 12:59:43 UTC (rev 20604) +++ trunk/cgi-bin/bml/scheme/global.look 2011-11-22 13:10:47 UTC (rev 20605) @@ -3,11 +3,11 @@ loginboxstyle=>{Ss}background: url(/img/userinfo.gif) no-repeat; background-color: #fff; background-position: 0px 1px; padding-left: 18px; color: #00C; font-weight: bold; commloginboxstyle=>{Ss}background: url(/img/community.gif) no-repeat; background-color: #fff; background-position: 0px 2px; padding-left: 19px; color: #00C; font-weight: bold; -TYPESTICKY=>{Ss}<img src="<?imgprefix?>/icon_sticky.png" width=13 height=15 align=absmiddle class="i-posticon"> -TYPEDELAYED=>{Ss}<img src="<?imgprefix?>/icon_delayed.png" width=13 height=15 align=absmiddle class="i-posticon"> -SECURITYPRIVATE=>{Ss}<img src="<?imgprefix?>/icon_private.gif" width=16 height=16 align=absmiddle class="i-posticon"> -SECURITYPROTECTED=>{Ss}<img src="<?imgprefix?>/icon_protected.gif" width=14 height=15 align=absmiddle class="i-posticon"> -SECURITYGROUPS=>{Ss}<img src="<?imgprefix?>/icon_groups.gif" width=19 height=16 align=absmiddle class="i-posticon"> +TYPESTICKY=>{Ss}<img src="<?imgprefix?>/icon_sticky.png" width="13" height="15" class="i-posticon"> +TYPEDELAYED=>{Ss}<img src="<?imgprefix?>/icon_delayed.png" width="13" height="15" class="i-posticon"> +SECURITYPRIVATE=>{Ss}<img src="<?imgprefix?>/icon_private.gif" width="16" height="16" class="i-posticon"> +SECURITYPROTECTED=>{Ss}<img src="<?imgprefix?>/icon_protected.gif" width="14" height="15" class="i-posticon"> +SECURITYGROUPS=>{Ss}<img src="<?imgprefix?>/icon_groups.gif" width="19" height="16" class="i-posticon"> HELP=>{DR}(<a href="%%data%%"><i>help</i></a>) INERR=>{DR}<font color="#ff0000"><b>%%data%%</b></font> SOERROR=>{DR}<div><b>%%data%%</b></div> Modified: trunk/htdocs/stc/lj_base.css =================================================================== --- trunk/htdocs/stc/lj_base.css 2011-11-22 12:59:43 UTC (rev 20604) +++ trunk/htdocs/stc/lj_base.css 2011-11-22 13:10:47 UTC (rev 20605) @@ -3547,9 +3547,6 @@ margin: 0 0 45px 0; } -.i-posticon { - margin: 0 .5em 0 0; - } .i-posticon-flip { margin: 0 0 0 .5em; } Modified: trunk/templates/Widgets/entry_chooser.tmpl =================================================================== --- trunk/templates/Widgets/entry_chooser.tmpl 2011-11-22 12:59:43 UTC (rev 20604) +++ trunk/templates/Widgets/entry_chooser.tmpl 2011-11-22 13:10:47 UTC (rev 20605) @@ -22,22 +22,7 @@ <ul class='b-editentries'> <TMPL_LOOP entries> <li class='b-editentry'> - <TMPL_IF entry_is_delayed> - <img src="<TMPL_VAR lj_imgprefix>/icon_delayed.png" width=13 height=15 align=absmiddle class="i-posticon"> - </TMPL_IF> - <TMPL_IF entry_is_sticky> - <img src="<TMPL_VAR lj_imgprefix>/icon_sticky.png" width=13 height=15 align=absmiddle class="i-posticon"> - </TMPL_IF> - - <TMPL_IF expr="entry_security eq 'private'"> - <img src="<?imgprefix?>/icon_private.gif" width=16 height=16 align=absmiddle class="i-posticon"> - <TMPL_ELSIF expr="entry_security eq 'groups'"> - <img src="<?imgprefix?>/icon_groups.gif" width=19 height=16 align=absmiddle class="i-posticon"> - <TMPL_ELSIF expr="entry_security eq 'friends'"> - <img src="<?imgprefix?>/icon_protected.gif" width=14 height=15 align=absmiddle class="i-posticon"> - </TMPL_IF> - <p class='b-editentry-ctrls'> <TMPL_IF entry_can_edit> <a href='<TMPL_VAR edit_link ESCAPE=HTML>' class='b-editentry-edit-btn b-editentry-ctrl-btn'></a> @@ -46,14 +31,31 @@ </TMPL_IF> </p> - <h2><a href='<TMPL_VAR entry_url>'> - <TMPL_IF entry_subject> - <TMPL_VAR entry_subject ESCAPE=HTML> - <TMPL_ELSE> - <TMPL_VAR expr="ml('/editjournal.bml.event.no_subject.title')"> - </TMPL_IF> - </a></h2> + <h2> + <TMPL_IF entry_is_delayed> + <img src="<TMPL_VAR lj_imgprefix>/icon_delayed.png" width=13 height=15 align=absmiddle class="i-posticon"> + </TMPL_IF> + <TMPL_IF entry_is_sticky> + <img src="<TMPL_VAR lj_imgprefix>/icon_sticky.png" width=13 height=15 align=absmiddle class="i-posticon"> + </TMPL_IF> + + <TMPL_IF expr="entry_security eq 'private'"> + <img src="<?imgprefix?>/icon_private.gif" width=16 height=16 align=absmiddle class="i-posticon"> + <TMPL_ELSIF expr="entry_security eq 'groups'"> + <img src="<?imgprefix?>/icon_groups.gif" width=19 height=16 align=absmiddle class="i-posticon"> + <TMPL_ELSIF expr="entry_security eq 'friends'"> + <img src="<?imgprefix?>/icon_protected.gif" width=14 height=15 align=absmiddle class="i-posticon"> + </TMPL_IF> + <a href='<TMPL_VAR entry_url>'> + <TMPL_IF entry_subject> + <TMPL_VAR entry_subject ESCAPE=HTML> + <TMPL_ELSE> + <TMPL_VAR expr="ml('/editjournal.bml.event.no_subject.title')"> + </TMPL_IF> + </a> + </h2> + <p class='date'> <TMPL_VAR poster_ljuser> <TMPL_VAR date_display>