Some cosmetic improvements

redhog · Aug 29, 2010 · b5f39dc · b5f39dc
1 parent 8df4e61
commit b5f39dc
Show file tree

Hide file tree

Showing 5 changed files with 102 additions and 11 deletions.
diff --git a/dbinterface/law.php b/dbinterface/law.php
@@ -90,5 +90,40 @@
       && !isset($_POST["law_edit_continue"])) {
    $_SESSION["laweditor"] = array('laws' => $laws, 'current' => 0);
   }
+
+  $law_proposal = array();
+  if (isset($proposals)) {
+
+   $sql = "select
+	    category,
+	    path,
+	    breakpoint,
+	    referendum,
+	    title,
+	    sum,
+	    start,
+	    area,
+	    completed
+	   from
+	    referendum_status as v
+	   where     {$new_referendums_sql}
+	   order by completed asc";
+   $rows = pg_query($dbconn, $sql)
+    or die('Uanble to query for paragraphs');
+   $sql_names = array('category',
+		      'path',
+		      'breakpoint',
+		      'referendum',
+		      'title',
+		      'sum',
+		      'start',
+		      'area',
+		      'completed');
+   while ($row = pg_fetch_row($rows)) {
+    $law_proposal[] = array_combine($sql_names, $row);
+   }
+
+  }
+
  }
 ?>
diff --git a/general.css b/general.css
@@ -83,12 +83,7 @@ textarea {
  border-color: #000000;
 }
 
-h1 a,
-h2 a,
-h3 a,
-h4 a,
-h5 a,
-dt a {
+a {
  text-decoration: none;
 }
 

diff --git a/law-editor.css b/law-editor.css
@@ -198,3 +198,12 @@ div.law_info a {
  border: 1px solid #000000;
  background: #ffffff;
 }
+
+ul.law_proposal_list {
+ list-style-type: none;
+ padding-left: 0;
+}
+
+ul.law_proposal_list * {
+ white-space: nowrap;
+}
diff --git a/views/ui/law.php b/views/ui/law.php
@@ -176,17 +176,50 @@ function drawLaw($level, $node) {
   foreach ($_GET as $key => $value)
    if (!beginsWith($key, 'law_'))
     echo "<input name='{$key}' value='{$value}' type='hidden'>\n";
-  echo "<table>\n";
-  echo "<tr>" . drawSearchField(T_("Show paragraphs as of"), 'law_date', false, 'match') . "</tr>\n";
-  echo "<tr>" . drawSearchField(T_("Show differences introduced by"), 'law_proposal', false, 'match') . "</tr>\n";
-  echo "<tr>" . drawSearchField(T_("Show"), 'law_show',
+  echo "<table>";
+  echo " <tr>";
+  echo "  <td>";
+
+  echo "   <table>\n";
+  echo "    <tr>" . drawSearchField(T_("Show paragraphs as of"), 'law_date', false, 'match') . "</tr>\n";
+  echo "    <tr>" . drawSearchField(T_("Show"), 'law_show',
 				array(T_("Deleted paragraphs") => 'deleted',
 				      T_("Last change") => 'referendum'
 				     ),
 				'list') . "</tr>\n";
   echo drawInputRow("",
 		     "<input type='submit' name='selectdate_law' value='" . T_("Show") . "' />");
-  echo "</table>\n";
+  echo "   </table>\n";
+  echo "  </td>";
+  echo "  <td>";
+
+  echo "   <table>\n";
+  echo "    <tr>" . drawSearchField(T_("Show differences introduced by"), 'law_proposal', false, 'match') . "</tr>\n";
+  echo "    <tr>";
+  echo "     <td>";
+  echo "     </td>";
+  echo "     <td>";
+
+  echo "      <ul class='law_proposal_list'>";
+  foreach ($law_proposal as $proposal) {
+   $proposals = array();
+   if (isset($_GET["law_proposal"]) && $_GET["law_proposal"]) {
+     $proposals = explode(',', $_GET["law_proposal"]);
+   }
+   unset($proposals[array_search($proposal['referendum'], $proposals)]);
+   $proposals = implode(",", $proposals);
+   $url = '?' . queryString(queryConstruct(array('law_proposal' => $proposals)));
+   printf("    <li><a href='%s'>%s: %s</a></li>", $url, $proposal['referendum'], $proposal['title']);
+  }
+  echo "      </ul>";
+
+  echo "     </td>\n";
+  echo "    </tr>\n";
+  echo "   </table>\n";
+  echo "  </td>";
+  echo " </tr>";
+  echo "</table>";
+
   echo "</form>\n";
  }
 

diff --git a/views/ui/listreferendums.php b/views/ui/listreferendums.php
@@ -190,6 +190,25 @@
        }
       }
 
+     if ($category_type == "law") {
+      $proposals = array();
+      if (isset($_GET["law_proposal"]) && $_GET["law_proposal"]) {
+	$proposals = explode(',', $_GET["law_proposal"]);
+      }
+      foreach ($referendums as $attr) {
+       $proposals[] = $attr['referendum'];
+      }
+      $proposals = implode(",", $proposals);
+      $url = '?' . queryString(queryConstruct(array('categoryview' => 'law',
+						    'law_show__deleted_list' => 'on',
+						    'law_date' => $attr['completed'],
+						    'law_show__referendum_list' => '1',
+						    'law_proposal' => $proposals)));
+    ?>
+      <tr><td></td><td></td><td></td><td></td><td></td><td></td><td><?php printf("<a href='%s'>%s</a>\n", $url, T_("Law view")); ?></td></tr>
+    <?php
+     }
+
      if ($_GET['categoryview'] == 'referendums')
       {
     ?>