Changeset 1118 for trunk

Timestamp:

03/22/10 03:43:03 (2 years ago)

Author:

wefgef

Message:

Proper security UI

• Added a select instead of the input field for the security level of a wiki page.

REVIEW URL ​http://reviewboard.infoarena.ro/r/142/

Location:

trunk/www

Files:

• controllers/textblock_edit.php (modified) (2 diffs)
• static/css/screen.css (modified) (1 diff)
• views/textblock_edit.php (modified) (2 diffs)

trunk/www/controllers/textblock_edit.php

@@ -34 +34 @@
     $values['text'] = request('text', $page['text']);
     $values['title'] = request('title', $page['title']);
-    $values['security'] = request('security', $page['security']);
+
+    $security_values = array_map('trim', explode(':', $page['security']));
+    $values['security'] = request('security', $security_values[0]);
+    if (count($security_values) > 1) {
+        $values['security_special'] = request('security_special', $security_values[1]);
+    } else {
+        $values['security_special'] = request('security_special', '');
+    }
+
     $values['forum_topic'] = request('forum_topic', $page['forum_topic']);
     $values['tags'] = request('tags', tag_build_list("textblock", $page_name, "tag"));
@@ -45 +53 @@
         $new_page['text'] = $values['text'];
         $new_page['title'] = $values['title'];
-        $new_page['security'] = $values['security'];
+
+        if ($values['security_special'] != '') {
+            $new_page['security'] = sprintf('%s: %s', $values['security'],
+                                            $values['security_special']);
+        } else {
+            $new_page['security'] = $values['security'];
+        }
+
         $new_page['forum_topic'] = $values['forum_topic'];
         $new_page['creation_timestamp'] = $values['creation_timestamp'];

trunk/www/static/css/screen.css

@@ -1546 +1546 @@
     margin: 0 .5em .5em 2em;
 }
+
+/* Proper Security UI */
+.security_show {
+    display: inline;
+    margin-left: 0.5em;
+}
+
+.security_hide {
+    display: none;
+}

trunk/www/views/textblock_edit.php

@@ -16 +16 @@
 <?= html_escape($task_id) ?></a></h1>
 <?php } ?>
+
+<script type="text/javascript">
+    function toggleSpecial() {
+        var select = document.getElementById("security_select");
+        var option = select.options[select.selectedIndex].value;
+        var special = document.getElementById("special");
+
+        if (option == "round" || option == "task") {
+            special.className = "security_show";
+        } else {
+            special.className = "security_hide";
+        }
+    }
+</script>
 
 <form accept-charset="utf-8" action="<?= html_escape(url_textblock_edit($page_name)) ?>" method="post" id="form_wikiedit" <?= tag_form_event() ?>>
@@ -60 +74 @@
     <li id="field_security">
         <label for="form_security">Nivel de securitate al paginii
-        <a href="<?= html_escape(url_textblock('documentatie/securitate')) ?>">(?)</a></label> 
-        <input type="text" name="security" value="<?= fval('security') ?>" id="form_security" />
+        <a href="<?= html_escape(url_textblock('documentatie/securitate')) ?>">(?)</a></label>
+
+        <select id="security_select" name="security" onchange="toggleSpecial()">
+        <?php
+            $options = array(
+                array('value' => 'public', 'html' => 'Public'),
+                array('value' => 'protected', 'html' => 'Protected'),
+                array('value' => 'private', 'html' => 'Private'),
+                array('value' => 'round', 'html' => 'Round'),
+                array('value' => 'task', 'html' => 'Task')
+            );
+
+            foreach ($options as $option) {
+                if ($option['value'] == fval('security')) {
+                    echo sprintf('<option value="%s" selected="selected">%s
+                                 </option>', $option['value'], $option['html']);
+                } else {
+                    echo sprintf('<option value="%s">%s</option>',
+                                 $option['value'], $option['html']);
+                }
+            }
+        ?>
+        </select>
+
+        <?php
+            if (in_array(fval('security'), array('round', 'task'))) {
+                $css_class = "security_show";
+            } else {
+                $css_class = "security_hide";
+            }
+
+            echo sprintf('<input name="security_special" id="special"
+                          type="text" value="%s" class="%s">',
+                          fval('security_special'), $css_class);
+        ?>
+
         <?= ferr_span('security') ?>
     </li>