Changeset 2246 for branches

Timestamp:

11/26/10 13:08:53 (18 months ago)

Author:

nick_ramsay

Message:

[1.5] Merged 1.4.2 plugin management theme changes into 1.5.

Location:

branches/1.5/content

Files:

• admin_language.php (modified) (2 diffs)
• admin_themes/admin_default/plugin_management.php (modified) (6 diffs)

branches/1.5/content/admin_language.php

@@ -103 +103 @@
 $lang["admin_theme_plugins_order_down"] = "Move down";
 $lang["admin_theme_plugins_details"] = "Details";
-$lang["admin_theme_plugins_update_available"] = "Update available";
 $lang["admin_theme_plugins_requires"] = "Requires";
 $lang["admin_theme_plugins_description"] = "Description";
@@ -262 +261 @@
 
 /* footer */
-$lang["admin_theme_footer_having_trouble_vist_forums"] = "Having trouble? Read the <a href='http://hotarudocs.com'>Documentation</a> or ask for help in the <a href='http://forums.hotarucms.org'>Forums</a>.";
+$lang["admin_theme_footer_having_trouble_vist_forums"] = "Having trouble? Read the <a href='http://docs.hotarucms.org'>Documentation</a> or ask for help in the <a href='http://forums.hotarucms.org'>Forums</a>.";
 
 /* 404 */

branches/1.5/content/admin_themes/admin_default/plugin_management.php

@@ -44 +44 @@
                                         &nbsp;&nbsp;<img src='<?php echo ADMIN_THEME_URL ?>images/down_12.png' alt=""><?php echo $h->lang["admin_theme_plugins_order_down"]; ?>
                                         &nbsp;&nbsp;<img src='<?php echo ADMIN_THEME_URL ?>images/info_16.png' alt=""><?php echo $h->lang["admin_theme_plugins_details"]; ?>
-                                        &nbsp;&nbsp;<img src='<?php echo ADMIN_THEME_URL ?>images/info_green_16.png' alt=""><?php echo $h->lang["admin_theme_plugins_update_available"]; ?>
                                         &nbsp;&nbsp;<img src='<?php echo ADMIN_THEME_URL ?>images/uninstall_16.png' alt=""><?php echo $h->lang["admin_theme_plugins_uninstall"]; ?>
-                                        <?php if (SYS_UPDATES == "true") { ?>
-                                                <div class="plugin_management_right">
-                                                <?php
-                                                /* <a href="<?php echo SITEURL ?>admin_index.php?page=plugin_search">
-                                                  <img src='<?php echo ADMIN_THEME_URL ?>images/search.png' alt="">
-                                                  <?php echo $h->lang["admin_theme_search"]; ?>
-                                                  </a> */
-                                                ?>
-                                                &nbsp;&nbsp;
-                                                <a href="<?php echo SITEURL ?>admin_index.php?page=plugin_management&amp;action=version_check">
-                                                        <img src='<?php echo ADMIN_THEME_URL ?>images/update_16.png' alt="">
-                                                        <?php echo $h->lang["admin_theme_check_latest_plugin_versions"]; ?>
-                                                </a>
-                                        </div>
-                                        <?php } ?>
                                 </div>
                         </td>
@@ -66 +50 @@
                 <tr>
                 <?php
-                                        $the_plugins = $h->vars['installed_plugins'];
+                        $the_plugins = $h->vars['installed_plugins'];
                         if($the_plugins)
                         {
@@ -80 +64 @@
                                                 $alt++;
                                                 $info_icon = 'info_16.png';
-                                                $update = false;
-                                                if (isset($plug['latestversion'])) {
-                                                        if ($plug['latestversion'] > $plug['version']) {
-                                                                $update = true;
-                                                                $info_icon = 'info_green_16.png';
-                                                        }
-                                                }
                                         ?>
                                         <tr class="table_tr table_row_<?php echo $alt % 2; ?>">
@@ -125 +102 @@
                                                         <br />
                                                         <?php echo $h->lang["admin_theme_plugins_more_info"]; ?>: <a href='<?php echo SITEURL; ?>content/plugins/<?php echo $plug['folder']; ?>/readme.txt' title='<?php echo $h->lang["admin_theme_plugins_readme"]; ?>'> <?php echo $h->lang["admin_theme_plugins_readmetxt"]; ?></a>
-                                                <?php } ?>
-                                                <?php if ($update) { ?>
-                                                        <br/><a href='<?php echo SITEURL; ?>admin_index.php?page=plugin_management&action=update&plugin=<?php echo $plug['folder']; ?>&version=<?php echo $plug['latestversion']?>' title=''><?php echo $h->lang['admin_theme_update_this_plugin'];?></a>
                                                 <?php } ?>
                                                 </td>
@@ -192 +166 @@
                                                 $alt++;
                                                 $info_icon = 'info_16.png';
-                                                $update = false;
-                                                if (isset($plug['latestversion'])) {
-                                                        if ($plug['latestversion'] > $plug['version']) {
-                                                                $update = true;
-                                                                $info_icon = 'info_green_16.png';
-                                                        }
-                                                }
                                         ?>
                                         <tr id='table_tr' class="table_row_<?php echo $alt % 2; ?>">
@@ -232 +199 @@
                                                         </a>
                                                 <?php } ?>
-                                                <?php if ($update) {?>
-                                                        <br/><a href='<?php echo SITEURL; ?>admin_index.php?page=plugin_management&amp;action=update&plugin=<?php echo $plug['folder']; ?>&version=<?php echo $plug['latestversion']; ?>' title=''><?php echo $h->lang['admin_theme_update_this_plugin'];?></a>
-                                                <?php } ?>
                                                 </td>
                                                 <td class='table_description_close'>