Menu
▾
▴
[Openinteract-commits] CVS: OpenInteract2/pkg/news/template news_item.tmpl,1.5,1.6 news_home.tmpl,1.5,1.6 news_form.tmpl,1.9,1.10 news_detail.tmpl,1.6,1.7 archive_count.tmpl,1.1,1.2
|
From: Chris W. <la...@us...> - 2005-09-21 03:39:32
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/news/template In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4732/template Modified Files: news_item.tmpl news_home.tmpl news_form.tmpl news_detail.tmpl archive_count.tmpl Log Message: add CSS, better formatting (not yet complete, esp. with forms) Index: news_item.tmpl =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/news/template/news_item.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** news_item.tmpl 19 Mar 2004 05:57:59 -0000 1.5 --- news_item.tmpl 21 Sep 2005 03:39:24 -0000 1.6 *************** *** 1,18 **** ! <p> ! <span class="news.title">[% news.title %]</span> ! <span class="news.section">([% news.section %])</span> ! </p> ! <p> ! <span class="news.post_date">[% MSG( 'news.item.posted_date', OI.date_format( news.posted_on ) ) %]</span> ! [%- poster = news.posted_by_user %] [%- IF poster -%] [% user_url = OI.make_url( ACTION = 'user', TASK = 'display', user_id = poster.id ) %] ! <span class="news.author">[% MSG( 'news.item.posted_by', user_url, poster.login_name ) %]</span> [%- END -%] </p> ! <p class="news.content"> [% IF news.image_src %] [%- IF news.image_url %]<a href="[% news.image_url %]"> --- 1,34 ---- ! [%- ! detail_url = OI.make_url( ACTION = 'news', TASK = 'display', ! URL_PARAMS = news.id ); ! edit_url = OI.make_url( ACTION = 'news', TASK = 'display_form', ! URL_PARAMS = news.id ); ! post_date = OI.date_format( news.posted_on, '%Y-%b-%d %I:%M %p' ); ! poster = news.posted_by_user; ! -%] ! <div class="newsItem"> ! <h3 class="newsTitle">[% news.title %]</h3> ! ! ! [% IF ACTION.task_security_allowed( 'edit' ) -%] ! <div class="newsAdmin"> ! <p><a href="[% edit_url %]">[% MSG( 'news.item.edit' ) %]</a></p> ! </div> ! [%- END %] ! ! <p class="newsPostInfo"> [%- IF poster -%] [% user_url = OI.make_url( ACTION = 'user', TASK = 'display', user_id = poster.id ) %] ! [% MSG( 'news.item.posted_user_and_date', ! user_url, poster.login_name, post_date ) %] ! [%- ELSE -%] ! [% MSG( 'news.item.posted_on_date', post_date ) %] [%- END -%] </p> ! <div class="newsContent"> ! [% IF news.image_src %] [%- IF news.image_url %]<a href="[% news.image_url %]"> *************** *** 21,23 **** --- 37,51 ---- [% END %] [% news.news_item %] + + <div class="newsLinks"> + <p> + [ [% OI.action_execute( 'my_tags', object = news ) %] ] + [ [% OI.action_execute( 'show_comment_summary', object = news ) %] ] + [ <a rel="bookmark" + href="[% detail_url %]">[% MSG( 'news.item.permalink' ) %]</a> ] </p> + </div> + + </div> <!-- newsContent --> + + </div> <!--news --> Index: news_home.tmpl =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/news/template/news_home.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** news_home.tmpl 2 Mar 2005 15:21:44 -0000 1.5 --- news_home.tmpl 21 Sep 2005 03:39:24 -0000 1.6 *************** *** 1,3 **** ! [%- OI.box_add( 'news_tools_box' ); DEFAULT num_latest = 10 -%] --- 1,4 ---- ! [%- OI.box_add( 'news_archive_monthly' ); ! OI.box_add( 'all_tags_box' ); DEFAULT num_latest = 10 -%] *************** *** 5,9 **** PROCESS status_message; -%] ! [% INCLUDE news::news_filter_form %] <h2>[% MSG( 'news.home.title' ) %]</h2> --- 6,10 ---- PROCESS status_message; -%] ! <div class="demarcatePage"> <h2>[% MSG( 'news.home.title' ) %]</h2> *************** *** 11,13 **** <p>[% MSG( 'news.home.summary', num_latest ) %]</p> ! [% OI.action_execute( 'latest_news', num_items = num_latest ) %] \ No newline at end of file --- 12,16 ---- <p>[% MSG( 'news.home.summary', num_latest ) %]</p> ! </div> <!-- demarcatePage --> ! ! [% OI.action_execute( 'latest_news', num_items = num_latest ) %] Index: news_form.tmpl =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/news/template/news_form.tmpl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** news_form.tmpl 9 Jun 2004 02:18:50 -0000 1.9 --- news_form.tmpl 21 Sep 2005 03:39:24 -0000 1.10 *************** *** 14,21 **** [% task = ( is_saved ) ? 'update' : 'add' -%] ! [% PROCESS form_begin( ACTION = 'news', ! TASK = task, ! method = 'POST', ! name = 'news' ) -%] <h2>[% title %]</h2> --- 14,19 ---- [% task = ( is_saved ) ? 'update' : 'add' -%] ! [% PROCESS form_begin( ACTION = 'news', TASK = task, ! method = 'POST', name = 'news' ) -%] <h2>[% title %]</h2> *************** *** 53,62 **** [%- count = count + 1 -%] ! [% INCLUDE label_form_select_row( label_key = 'news.info.section', ! name = 'section', ! picked = news.section, ! list = section_list, ! value_field = 'section', ! first_label = '---News Sections---' ) -%] [%- count = count + 1 -%] --- 51,60 ---- [%- count = count + 1 -%] ! [%- tag_values = is_saved ? TAGS.lookup_tags( news ).join( ' ' ) : '' -%] ! [% INCLUDE label_form_text_row( label_key = 'object_tags.title.object_tags', ! name = MSG( 'object_tags.tag_field' ), ! value = tag_values, ! size = 40, ! maxlength = 255 ); %] [%- count = count + 1 -%] Index: news_detail.tmpl =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/news/template/news_detail.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** news_detail.tmpl 12 Jun 2004 23:22:35 -0000 1.6 --- news_detail.tmpl 21 Sep 2005 03:39:24 -0000 1.7 *************** *** 1,4 **** [%- OI.page_title( MSG( 'news.detail.page_title', news.title ) ); ! OI.box_add( 'news_tools_box', news = news ); DEFAULT theme = OI.theme_properties; PROCESS error_message; --- 1,5 ---- [%- OI.page_title( MSG( 'news.detail.page_title', news.title ) ); ! OI.box_add( 'news_archive_monthly' ); ! OI.box_add( 'all_tags_box' ); DEFAULT theme = OI.theme_properties; PROCESS error_message; *************** *** 26,42 **** </p> - [% IF news.tmp_security_level >= OI.security_level.write %] - [% edit_url = OI.make_url( ACTION = 'news', - TASK = 'display_form', - news_id = news.id ) -%] - [% END %] - - <p align="right">[% MSG( 'news.detail.edit_link', edit_url ) %]</p> - - <h2>[% MSG( 'news.detail.title' ) %]</h2> - [% INCLUDE news::news_item -%] <h2>[% MSG( 'news.detail.comments' ) %]</h2> ! [% OI.action_execute( 'show_comment_by_object', object => news ) %] --- 27,37 ---- </p> [% INCLUDE news::news_item -%] + <div class="commentsUnderContent"> + <h2>[% MSG( 'news.detail.comments' ) %]</h2> ! [% OI.action_execute( 'show_comment_by_object', object = news ) %] ! ! </div> <!-- commentsUnderContent --> \ No newline at end of file Index: archive_count.tmpl =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/news/template/archive_count.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** archive_count.tmpl 2 Mar 2005 15:21:44 -0000 1.1 --- archive_count.tmpl 21 Sep 2005 03:39:24 -0000 1.2 *************** *** 2,5 **** archive_url = OI.make_url( ACTION = 'news', TASK = 'archive', URL_PARAMS = [ info.year, info.month ] ); -%] ! <a href="[% archive_url %]">[% info.month %]/[% info.year %]</a>: [% info.count %] <br /> [% END -%] \ No newline at end of file --- 2,5 ---- archive_url = OI.make_url( ACTION = 'news', TASK = 'archive', URL_PARAMS = [ info.year, info.month ] ); -%] ! <a href="[% archive_url %]">[% info.month %]/[% info.year %]</a> ([% info.count %]) [% END -%] \ No newline at end of file |
