Changeset 2597
- Timestamp:
- 08/26/07 12:29:26 (1 year ago)
- Files:
-
- discussionplugin/0.10/tracdiscussion/htdocs/css/discussion.css (modified) (1 diff)
- discussionplugin/0.10/tracdiscussion/templates/admin-forum-list.cs (modified) (2 diffs)
- discussionplugin/0.10/tracdiscussion/templates/admin-group-list.cs (modified) (3 diffs)
- discussionplugin/0.10/tracdiscussion/templates/discussion-header.cs (modified) (2 diffs)
- discussionplugin/0.10/tracdiscussion/templates/discussion-macros.cs (modified) (5 diffs)
- discussionplugin/0.10/tracdiscussion/templates/forum-add.cs (modified) (1 diff)
- discussionplugin/0.10/tracdiscussion/templates/forum-list.cs (modified) (3 diffs)
- discussionplugin/0.10/tracdiscussion/templates/topic-add.cs (modified) (1 diff)
- discussionplugin/0.10/tracdiscussion/templates/topic-list.cs (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
discussionplugin/0.10/tracdiscussion/htdocs/css/discussion.css
r1375 r2597 6 6 7 7 /* Forum list */ 8 .forum-list tr >td9 {10 margin: 0em !important;11 padding: 0em !important;12 height: 100%;13 }14 15 .forum-list tr > td > a16 {17 display: block;18 height: 100%;19 padding: 0.5em;20 margin: 0em !important;21 border: none;22 }23 24 8 .forum-list td.id, .forum-list td.moderators, .forum-list td.lasttopic, 25 9 .forum-list td.lastreply, .forum-list td.time, .forum-list td.topics, discussionplugin/0.10/tracdiscussion/templates/admin-forum-list.cs
r2014 r2597 88 88 <label for="moderators">Moderators:</label><br/> 89 89 <?cs if:discussion.users.0 ?> 90 <select id="moderators" name="moderators" multiple=" on">90 <select id="moderators" name="moderators" multiple="multiple"> 91 91 <?cs each:user = discussion.users ?> 92 92 <option value="<?cs var:user ?>"><?cs var:user ?></option> … … 140 140 </td> 141 141 <td class="id"> 142 <a href="<?cs var:discussion.href ?>/forum/<?cs var:forum.id ?>"> 143 <div class="id"><?cs var:forum.id ?></div> 144 </a> 142 <div class="id"> 143 <a href="<?cs var:discussion.href ?>/forum/<?cs var:forum.id ?>"> 144 <?cs var:forum.id ?> 145 </a> 146 </div> 145 147 </td> 146 148 <td class="name"> 147 <a href="<?cs var:discussion.href ?>/forum/<?cs var:forum.id ?>"> 148 <div class="name"><?cs alt:forum.name ?> <?cs /alt ?></div> 149 </a> 149 <div class="name"> 150 <a href="<?cs var:discussion.href ?>/forum/<?cs var:forum.id ?>"> 151 <?cs alt:forum.name ?> <?cs /alt ?> 152 </a> 153 </div> 150 154 </td> 151 155 <td class="subject"> 152 <a href="<?cs var:discussion.href ?>/forum/<?cs var:forum.id ?>"> 153 <div class="subject"><?cs alt:forum.subject ?> <?cs /alt ?></div> 154 </a> 156 <div class="subject"> 157 <a href="<?cs var:discussion.href ?>/forum/<?cs var:forum.id ?>"> 158 <?cs alt:forum.subject ?> <?cs /alt ?> 159 </a> 160 </div> 155 161 </td> 156 162 <td class="description"> 157 <a href="<?cs var:discussion.href ?>/forum/<?cs var:forum.id ?>"> 158 <div class="description"><?cs alt:forum.description ?> <?cs /alt ?></div> 159 </a> 163 <div class="description"> 164 <a href="<?cs var:discussion.href ?>/forum/<?cs var:forum.id ?>"> 165 <?cs alt:forum.description ?> <?cs /alt ?> 166 </a> 167 </div> 160 168 </td> 161 169 <td class="moderators"> 162 <a href="<?cs var:discussion.href ?>/forum/<?cs var:forum.id ?>"> 163 <div class="moderators"><?cs alt:forum.moderators ?> <?cs /alt ?></div> 164 </a> 170 <div class="moderators"> 171 <a href="<?cs var:discussion.href ?>/forum/<?cs var:forum.id ?>"> 172 <?cs alt:forum.moderators ?> <?cs /alt ?> 173 </a> 174 </div> 165 175 </td> 166 176 <?cs if:discussion.groups.1.id ?> 167 177 <td class="group"> 168 <a href="<?cs var:discussion.href ?>/forum/<?cs var:forum.id ?>"> 169 <?cs each:group = discussion.groups ?> 170 <?cs if:group.id == forum.group ?> 171 <div class="group"><?cs var:group.name ?></div> 172 <?cs /if ?> 173 <?cs /each ?> 174 </a> 178 <div class="group"> 179 <a href="<?cs var:discussion.href ?>/forum/<?cs var:forum.id ?>"> 180 <?cs each:group = discussion.groups ?> 181 <?cs if:group.id == forum.group ?> 182 <?cs var:group.name ?> 183 <?cs /if ?> 184 <?cs /each ?> 185 </a> 186 </div> 175 187 </td> 176 188 <?cs /if ?> discussionplugin/0.10/tracdiscussion/templates/admin-group-list.cs
r2014 r2597 11 11 <div class="field"> 12 12 <label for="name">Name:</label><br/> 13 <input type="text" name="name" value="<?cs var:discussion.name ?>"/><br/>13 <input type="text" id="name" name="name" value="<?cs var:discussion.name ?>"/><br/> 14 14 </div> 15 15 <div class="field"> 16 16 <label for="description">Description:</label><br/> 17 <input type="text" name="description" value="<?cs var:discussion.description ?>"/><br/>17 <input type="text" id="description" name="description" value="<?cs var:discussion.description ?>"/><br/> 18 18 </div> 19 19 <div class="buttons"> … … 33 33 <div class="field"> 34 34 <label for="name">Name:</label><br/> 35 <input type="text" name="name" value=""/><br/>35 <input type="text" id="name" name="name" value=""/><br/> 36 36 </div> 37 37 <div class="field"> 38 38 <label for="description">Description:</label><br/> 39 <input type="text" name="description" value=""/><br/>39 <input type="text" id="description" name="description" value=""/><br/> 40 40 </div> 41 41 <div class="buttons"> … … 66 66 </td> 67 67 <td class="id"> 68 <a href="<?cs var:discussion.href ?>/group/<?cs var:group.id ?>"> 69 <div class="id"><?cs var:group.id ?></div> 70 </a> 68 <div class="id"> 69 <a href="<?cs var:discussion.href ?>/group/<?cs var:group.id ?>"> 70 <?cs var:group.id ?> 71 </a> 72 </div> 71 73 </td> 72 74 <td class="name"> 73 <a href="<?cs var:discussion.href ?>/group/<?cs var:group.id ?>"> 74 <div class="name"><?cs alt:group.name ?> <?cs /alt ?></div> 75 </a> 75 <div class="name"> 76 <a href="<?cs var:discussion.href ?>/group/<?cs var:group.id ?>"> 77 <?cs alt:group.name ?> <?cs /alt ?> 78 </a> 79 </div> 76 80 </td> 77 81 <td class="description"> 78 <a href="<?cs var:discussion.href ?>/group/<?cs var:group.id ?>"> 79 <div class="description" ><?cs alt:group.description ?> <?cs /alt ?></div> 80 </a> 82 <div class="description"> 83 <a href="<?cs var:discussion.href ?>/group/<?cs var:group.id ?>"> 84 <?cs alt:group.description ?> <?cs /alt ?> 85 </a> 86 </div> 81 87 </td> 82 88 </tr> discussionplugin/0.10/tracdiscussion/templates/discussion-header.cs
r1088 r2597 3 3 <div id="ctxtnav" class="nav"> 4 4 <h2>Wiki Navigation</h2> 5 < ul>6 < ?cs if:discussion.forum.id ?>5 <?cs if:discussion.forum.id ?> 6 <ul> 7 7 <?cs if:discussion.topic.id ?> 8 8 <li> … … 32 32 </li> 33 33 <?cs /if ?> 34 < ?cs /if ?>35 < /ul>34 </ul> 35 <?cs /if ?> 36 36 <hr/> 37 37 </div> discussionplugin/0.10/tracdiscussion/templates/discussion-macros.cs
r2541 r2597 40 40 <input type="text" id="author" name="author" value="<?cs alt:args.author ?>anonymous<?cs /alt ?>"/><br/> 41 41 <?cs else ?> 42 <input type="text" id="author" name="author" value="<?cs var:discussion.authname ?>" readonly=" true"/><br/>42 <input type="text" id="author" name="author" value="<?cs var:discussion.authname ?>" readonly="readonly"/><br/> 43 43 <?cs /if ?> 44 44 </div> … … 51 51 <input type="submit" name="submit" value="Reply"/> 52 52 <input type="button" name="cancel" value="Cancel" onclick="location.replace('<?cs var:discussion.href ?>')"/> 53 </div>54 <?cs if:args.message ?>55 < input type="hidden" name="message" value="<?cs var:args.message ?>"/>56 <?cs /if ?>57 < input type="hidden" name="discussion_action" value="post-add"/>53 <?cs if:args.message ?> 54 <input type="hidden" name="message" value="<?cs var:args.message ?>"/> 55 <?cs /if ?> 56 <input type="hidden" name="discussion_action" value="post-add"/> 57 </div> 58 58 </form> 59 59 </fieldset> … … 137 137 <?cs /if ?> 138 138 </li> 139 <?cs if:message.replies.0.id || args.discussion_action && ((args.discussion_action == 'add') || (args.discussion_action == 'quote') || (args.discussion_action == 'post-add')) ?> 140 <ul class="reply"> 141 <?cs if:message.replies.0.id ?> 142 <?cs call:display_replies(message.replies) ?> 143 <?cs /if ?> 144 <?cs if:(args.message == message.id) && !args.submit && (args.discussion_action && (args.discussion_action == 'add') || (args.discussion_action == 'quote') || (args.discussion_action == 'post-add')) ?> 145 <?cs if:args.preview ?> 146 <?cs call:display_preview() ?> 147 <?cs /if ?> 148 <?cs call:display_reply_form() ?> 149 <?cs /if ?> 150 </ul> 139 <?cs if:message.replies.0.id || (args.message == message.id) && (((args.discussion_action == 'add') || (args.discussion_action == 'quote') || (args.discussion_action == 'post-add'))) ?> 140 <li> 141 <ul class="reply"> 142 <?cs if:message.replies.0.id ?> 143 <?cs call:display_replies(message.replies) ?> 144 <?cs /if ?> 145 <?cs if:(args.message == message.id) && !args.submit && ((args.discussion_action == 'add') || (args.discussion_action == 'quote') || (args.discussion_action == 'post-add')) ?> 146 <?cs if:args.preview ?> 147 <?cs call:display_preview() ?> 148 <?cs /if ?> 149 <?cs call:display_reply_form() ?> 150 <?cs /if ?> 151 </ul> 152 </li> 151 153 <?cs /if ?> 152 154 <?cs /each ?> … … 194 196 <?cs /if ?> 195 197 </div> 196 <?cs if:discussion.messages.0.id || args.discussion_action && ((args.discussion_action == 'add') || (args.discussion_action == 'quote') || (args.discussion_action == 'post-add')) ?> 198 199 <?cs if:discussion.messages.0.id || (args.discussion_action == 'add') || (args.discussion_action == 'quote') || (args.discussion_action == 'post-add') ?> 197 200 <div class="replies <?cs if:discussion.topic.new ?>new<?cs /if ?>"> 198 201 <?cs call:display_set_display() ?> … … 201 204 <?cs call:display_replies(discussion.messages) ?> 202 205 <?cs /if ?> 203 <?cs if:!args.message && !args.submit && args.discussion_action &&((args.discussion_action == 'add') || (args.discussion_action == 'quote') || (args.discussion_action == 'post-add')) ?>206 <?cs if:!args.message && !args.submit && ((args.discussion_action == 'add') || (args.discussion_action == 'quote') || (args.discussion_action == 'post-add')) ?> 204 207 <?cs if:args.preview ?> 205 208 <?cs call:display_preview() ?> discussionplugin/0.10/tracdiscussion/templates/forum-add.cs
r1077 r2597 22 22 <label for="moderators">Moderators:</label><br/> 23 23 <?cs if:discussion.users.0 ?> 24 <select id="moderators" name="moderators" multiple=" on">24 <select id="moderators" name="moderators" multiple="multiple"> 25 25 <?cs each:user = discussion.users ?> 26 26 <option value="<?cs var:user ?>"><?cs var:user ?></option> discussionplugin/0.10/tracdiscussion/templates/forum-list.cs
r2014 r2597 11 11 <div class="description"><?cs var:group.description ?></div> 12 12 </th> 13 < tr>13 </tr> 14 14 <?cs /if ?> 15 15 <tr> … … 29 29 <tr class="<?cs if:name(forum) % #2 ?>even<?cs else ?>odd<?cs /if ?>"> 30 30 <td class="id"> 31 <a href="<?cs var:discussion.href ?>/<?cs var:forum.id ?>"> 32 <div class="id"><?cs var:forum.id ?></div> 33 </a> 31 <div class="id"> 32 <a href="<?cs var:discussion.href ?>/<?cs var:forum.id ?>"> 33 <?cs var:forum.id ?> 34 </a> 35 </div> 34 36 </td> 35 37 <td class="title"> 36 <a href="<?cs var:discussion.href ?>/<?cs var:forum.id ?>"> 37 <div class="subject"><?cs alt:forum.subject ?> <?cs /alt ?></div> 38 <div class="description"><?cs alt:forum.description ?> <?cs /alt ?></div> 39 </a> 38 <div class="subject"> 39 <a href="<?cs var:discussion.href ?>/<?cs var:forum.id ?>"> 40 <?cs alt:forum.subject ?> <?cs /alt ?> 41 </a> 42 </div> 43 <div class="description"> 44 <a href="<?cs var:discussion.href ?>/<?cs var:forum.id ?>"> 45 <?cs alt:forum.description ?> <?cs /alt ?> 46 </a> 47 </div> 40 48 </td> 41 49 <td class="moderators"> 42 <a href="<?cs var:discussion.href ?>/<?cs var:forum.id ?>"> 43 <div class="moderators"><?cs alt:forum.moderators ?> <?cs /alt ?></div> 44 </a> 50 <div class="moderators"> 51 <a href="<?cs var:discussion.href ?>/<?cs var:forum.id ?>"> 52 <?cs alt:forum.moderators ?> <?cs /alt ?> 53 </a> 54 </div> 45 55 </td> 46 56 <td class="lasttopic"> 47 <a href="<?cs var:discussion.href ?>/<?cs var:forum.id ?>"> 48 <div class="lasttopic"><?cs alt:forum.lasttopic ?> <?cs /alt ?></div> 49 </a> 57 <div class="lasttopic"> 58 <a href="<?cs var:discussion.href ?>/<?cs var:forum.id ?>"> 59 <?cs alt:forum.lasttopic ?> <?cs /alt ?> 60 </a> 61 </div> 50 62 </td> 51 63 <td class="lastreply"> 52 <a href="<?cs var:discussion.href ?>/<?cs var:forum.id ?>"> 53 <div class="lastreply"><?cs alt:forum.lastreply ?> <?cs /alt ?></div> 54 </a> 64 <div class="lastreply"> 65 <a href="<?cs var:discussion.href ?>/<?cs var:forum.id ?>"> 66 <?cs alt:forum.lastreply ?> <?cs /alt ?> 67 </a> 68 </div> 55 69 </td> 56 70 <td class="founded"> 57 <a href="<?cs var:discussion.href ?>/<?cs var:forum.id ?>"> 58 <div class="founded"><?cs alt:forum.time ?> <?cs /alt ?></div> 59 </a> 71 <div class="founded"> 72 <a href="<?cs var:discussion.href ?>/<?cs var:forum.id ?>"> 73 <?cs alt:forum.time ?> <?cs /alt ?> 74 </a> 75 </div> 60 76 </td> 61 77 <td class="topics"> 62 <a href="<?cs var:discussion.href ?>/<?cs var:forum.id ?>"> 63 <div class="topics"><?cs var:forum.topics ?></div> 64 </a> 78 <div class="topics"> 79 <a href="<?cs var:discussion.href ?>/<?cs var:forum.id ?>"> 80 <?cs var:forum.topics ?> 81 </a> 82 </div> 65 83 </td> 66 84 <td class="replies"> 67 <a href="<?cs var:discussion.href ?>/<?cs var:forum.id ?>"> 68 <div class="replies"><?cs var:forum.replies ?></div> 69 </a> 85 <div class="replies"> 86 <a href="<?cs var:discussion.href ?>/<?cs var:forum.id ?>"> 87 <?cs var:forum.replies ?> 88 </a> 89 </div> 70 90 </td> 71 91 </tr> … … 90 110 91 111 <?cs if:trac.acl.DISCUSSION_ADMIN ?> 92 < div class="buttons">93 < form method="post" action="<?cs var:discussion.href ?>">112 <form method="post" action="<?cs var:discussion.href ?>"> 113 <div class="buttons"> 94 114 <input type="submit" name="newforum" value="New Forum"/> 95 115 <input type="hidden" name="discussion_action" value="add"/> 96 </ form>97 </ div>116 </div> 117 </form> 98 118 <?cs /if ?> 99 119 discussionplugin/0.10/tracdiscussion/templates/topic-add.cs
r2014 r2597 34 34 <label for="author">Author:</label><br/> 35 35 <?cs if:discussion.authname == 'anonymous' ?> 36 <input type="text" name="author" value="<?cs alt:args.author ?>anonymous<?cs /alt ?>"/><br/>36 <input type="text" id="author" name="author" value="<?cs alt:args.author ?>anonymous<?cs /alt ?>"/><br/> 37 37 <?cs else ?> 38 <input type="text" name="author" value="<?cs var:discussion.authname ?>" readonly="true"/><br/>38 <input type="text" id="author" name="author" value="<?cs var:discussion.authname ?>" readonly="readonly"/><br/> 39 39 <?cs /if ?> 40 40 </div> 41 41 <div class="field"> 42 42 <label for="subject">Subject:</label><br/> 43 <input type="text" name="subject" value="<?cs var:args.subject ?>"/><br/>43 <input type="text" id="subject" name="subject" value="<?cs var:args.subject ?>"/><br/> 44 44 </div> 45 45 <div class="field"> 46 46 <label for="body">Body:</label><br/> 47 <textarea name="body" class="wikitext" rows="10" cols="78"><?cs alt:args.body ?>Enter your message here...<?cs /alt ?></textarea><br/>47 <textarea id="body" name="body" class="wikitext" rows="10" cols="78"><?cs alt:args.body ?>Enter your message here...<?cs /alt ?></textarea><br/> 48 48 </div> 49 49 <div class="buttons"> discussionplugin/0.10/tracdiscussion/templates/topic-list.cs
r2236 r2597 19 19 </tr> 20 20 </thead> 21 < /tbody>21 <tbody> 22 22 <?cs each:topic = discussion.topics ?> 23 23 <tr class="<?cs if:name(topic) % #2 ?>even<?cs else ?>odd<?cs /if ?>"> 24 24 <td class="id"> 25 <a href="<?cs var:discussion.href ?>/<?cs var:discussion.forum.id ?>/<?cs var:topic.id ?>"> 26 <div class="id"><?cs var:topic.id ?></div> 27 </a> 25 <div class="id"> 26 <a href="<?cs var:discussion.href ?>/<?cs var:discussion.forum.id ?>/<?cs var:topic.id ?>"> 27 <?cs var:topic.id ?> 28 </a> 29 </div> 28 30 </td> 29 31 <td class="subject"> 30 <a href="<?cs var:discussion.href ?>/<?cs var:discussion.forum.id ?>/<?cs var:topic.id ?>"> 31 <div class="subject"><?cs alt:topic.subject ?> <?cs /alt ?></div> 32 </a> 32 <div class="subject"> 33 <a href="<?cs var:discussion.href ?>/<?cs var:discussion.forum.id ?>/<?cs var:topic.id ?>"> 34 <?cs alt:topic.subject ?> <?cs /alt ?> 35 </a> 36 </div> 33 37 </td> 34 38 <td class="author"> 35 <a href="<?cs var:discussion.href ?>/<?cs var:discussion.forum.id ?>/<?cs var:topic.id ?>"> 36 <div class="author" ><?cs alt:topic.author ?> <?cs /alt ?></div> 37 </a> 39 <div class="author" > 40 <a href="<?cs var:discussion.href ?>/<?cs var:discussion.forum.id ?>/<?cs var:topic.id ?>"> 41 <?cs alt:topic.author ?> <?cs /alt ?> 42 </a> 43 </div> 38 44 </td> 39 45 <td class="lastreply"> 40 <a href="<?cs var:discussion.href ?>/<?cs var:discussion.forum.id ?>/<?cs var:topic.id ?>"> 41 <div class="lastreply"><?cs alt:topic.lastreply ?> <?cs /alt ?></div> 42 </a> 46 <div class="lastreply"> 47 <a href="<?cs var:discussion.href ?>/<?cs var:discussion.forum.id ?>/<?cs var:topic.id ?>"> 48 <?cs alt:topic.lastreply ?> <?cs /alt ?> 49 </a> 50 </div> 43 51 </td> 44 52 <td class="founded"> 45 <a href="<?cs var:discussion.href ?>/<?cs var:discussion.forum.id ?>/<?cs var:topic.id ?>"> 46 <div class="founded" ><?cs alt:topic.time ?> <?cs /alt ?></div> 47 </a> 53 <div class="founded" > 54 <a href="<?cs var:discussion.href ?>/<?cs var:discussion.forum.id ?>/<?cs var:topic.id ?>"> 55 <?cs alt:topic.time ?> <?cs /alt ?> 56 </a> 57 </div> 48 58 </td> 49 59 <td class="replies"> 50 <a href="<?cs var:discussion.href ?>/<?cs var:discussion.forum.id ?>/<?cs var:topic.id ?>"> 51 <div class="replies" ><?cs var:topic.replies ?></div> 52 </a> 60 <div class="replies" > 61 <a href="<?cs var:discussion.href ?>/<?cs var:discussion.forum.id ?>/<?cs var:topic.id ?>"> 62 <?cs var:topic.replies ?> 63 </a> 64 </div> 53 65 </td> 54 66 </tr> … … 60 72 <?cs /if ?> 61 73 62 < div class="buttons">63 < ?cs if:trac.acl.DISCUSSION_APPEND ?>64 < form method="post" action="<?cs var:discussion.href ?>/<?cs var:discussion.forum.id ?>">74 <?cs if:trac.acl.DISCUSSION_APPEND ?> 75 <form method="post" action="<?cs var:discussion.href ?>/<?cs var:discussion.forum.id ?>"> 76 <div class="buttons"> 65 77 <input type="submit" name="newtopic" value="New Topic"/> 66 78 <input type="hidden" name="forum" value="<?cs var:discussion.forum.id ?>"/> 67 79 <input type="hidden" name="discussion_action" value="add"/> 68 </form> 69 <?cs /if ?> 70 <?cs if:trac.acl.DISCUSSION_ADMIN ?> 71 <form method="post" action="<?cs var:discussion.href ?>"> 80 </div> 81 </form> 82 <?cs /if ?> 83 <?cs if:trac.acl.DISCUSSION_ADMIN ?> 84 <form method="post" action="<?cs var:discussion.href ?>"> 85 <div class="buttons"> 72 86 <input type="submit" name="deleteforum" value="Delete Forum" onclick="return confirm('Do you realy want to delete this forum?')"/> 73 87 <input type="hidden" name="forum" value="<?cs var:discussion.forum.id ?>"/> 74 <input type="hidden" name="discussion_action" value="delete" >75 </ form>76 < ?cs /if ?>77 < /div>88 <input type="hidden" name="discussion_action" value="delete"/> 89 </div> 90 </form> 91 <?cs /if ?> 78 92 79 <?cs include " footer.cs" ?>93 <?cs include "discussion-footer.cs" ?>
