Navigation

← Previous Changeset
Next Changeset →

Changeset 1071

Timestamp:

07/30/06 07:27:33 (2 years ago)

Author:

Blackhex

Message:

DiscussionPlugin:

Some templates rename.
Forums, topics and messages ID displaying.

Files:

discussionplugin/0.9/tracdiscussion/api.py (modified) (1 diff)
discussionplugin/0.9/tracdiscussion/htdocs/css/discussion.css (modified) (3 diffs)
discussionplugin/0.9/tracdiscussion/templates/admin-forum-list.cs (moved) (moved from discussionplugin/0.9/tracdiscussion/templates/forum-admin.cs)
discussionplugin/0.9/tracdiscussion/templates/admin-group-list.cs (moved) (moved from discussionplugin/0.9/tracdiscussion/templates/group-admin.cs)
discussionplugin/0.9/tracdiscussion/templates/forum-list.cs (modified) (3 diffs)
discussionplugin/0.9/tracdiscussion/templates/message-list.cs (modified) (2 diffs)
discussionplugin/0.9/tracdiscussion/templates/topic-list.cs (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

discussionplugin/0.9/tracdiscussion/api.py

r1066	r1071
46	46	self.req.hdf['discussion.message'] = message
47	47	self.req.hdf['discussion.mode'] = modes[-1]
48
49		~~# Will be removed after template rename~~
50		~~if modes[-1] == 'admin-forum-list':~~
51		~~modes[-1] = 'forum-admin'~~
52		~~if modes[-1] == 'admin-group-list':~~
53		~~modes[-1] = 'group-admin'~~
54
55	48	self.db.commit()
56	49	return modes[-1] + '.cs', None

discussionplugin/0.9/tracdiscussion/htdocs/css/discussion.css

r1066	r1071
22	22	}
23	23
24		.forum-list td.moderators, .forum-list td.lasttopic, .forum-list td.lastreply,
25		.forum-list td.founded, .forum-list td.topics, .forum-list td.replies
	24	.forum-list td.id, .forum-list td.moderators, .forum-list td.lasttopic,
	25	.forum-list td.lastreply, .forum-list td.founded, .forum-list td.topics,
	26	.forum-list td.replies
26	27	{
27	28	text-align: center;
	29	}
	30
	31	.forum-list td.id
	32	{
	33	width: 1%;
28	34	}
29	35
…	…
47	53
48	54	/* Topic list */
49		.topic-list td.~~author, .topic-list td.lastreply, .topic-list td.founded~~,
50		.topic-list td.replies
	55	.topic-list td.id, .topic-list td.author, .topic-list td.lastreply,
	56	.topic-list td.founded, .topic-list td.replies
51	57	{
52	58	text-align: center;
	59	}
	60
	61	.topic-list td.id
	62	{
	63	width: 1%;
53	64	}
54	65
…	…
131	142	}
132	143
	144	.message-list div.id
	145	{
	146	padding: 0.2em 0.0em;
	147	text-align: right;
	148	}
	149
133	150	.message-list .topic .replies div.body
134	151	{

discussionplugin/0.9/tracdiscussion/templates/forum-list.cs

r1066	r1071
4	4	<?cs if:group.id ?>
5	5	<tr>
6		<th class="group" colspan="7">
	6	<th class="group" colspan="8">
7	7	<div class="name"><?cs var:group.name ?></div>
8	8	<div class="description"><?cs var:group.description ?></div>
…	…
11	11	<?cs /if ?>
12	12	<tr>
	13	<th class="id">ID</th>
13	14	<th class="subject">Forum</th>
14	15	<th class="moderators">Moderators</th>
…	…
23	24	<?cs each:forum = forums ?>
24	25	<?cs if forum.group == group.id ?>
25		<tr class="<?cs if:name(forum) % #2 ?>even<?cs else ?>odd<?cs /if ?>">
	26	<tr class="<?cs if:name(forum) % #2 ?>even<?cs else ?>odd<?cs /if ?>">
	27	<td class="id">
	28	<a href="<?cs var:discussion.href ?>/<?cs var:forum.id ?>">
	29	<div class="id"><?cs var:forum.id ?></div>
	30	</a>
	31	</td>
26	32	<td class="title">
27	33	<a href="<?cs var:discussion.href ?>/<?cs var:forum.id ?>">

discussionplugin/0.9/tracdiscussion/templates/message-list.cs

r1066	r1071
62	62	<li>
63	63	<a name="<?cs var:message.id ?>"></a>
	64	<div class="id">
	65	Message #<?cs var:message.id ?>
	66	</div>
64	67	<div class="body">
65	68	<?cs var:message.body ?>
…	…
112	115	<?cs else ?>
113	116	<?cs linclude "discussion-header.cs" ?>
114		<h1 ~~class="forum-subject"><?cs var:discussion.forum.subject~~ ?> - Message List</h1>
	117	<h1>Forum #<?cs var:discussion.forum.id ?> - Topic #<?cs var:discussion.topic.id ?> - Message List</h1>
115	118	<?cs /if?>
116	119

discussionplugin/0.9/tracdiscussion/templates/topic-list.cs

r1066	r1071
1	1	<?cs include "discussion-header.cs" ?>
2	2
3		<h1><?cs var:discussion.forum.subject ?> - Topic List</h1>
4		<div class="forum-description"><?cs var:discussion.forum.description ?></div>
5		<?cs if:discussion.topics.0.id ?>
6		<table class="listing">
7		<thead>
8		<tr>
9		<th class="subject">Subject</th>
10		<th class="author">Author</th>
11		<th class="lastreply">Last Reply</th>
12		<th class="founded">Founded</th>
13		<th class="replies">Replies</th>
	3	<h1>Forum #<?cs var:discussion.forum.id ?> - Topic List</h1>
	4	<div class="name">
	5	<?cs var:discussion.forum.name ?>
	6	</div>
	7	<div class="description">
	8	<?cs var:discussion.forum.description ?>
	9	</div>
	10	<?cs if:discussion.topics.0.id ?>
	11	<table class="listing">
	12	<thead>
	13	<tr>
	14	<th class="id">ID</th>
	15	<th class="subject">Subject</th>
	16	<th class="author">Author</th>
	17	<th class="lastreply">Last Reply</th>
	18	<th class="founded">Founded</th>
	19	<th class="replies">Replies</th>
	20	</tr>
	21	</thead>
	22	</tbody>
	23	<?cs each:topic = discussion.topics ?>
	24	<tr class="<?cs if:name(topic) % #2 ?>even<?cs else ?>odd<?cs /if ?>">
	25	<td class="id">
	26	<a href="<?cs var:discussion.href ?>/<?cs var:discussion.forum.id ?>/<?cs var:topic.id ?>">
	27	<div class="id"><?cs var:topic.id ?></div>
	28	</a>
	29	</td>
	30	<td class="subject">
	31	<a href="<?cs var:discussion.href ?>/<?cs var:discussion.forum.id ?>/<?cs var:topic.id ?>">
	32	<div class="subject"><?cs alt:topic.subject ?> <?cs /alt ?></div>
	33	</a>
	34	</td>
	35	<td class="author">
	36	<a href="<?cs var:discussion.href ?>/<?cs var:discussion.forum.id ?>/<?cs var:topic.id ?>">
	37	<div class="author" ><?cs alt:topic.author ?> <?cs /alt ?></div>
	38	</a>
	39	</td>
	40	<td class="lastreply">
	41	<a href="<?cs var:discussion.href ?>/<?cs var:discussion.forum.id ?>/<?cs var:topic.id ?>">
	42	<div class="lastreply"><?cs alt:topic.lastreply ?> <?cs /alt ?></div>
	43	</a>
	44	</td>
	45	<td class="founded">
	46	<a href="<?cs var:discussion.href ?>/<?cs var:discussion.forum.id ?>/<?cs var:topic.id ?>">
	47	<div class="founded" ><?cs alt:topic.time ?> <?cs /alt ?></div>
	48	</a>
	49	</td>
	50	<td class="replies">
	51	<a href="<?cs var:discussion.href ?>/<?cs var:discussion.forum.id ?>/<?cs var:topic.id ?>">
	52	<div class="replies" ><?cs var:topic.replies ?></div>
	53	</a>
	54	</td>
14	55	</tr>
15		</thead>
16		</tbody>
17		<?cs each:topic = discussion.topics ?>
18		<tr class="<?cs if:name(topic) % #2 ?>even<?cs else ?>odd<?cs /if ?>">
19		<td class="subject">
20		<a href="<?cs var:discussion.href ?>/<?cs var:discussion.forum.id ?>/<?cs var:topic.id ?>">
21		<div class="subject"><?cs alt:topic.subject ?> <?cs /alt ?></div>
22		</a>
23		</td>
24		<td class="author">
25		<a href="<?cs var:discussion.href ?>/<?cs var:discussion.forum.id ?>/<?cs var:topic.id ?>">
26		<div class="author" ><?cs alt:topic.author ?> <?cs /alt ?></div>
27		</a>
28		</td>
29		<td class="lastreply">
30		<a href="<?cs var:discussion.href ?>/<?cs var:discussion.forum.id ?>/<?cs var:topic.id ?>">
31		<div class="lastreply"><?cs alt:topic.lastreply ?> <?cs /alt ?></div>
32		</a>
33		</td>
34		<td class="founded">
35		<a href="<?cs var:discussion.href ?>/<?cs var:discussion.forum.id ?>/<?cs var:topic.id ?>">
36		<div class="founded" ><?cs alt:topic.time ?> <?cs /alt ?></div>
37		</a>
38		</td>
39		<td class="replies">
40		<a href="<?cs var:discussion.href ?>/<?cs var:discussion.forum.id ?>/<?cs var:topic.id ?>">
41		<div class="replies" ><?cs var:topic.replies ?></div>
42		</a>
43		</td>
44		</tr>
45		<?cs /each ?>
46		</tbody>
47		</table>
48		<?cs else ?>
49		<p class="help">There are no topics created in this forum.</p>
	56	<?cs /each ?>
	57	</tbody>
	58	</table>
	59	<?cs else ?>
	60	<p class="help">There are no topics created in this forum.</p>
	61	<?cs /if ?>
	62
	63	<div class="buttons">
	64	<?cs if:trac.acl.DISCUSSION_APPEND ?>
	65	<form method="post" action="<?cs var:discussion.href ?>/<?cs var:discussion.forum.id ?>">
	66	<input type="submit" name="newtopic" value="New Topic"/>
	67	<input type="hidden" name="forum" value="<?cs var:discussion.forum.id ?>"/>
	68	<input type="hidden" name="discussion_action" value="add"/>
	69	</form>
50	70	<?cs /if ?>
51
52		<div class="buttons">
53		<?cs if:trac.acl.DISCUSSION_APPEND ?>
54		<form method="post" action="<?cs var:discussion.href ?>/<?cs var:discussion.forum.id ?>">
55		<input type="submit" name="newtopic" value="New Topic"/>
56		<input type="hidden" name="forum" value="<?cs var:discussion.forum.id ?>"/>
57		<input type="hidden" name="discussion_action" value="add"/>
58		</form>
59		<?cs /if ?>
60		<?cs if:trac.acl.DISCUSSION_ADMIN ?>
61		<form method="post" action="<?cs var:discussion.href ?>">
62		<input type="submit" name="deleteforum" value="Delete Forum" onclick="return confirm('Do you realy want to delete this forum?')"/>
63		<input type="hidden" name="forum" value="<?cs var:discussion.forum.id ?>"/>
64		<input type="hidden" name="discussion_action" value="delete">
65		</form>
66		<?cs /if ?>
67		</div>
	71	<?cs if:trac.acl.DISCUSSION_ADMIN ?>
	72	<form method="post" action="<?cs var:discussion.href ?>">
	73	<input type="submit" name="deleteforum" value="Delete Forum" onclick="return confirm('Do you realy want to delete this forum?')"/>
	74	<input type="hidden" name="forum" value="<?cs var:discussion.forum.id ?>"/>
	75	<input type="hidden" name="discussion_action" value="delete">
	76	</form>
	77	<?cs /if ?>
	78	</div>
68	79
69	80	<?cs include "footer.cs" ?>

Navigation

Changeset 1071

Legend:

discussionplugin/0.9/tracdiscussion/api.py

discussionplugin/0.9/tracdiscussion/htdocs/css/discussion.css

discussionplugin/0.9/tracdiscussion/templates/forum-list.cs

discussionplugin/0.9/tracdiscussion/templates/message-list.cs

discussionplugin/0.9/tracdiscussion/templates/topic-list.cs

Download in other formats: