Changeset 1083

Timestamp:

12/21/09 14:03:40 (2 years ago)

Author:

bogdan2412

Message:

Many small fixes from live.

• Moved admin/task_tags to admin/task-tags because that's apparently how we do urls.
• Fixed autocomplete showing up only under the first tag form in the page.
• Added "number of tasks" column to admin/task-tags page and made it and "Operations" column fixed width.
• Disabled deletion of algorithm tags that are in use.
• Allow ( and ) in algorithm tags. (for Sortare O(NlogN))
• Made age_group no longer depend on the contest.

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

Location:

trunk

Files:

• common/common.php (modified) (1 diff)
• common/tags.php (modified) (1 diff)
• www/controllers/task.php (modified) (1 diff)
• www/controllers/task_tags.php (modified) (2 diffs)
• www/index.php (modified) (1 diff)
• www/static/css/screen.css (modified) (2 diffs)
• www/static/css/wick.css (modified) (1 diff)
• www/static/js/inline_form.js (modified) (1 diff)
• www/url.php (modified) (1 diff)
• www/views/tags_header.php (modified) (5 diffs)
• www/views/task_edit.php (modified) (1 diff)
• www/views/task_tags.php (modified) (4 diffs)

trunk/common/common.php

@@ -47 +47 @@
 define("IA_RE_ROUND_ID", '[a-z0-9][a-z0-9_\-\.]*');
 define("IA_RE_TASK_ID", '(?-i:[a-z0-9][a-z0-9_\-\.]*)');
-define("IA_RE_TAG_NAME", '[a-z0-9\-\.\ \@]+');
+define("IA_RE_TAG_NAME", '[a-z0-9\-\.\ \@\(\)]+');
 define("IA_RE_SCORE_NAME", '[a-z0-9][a-z0-9_\-\.]*');
 define("IA_RE_USER_NAME", '[_@a-z0-9][a-z0-9_\-\.\@]*');

trunk/common/tags.php

@@ -62 +62 @@
     foreach ($parent_tags as $key => $tag) {
         $parent_tags[$key]['sub_tags'] = Array();
-        $parent_tags_key[ $tag['tag_id'] ] = $key;
+        $parent_tags_key[$tag['tag_id']] = $key;
     }
 
     foreach ($sub_tags as $tag) {
-        log_assert(isset($parent_tags_key[ $tag['tag_parent'] ]), "Child tag doesn't have a parent");
-        $parent_tag_key = $parent_tags_key[ $tag['tag_parent'] ];
-        $parent_tags[ $parent_tag_key ]['sub_tags'][] = $tag;
+        log_assert(isset($parent_tags_key[$tag['tag_parent']]), "Child tag doesn't have a parent");
+        $parent_tag_key = $parent_tags_key[$tag['tag_parent']];
+        $parent_tags[$parent_tag_key]['sub_tags'][] = $tag;
     }
 

trunk/www/controllers/task.php

@@ -66 +66 @@
     // Tag data
     $tag_types = Array('author', 'contest', 'year', 'round', 'age_group');
-    $tag_parents = Array('year' => 'contest', 'round' => 'year', 'age_group' => 'contest');
+    $tag_parents = Array('year' => 'contest', 'round' => 'year');
 
     // FIXME: tags that have children such as contest, year or round should have only one tag

trunk/www/controllers/task_tags.php

@@ -12 +12 @@
         $category["sub_tags"] = tag_get_all(array("algorithm"),
             $category["id"]);
+        foreach ($category["sub_tags"] as &$tag) {
+            $tag["task_count"] = tag_count_objects("task", array($tag["id"]));
+        }
     }
 
@@ -69 +72 @@
     }
 
+    // Do not delete tags if they have been added to tasks.
+    if ($tag["type"] == "algorithm") {
+        $task_count = tag_count_objects("task", array($tag_id));
+    } else if ($tag["type"] == "method") {
+        $task_count = 0;
+        $sub_tags = tag_get_all(array("algorithm"), $tag_id);
+        foreach ($sub_tags as $sub_tag) {
+            $task_count += tag_count_objects("task", array($sub_tag["id"]));
+        }
+    }
+    if ($task_count != 0) {
+        flash_error("Nu poti sterge un tag care a fost asociat deja unei probleme.");
+        redirect(url_task_tags());
+    }
+
     tag_delete_by_id($tag_id);
     flash("Tag-ul a fost sters.");

trunk/www/index.php

@@ -96 +96 @@
 
 // Task algorithm tags
-else if ($page == 'admin/task_tags') {
+else if ($page == 'admin/task-tags') {
     require_once(IA_ROOT_DIR.'www/controllers/task_tags.php');
     if (request("action") == "add") {

trunk/www/static/css/screen.css

@@ -552 +552 @@
 
 input[type='text'], input[type='password'], select {
-    width: 150px;
+    width: 250px;
 }
 
@@ -1524 +1524 @@
 
 /* Task algorithm tags page */
-.task_tag_actions {
+.task-tag-actions {
     margin: 0.5em;
 }
-ul.task_tag_actions li {
+ul.task-tag-actions li {
     display: inline;
 }
+
+.tag-table .tag-task-count {
+    width: 20%;
+}
+.tag-table .tag-operations {
+    width: 25%;
+}

trunk/www/static/css/wick.css

@@ -28 +28 @@
     color:black;
     padding: 0;
+    width: 257px;
 }
 

trunk/www/static/js/inline_form.js

@@ -6 +6 @@
     var initialText = toggleElement.innerHTML;
     formElement.style.display = "none";
-    connect(toggleElement, "onclick", function() {
+    connect(toggleElement, "onclick", function(e) {
+        e.preventDefault();
         if (formElement.style.display == "none") {
             // Display inline form and replace toggleElement with "Anuleaza"

trunk/www/url.php

@@ -272 +272 @@
 
 function url_task_tags() {
-    return url_complex("admin/task_tags");
+    return url_complex("admin/task-tags");
 }
 
 function url_task_tags_add() {
-    return url_complex("admin/task_tags", array("action" => "add"));
+    return url_complex("admin/task-tags", array("action" => "add"));
 }
 
 function url_task_tags_delete() {
-    return url_complex("admin/task_tags", array("action" => "delete"));
+    return url_complex("admin/task-tags", array("action" => "delete"));
 }
 
 function url_task_tags_rename() {
-    return url_complex("admin/task_tags", array("action" => "rename"));
+    return url_complex("admin/task-tags", array("action" => "rename"));
 }
 

trunk/www/views/tags_header.php

@@ -9 +9 @@
 // Format a tag input box
 // FIXME: Width parameter does not work, I hate CSS
-function tag_format_input_box($field, $value = null, $width = "50", $name = "tags", $autocomplete = true) {
+function tag_format_input_box($field, $value = null, $width = "50", $name = "tags") {
     $esc_name = html_escape($field['name']);
     $esc_width = html_escape($width);
@@ -16 +16 @@
     $output = '<li><label for="form_'.$esc_name.'">'.$field['label'].'</label>';
     $output .= ferr_span($name);
-    $output .= '<input class="wickEnabled" type="text" name="'.$esc_name.
+    $output .= '<input class="wickEnabled:wick_'.$name.'" type="text" name="'.$esc_name.
                '" id="form_'.$esc_name.'"';
     if (!is_null($width)) {
@@ -24 +24 @@
         $output .= ' value="'.$value.'"';
     }
-    $output .= ' />';
-    $output .= '<script type="text/javascript" language="JavaScript" src="'.
-                html_escape(url_static("js/wick.js")).'"></script>';
+    $output .= ' autocomplete="off" />';
+    $output .= '<table id="wick_'.$name.'" class="floater"><tr><td><div class="wick_content"></div></td></tr></table>';
     $output .= "</li>";
     return $output;
@@ -34 +33 @@
 <link rel="stylesheet" type="text/css" href="<?= html_escape(url_static("css/wick.css")) ?> " />
 <script type="text/javascript" language="JavaScript">
+/* <![CDATA[ */
 function checkForm() {
     answer = true;
@@ -49 +49 @@
 echo "];\n";
 ?>
+/* ]]> */
 </script>
+<script type="text/javascript" language="JavaScript" src="<?php echo html_escape(url_static("js/wick.js")) ?>"></script>

trunk/www/views/task_edit.php

@@ -146 +146 @@
             <?php
                 foreach (array_keys($tag_fields) as $tag) {
-                    echo tag_format_input_box($tag_fields[$tag], fval('tag_'.$tag), 50, 'tag_'.$tag, false);
+                    echo tag_format_input_box($tag_fields[$tag], fval('tag_'.$tag), 50, 'tag_'.$tag);
                 }
             ?>

trunk/www/views/task_tags.php

@@ -46 +46 @@
     array(
         'title' => 'Tag',
-        'rowform' => 'format_tag_name'
+        'rowform' => 'format_tag_name',
+        'css_class' => 'tag-name',
+    ),
+    array(
+        'title' => 'Numar probleme',
+        'key' => 'task_count',
+        'css_class' => 'tag-task-count',
     ),
     array(
         'title' => 'Operatii',
         'rowform' => 'format_operations',
+        'css_class' => 'tag-operations',
     ),
 );
@@ -57 +64 @@
 
 <h1>Editare taguri algoritmi</h1>
-<div id="add_category" class="task_tag_actions">
+<div id="add_category" class="task-tag-actions">
 [<a href="#">Adauga categorie noua</a><?php
     echo inline_post_form(url_task_tags_add(), array("type" => "method"), "", "Adauga");
@@ -66 +73 @@
 ?>
     <h2><?php echo html_escape($category["name"]); ?></h2>
-    <ul class="task_tag_actions">
+    <ul class="task-tag-actions">
         <li class="algorithm_tag_add">[<a class="toggle_add" href="#">Adauga tag nou</a><?php
             echo inline_post_form(url_task_tags_add(),
@@ -82 +89 @@
     <?php
     echo format_table($category["sub_tags"], $column_infos,
-        array('css_class' => 'category fill-screen'));
+        array('css_class' => 'category fill-screen tag-table'));
     ?>
 <?php