Changeset 1082

Timestamp:

12/17/09 00:12:09 (2 years ago)

Author:

bogdan2412

Message:

Changes from live.

• Changed newsletter email and name.
• Fixed task_edit crashing for empty tags.
• Made task algorithm tags interface more pretty and xhtml valid.

Review URL: ​http://reviewboard.infoarena.ro/r/121/

Location:

trunk

Files:

• common/db/score.php (modified) (1 diff)
• scripts/send-newsletter (modified) (1 diff)
• www/controllers/task.php (modified) (1 diff)
• www/static/css/screen.css (modified) (1 diff)
• www/views/task_tags.php (modified) (3 diffs)

trunk/common/db/score.php

@@ -35 +35 @@
             ($round_id === null ? 'NULL' : "'".db_escape($round_id)."'"),
             $value);
-    //log_print($query);
     return db_query($query);
 }

trunk/scripts/send-newsletter

@@ -15 +15 @@
 // Configuration section.
 
-define("IA_NEWSLETTER_FROM", "cristian@infoarena.ro");
-define("IA_NEWSLETTER_FROM_NAME", "Cristian George Strat");
+define("IA_NEWSLETTER_FROM", "newsletter@infoarena.ro");
+define("IA_NEWSLETTER_FROM_NAME", "Newsletter Infoarena");
 // how many emails to send at once (with no delay)
 define("IA_BURST_LENGTH", 25);

trunk/www/controllers/task.php

@@ -152 +152 @@
                     $parent = 0;
                     if (isset($tag_parents[$type])) {
-                        $parent = $tags[$tag_parents[$type]][0];
+                        if (count($tags[$tag_parents[$type]]) > 0) {
+                            $parent = $tags[$tag_parents[$type]][0];
+                        }
                     }
                     $tags[$type] = tag_update('task', $new_task['id'], $type,

trunk/www/static/css/screen.css

@@ -1522 +1522 @@
     padding: 0;
 }
+
+/* Task algorithm tags page */
+.task_tag_actions {
+    margin: 0.5em;
+}
+ul.task_tag_actions li {
+    display: inline;
+}

trunk/www/views/task_tags.php

@@ -56 +56 @@
 ?>
 
-<span id="add_category">
+<h1>Editare taguri algoritmi</h1>
+<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");
 ?>]
-</span>
+</div>
 <?php
 foreach ($categories as $category) {
 ?>
-    <h1><?php echo html_escape($category["name"]); ?></h1>
-    <span class="algorithm_tag_add">[<a class="toggle_add" href="#">Adauga tag nou</a><?php
-        echo inline_post_form(url_task_tags_add(),
-            array("type" => "algorithm", "parent" => $category["id"]),
-            "", "Adauga");
-    ?>]</span>
-    <span class="delete_method">[<?php echo format_post_link(url_task_tags_delete(), "Sterge categorie",
-        array("type" => "method", "name" => $category["name"])); ?>]</span>
-    <span class="rename_method">[<a class="toggle_rename" href="#">Redenumeste categorie</a><?php
-        echo inline_post_form(url_task_tags_rename(),
-            array("type" => "method", "old_name" => $category["name"]),
-            $category["name"], "Redenumeste");
-    ?>]</span>
+    <h2><?php echo html_escape($category["name"]); ?></h2>
+    <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(),
+                array("type" => "algorithm", "parent" => $category["id"]),
+                "", "Adauga");
+        ?>]</li>
+        <li class="delete_method">[<?php echo format_post_link(url_task_tags_delete(), "Sterge categorie",
+            array("type" => "method", "name" => $category["name"])); ?>]</li>
+        <li class="rename_method">[<a class="toggle_rename" href="#">Redenumeste categorie</a><?php
+            echo inline_post_form(url_task_tags_rename(),
+                array("type" => "method", "old_name" => $category["name"]),
+                $category["name"], "Redenumeste");
+        ?>]</li>
+    </ul>
     <?php
     echo format_table($category["sub_tags"], $column_infos,
@@ -86 +89 @@
 <script type="text/javascript" src="<?= html_escape(url_static('js/inline_form.js')) ?>"></script>
 <script type="text/javascript">
+/* <![CDATA[ */
 // Bind add method link to form
 addLoadEvent(function() {
@@ -112 +116 @@
     bindToggleLinkToForm(renameMethodLinks[i], renameMethodForms[i]);
 }
+/* ]]> */
 </script>
 <?php