More HTML swapped and admin contact link rewritten. Resolves #91
[mailer.git] / inc / modules / admin / what-theme_import.php
index cde282b..0ca4421 100644 (file)
@@ -119,46 +119,41 @@ array_pk_sort($THEMES, array("theme_name"));
 // Generate output lines for the template
 $OUT = ""; $SW = 2;
 foreach ($THEMES['theme_unix'] as $key => $unix) {
+       // Already installed is default
+       $FOUND = "<div class=\"admin_note\">{--ADMIN_THEME_ALREADY_INSTALLED--}</div>";
+
        // Check if current theme is already imported or not
-       if (THEME_CHECK_EXIST($unix)) {
-               // Already installed
-               $FOUND = "<div class=\"admin_note\">{--ADMIN_THEME_ALREADY_INSTALLED--}</div>";
-       } else {
+       if (!THEME_CHECK_EXIST($unix)) {
                // Theme not installed
-               $FOUND = "<form action=\"{!URL!}/modules.php?module=admin&amp;what=theme_import\" method=\"POST\">
-  <input type=\"submit\" name=\"ok\" class=\"admin_submit\" value=\"{--ADMIN_INSTALL_THEME--}\" />
-  <input type=\"hidden\" name=\"theme\" value=\"".$unix."\" />
-</form>";
-       }
+               $FOUND = LOAD_TEMPLATE("admin_theme_import_form", true, $unix);
+       } // END - if
 
-       // Add row
-       $OUT .= "<tr>
-  <td class=\"switch_sw".$SW." bottom2 right2\" align=\"center\" height=\"30\">".$unix."</td>
-  <td class=\"switch_sw".$SW." bottom2 right2\" align=\"center\">".$THEMES['theme_name'][$key]."</td>
-  <td class=\"switch_sw".$SW." bottom2 right2\" align=\"center\">
-    <a href=\"mailto:".$THEMES['theme_email'][$key]."?Subject=[Theme:] ".$THEMES['theme_name'][$key]." (".$unix.")"."\">".$THEMES['theme_author'][$key]."</a>
-  </td>
-  <td class=\"switch_sw".$SW." bottom2 right2\" align=\"center\">
-    <a href=\"".DEREFERER($THEMES['theme_url'][$key])."\" target=\"_blank\">".$THEMES['theme_url'][$key]."</a>
-  </td>
-  <td class=\"switch_sw".$SW." bottom2 right2\" align=\"center\">v".$THEMES['theme_ver'][$key]."</td>
-  <td class=\"switch_sw".$SW." bottom2\" align=\"center\">
-    ".$FOUND."
-  </td>
-</tr>\n";
+       // Prepare content
+       $content = array(
+               'sw'      => $SW,
+               'unix'    => $unix,
+               'name'    => $THEMES['theme_name'][$key],
+               'email'   => $THEMES['theme_email'][$key],
+               'author'  => $THEMES['theme_author'][$key],
+               'link'    => DEREFERER($THEMES['theme_url'][$key]),
+               'url'     => $THEMES['theme_url'][$key],
+               'version' => $THEMES['theme_ver'][$key],
+               'form'    => $FOUND
+       );
+
+       // Add row template
+       $OUT .= LOAD_TEMPLATE("admin_theme_import_row", true, $content);
 
        // Switch color
        $SW = 3 - $SW;
-}
+} // END - foreach
 
 if (empty($OUT)) {
        // No themes found???
-       $OUT .= "<tr>
-  <td colspan=\"6\" class=\"bottom2\" height=\"80\">
-    ".LOAD_TEMPLATE("admin_settings_saved", true, getMessage('ADMIN_NO_THEMES_FOUND'))."
-  </td>
-</tr>\n";
+       $OUT .= LOAD_TEMPLATE("admin_theme_import_none", true, LOAD_TEMPLATE("admin_settings_saved", true, getMessage('ADMIN_NO_THEMES_FOUND')));
 } // END - if
+
+// Set the generated list
 define('__THEME_LIST', $OUT);
 
 // Load template