Changeset 1125

Timestamp:

04/18/10 16:38:13 (2 years ago)

Author:

wefgef

Message:

Added tabs for round edit pages.

Location:

trunk/www

Files:

• controllers/round.php (modified) (1 diff)
• url.php (modified) (1 diff)
• views/round_edit.php (modified) (1 diff)
• views/round_edit_header.php (added)
• views/textblock_edit.php (modified) (1 diff)
• views/textblock_header.php (modified) (1 diff)

trunk/www/controllers/round.php

@@ -185 +185 @@
 
         flash("Runda a fost modificata cu succes.");
-        redirect(url_round_edit($round_id));
+        redirect(url_round_edit_params($round_id));
     }
 

trunk/www/url.php

@@ -294 +294 @@
 }
 
+function url_round($round_id) {
+    log_assert(is_round_id($round_id));
+    $round = round_get($round_id);
+    return url_complex($round['page_name']);
+}
+
 function url_round_edit($round_id) {
     log_assert(is_round_id($round_id));
-    return url_complex("admin/runda/$round_id");
+    $round = round_get($round_id);
+    return url_complex($round['page_name'], array('action' => 'edit'));
+}
+
+function url_round_edit_params($round_id) {
+    log_assert(is_round_id($round_id));
+    return url_complex("admin/runda/" . $round_id);
 }
 

trunk/www/views/round_edit.php

@@ -11 +11 @@
 require_once(IA_ROOT_DIR."common/round.php");
 require_once(IA_ROOT_DIR."www/format/form.php");
+require_once(IA_ROOT_DIR."www/views/round_edit_header.php");
 include('views/header.php');
+
+echo round_edit_tabs($view['round_id'], 'round-edit-params');
 
 $can_tag = identity_can('round-tag', $round);

trunk/www/views/textblock_edit.php

@@ -15 +15 @@
 <h1>Editare enunț <a href="<?= html_escape(url_task($task_id)) ?>">
 <?= html_escape($task_id) ?></a></h1>
+<?php }
+
+// insert round edit tabs
+if (($round_id = textblock_security_is_round($page['security'])) &&
+    (identity_can('round-edit', $round = round_get($round_id)))) {
+    require_once(IA_ROOT_DIR."www/views/round_edit_header.php");
+    echo round_edit_tabs($round_id, request("action"));
+?>
+<h1>Editare pagină <a href="<?= html_escape(url_round($round_id)) ?>">
+<?= html_escape($round['title']) ?></a></h1>
 <?php } ?>
 

trunk/www/views/textblock_header.php

@@ -9 +9 @@
 <div id="wikiOps">
     <ul>
+
 <?php if (($task_id = textblock_security_is_task($textblock['security'])) &&
           identity_can('task-edit', $task = task_get($task_id))) { ?>
 <li><?= format_link_access(url_task_edit($task['id']), 'Editează', 'e') ?></li>
+<?php } elseif (($round_id = textblock_security_is_round($textblock['security']))
+                && identity_can('round-edit', $round = round_get($round_id))) { ?>
+<li><?= format_link_access(url_round_edit($round['id']), 'Editează', 'e') ?></li>
 <?php } elseif(identity_can('textblock-edit', $textblock)) { ?>
 <li><?= format_link_access(url_textblock_edit($textblock['name']), 'Editează', 'e') ?></li>
 <?php } ?>
-<?php if (($round_id = textblock_security_is_round($textblock['security'])) && identity_can('round-edit', $round = round_get($round_id))) { ?>
-<li><?= format_link_access(url_round_edit($round['id']), 'Editează parametri', 'p') ?></li>
-<?php } ?>
+
 <?php if (identity_can('textblock-history', $textblock)) { ?>
 <li><?= format_link_access(url_textblock_history($textblock['name']), 'Istoria', 'i') ?></li>