diff options
Diffstat (limited to 'views/default/admin')
| -rw-r--r-- | views/default/admin/main.php | 29 | ||||
| -rw-r--r-- | views/default/admin/main_opt/plugins.php | 20 | ||||
| -rw-r--r-- | views/default/admin/main_opt/site.php | 16 | ||||
| -rw-r--r-- | views/default/admin/main_opt/statistics.php | 16 | ||||
| -rw-r--r-- | views/default/admin/main_opt/user.php | 16 | ||||
| -rw-r--r-- | views/default/admin/plugins.php | 103 | ||||
| -rw-r--r-- | views/default/admin/plugins_opt/plugin.php | 75 | ||||
| -rw-r--r-- | views/default/admin/site.php | 32 | ||||
| -rw-r--r-- | views/default/admin/statistics.php | 22 | ||||
| -rw-r--r-- | views/default/admin/statistics_opt/basic.php | 61 | ||||
| -rw-r--r-- | views/default/admin/statistics_opt/numentities.php | 90 | ||||
| -rw-r--r-- | views/default/admin/statistics_opt/online.php | 30 | ||||
| -rw-r--r-- | views/default/admin/user.php | 35 | ||||
| -rw-r--r-- | views/default/admin/user_opt/adduser.php | 18 | ||||
| -rw-r--r-- | views/default/admin/user_opt/search.php | 22 |
15 files changed, 280 insertions, 305 deletions
diff --git a/views/default/admin/main.php b/views/default/admin/main.php index 7922de906..fc143244d 100644 --- a/views/default/admin/main.php +++ b/views/default/admin/main.php @@ -1,19 +1,12 @@ <?php - - /** - * Elgg administration main screen - * - * @package Elgg - * @subpackage Core - - * @author Curverider Ltd - - * @link http://elgg.org/ - */ - - // Description of what's going on - echo "<p>" . elgg_view('output/longtext', array('value' => elgg_echo("admin:description"))) . "</p>"; - - - -?>
\ No newline at end of file +/** + * Elgg administration main screen + * + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @link http://elgg.org/ + */ + +// Description of what's going on +echo "<p>" . elgg_view('output/longtext', array('value' => elgg_echo("admin:description"))) . "</p>"; diff --git a/views/default/admin/main_opt/plugins.php b/views/default/admin/main_opt/plugins.php index 33467f7a2..b1e2f0078 100644 --- a/views/default/admin/main_opt/plugins.php +++ b/views/default/admin/main_opt/plugins.php @@ -1,17 +1,17 @@ <?php - /** - * Elgg plugin sub-component on the main menu. - * - * @package Elgg - * @subpackage Core - * @author Curverider Ltd - * @link http://elgg.org/ - */ +/** + * Elgg plugin sub-component on the main menu. + * + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @link http://elgg.org/ + */ - global $CONFIG; +global $CONFIG; ?> <div class="admin-menu-option"> <h2><?php echo elgg_echo('admin:plugins'); ?> </h2> <p><?php echo elgg_echo('admin:plugins:opt:description'); ?><br /> - <a href="<?php echo $CONFIG->wwwroot . "pg/admin/plugins/"; ?>"><?php echo elgg_echo('admin:plugins:opt:linktext'); ?></a></p> + <a href="<?php echo $CONFIG->wwwroot . "pg/admin/plugins/"; ?>"><?php echo elgg_echo('admin:plugins:opt:linktext'); ?></a></p> </div>
\ No newline at end of file diff --git a/views/default/admin/main_opt/site.php b/views/default/admin/main_opt/site.php index 0cfd9f70c..7c34015ba 100644 --- a/views/default/admin/main_opt/site.php +++ b/views/default/admin/main_opt/site.php @@ -1,12 +1,12 @@ <?php - /** - * Elgg site sub-component on the main menu. - * - * @package Elgg - * @subpackage Core - * @author Curverider Ltd - * @link http://elgg.org/ - */ +/** + * Elgg site sub-component on the main menu. + * + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @link http://elgg.org/ + */ ?> <div class="admin-menu-option"> <h2><?php echo elgg_echo('admin:site'); ?> </h2> diff --git a/views/default/admin/main_opt/statistics.php b/views/default/admin/main_opt/statistics.php index b42825fa8..fec4c3f20 100644 --- a/views/default/admin/main_opt/statistics.php +++ b/views/default/admin/main_opt/statistics.php @@ -1,12 +1,12 @@ <?php - /** - * Elgg satistics sub-component on the main menu. - * - * @package Elgg - * @subpackage Core - * @author Curverider Ltd - * @link http://elgg.org/ - */ +/** + * Elgg satistics sub-component on the main menu. + * + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @link http://elgg.org/ + */ ?> <div class="admin-menu-option"> <h2><?php echo elgg_echo('admin:statistics'); ?> </h2> diff --git a/views/default/admin/main_opt/user.php b/views/default/admin/main_opt/user.php index 284bab255..e82f97625 100644 --- a/views/default/admin/main_opt/user.php +++ b/views/default/admin/main_opt/user.php @@ -1,12 +1,12 @@ <?php - /** - * Elgg user sub-component on the main menu. - * - * @package Elgg - * @subpackage Core - * @author Curverider Ltd - * @link http://elgg.org/ - */ +/** + * Elgg user sub-component on the main menu. + * + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @link http://elgg.org/ + */ ?> <div class="admin-menu-option"> <h2><?php echo elgg_echo('admin:user'); ?> </h2> diff --git a/views/default/admin/plugins.php b/views/default/admin/plugins.php index e62943d46..f73530f44 100644 --- a/views/default/admin/plugins.php +++ b/views/default/admin/plugins.php @@ -1,55 +1,52 @@ <?php +/** + * Elgg administration plugin main screen + * + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @link http://elgg.org/ + */ - /** - * Elgg administration plugin main screen - * - * @package Elgg - * @subpackage Core - * @author Curverider Ltd - * @link http://elgg.org/ - */ - - global $CONFIG; - - $ts = time(); - $token = generate_action_token($ts); - - // Description of what's going on - $buttons = " <a class='enableallplugins' href=\"{$CONFIG->url}action/admin/plugins/enableall?__elgg_token=$token&__elgg_ts=$ts\">".elgg_echo('enableall')."</a> <a class='disableallplugins' href=\"{$CONFIG->url}action/admin/plugins/disableall?__elgg_token=$token&__elgg_ts=$ts\">".elgg_echo('disableall')."</a> "; - echo "<div class=\"contentWrapper\"><span class=\"contentIntro\">" . $buttons . elgg_view('output/longtext', array('value' => elgg_echo("admin:plugins:description"))) . "<div class='clearfloat'></div></span></div>"; - - $limit = get_input('limit', 10); - $offset = get_input('offset', 0); - - - // Get the installed plugins - $installed_plugins = $vars['installed_plugins']; - $count = count($installed_plugins); - - $plugin_list = get_plugin_list(); - $max = 0; - foreach($plugin_list as $key => $foo) - if ($key > $max) $max = $key; - - // Display list of plugins - $n = 0; - foreach ($installed_plugins as $plugin => $data) - { - //if (($n>=$offset) && ($n < $offset+$limit)) - echo elgg_view("admin/plugins_opt/plugin", array('plugin' => $plugin, 'details' => $data, 'maxorder' => $max, 'order' => array_search($plugin, $plugin_list))); - - $n++; - } - - // Diplay nav - /* - if ($count) - { - echo elgg_view('navigation/pagination',array( - 'baseurl' => $_SERVER['REQUEST_URI'], - 'offset' => $offset, - 'count' => $count, - )); - } - */ -?> +global $CONFIG; + +$ts = time(); +$token = generate_action_token($ts); + +// Description of what's going on +$buttons = " <a class='enableallplugins' href=\"{$CONFIG->url}action/admin/plugins/enableall?__elgg_token=$token&__elgg_ts=$ts\">".elgg_echo('enableall')."</a> <a class='disableallplugins' href=\"{$CONFIG->url}action/admin/plugins/disableall?__elgg_token=$token&__elgg_ts=$ts\">".elgg_echo('disableall')."</a> "; +echo "<div class=\"contentWrapper\"><span class=\"contentIntro\">" . $buttons . elgg_view('output/longtext', array('value' => elgg_echo("admin:plugins:description"))) . "<div class='clearfloat'></div></span></div>"; + +$limit = get_input('limit', 10); +$offset = get_input('offset', 0); + +// Get the installed plugins +$installed_plugins = $vars['installed_plugins']; +$count = count($installed_plugins); + +$plugin_list = get_plugin_list(); +$max = 0; +foreach($plugin_list as $key => $foo) { + if ($key > $max) $max = $key; +} + +// Display list of plugins +$n = 0; +foreach ($installed_plugins as $plugin => $data) { + //if (($n>=$offset) && ($n < $offset+$limit)) + echo elgg_view("admin/plugins_opt/plugin", array('plugin' => $plugin, 'details' => $data, 'maxorder' => $max, 'order' => array_search($plugin, $plugin_list))); + + $n++; +} + +// Diplay nav +/* +if ($count) +{ + echo elgg_view('navigation/pagination',array( + 'baseurl' => $_SERVER['REQUEST_URI'], + 'offset' => $offset, + 'count' => $count, + )); +} +*/
\ No newline at end of file diff --git a/views/default/admin/plugins_opt/plugin.php b/views/default/admin/plugins_opt/plugin.php index 8a7850ed6..33718f2ac 100644 --- a/views/default/admin/plugins_opt/plugin.php +++ b/views/default/admin/plugins_opt/plugin.php @@ -1,42 +1,41 @@ <?php - /** - * Elgg plugin manifest class - * - * This file renders a plugin for the admin screen, including active/deactive, manifest details & display plugin - * settings. - * - * @package Elgg - * @subpackage Core - * @author Curverider Ltd - * @link http://elgg.org/ - */ - - - $plugin = $vars['plugin']; - $details = $vars['details']; - - $active = $details['active']; - $manifest = $details['manifest']; - - // Check elgg version if available - $version_check_valid = false; - if ($manifest['elgg_version']) - $version_check_valid = check_plugin_compatibility($manifest['elgg_version']); - - - $ts = time(); - $token = generate_action_token($ts); +/** + * Elgg plugin manifest class + * + * This file renders a plugin for the admin screen, including active/deactive, manifest details & display plugin + * settings. + * + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @link http://elgg.org/ + */ + +$plugin = $vars['plugin']; +$details = $vars['details']; + +$active = $details['active']; +$manifest = $details['manifest']; + +// Check elgg version if available +$version_check_valid = false; +if ($manifest['elgg_version']) { + $version_check_valid = check_plugin_compatibility($manifest['elgg_version']); +} + +$ts = time(); +$token = generate_action_token($ts); ?> <div class="plugin_details <?php if ($active) echo "active"; else echo "not-active" ?>"> <div class="admin_plugin_reorder"> - <?php +<?php if ($vars['order'] > 10) { ?> <a href="<?php echo $vars['url']; ?>action/admin/plugins/reorder?plugin=<?php echo $plugin; ?>&order=1&__elgg_token=<?php echo $token; ?>&__elgg_ts=<?php echo $ts; ?>"><?php echo elgg_echo("top"); ?></a> <a href="<?php echo $vars['url']; ?>action/admin/plugins/reorder?plugin=<?php echo $plugin; ?>&order=<?php echo $vars['order'] - 11; ?>&__elgg_token=<?php echo $token; ?>&__elgg_ts=<?php echo $ts; ?>"><?php echo elgg_echo("up"); ?></a> <?php } - ?> + ?> <?php if ($vars['order'] < $vars['maxorder']) { ?> @@ -44,7 +43,7 @@ <a href="<?php echo $vars['url']; ?>action/admin/plugins/reorder?plugin=<?php echo $plugin; ?>&order=<?php echo $vars['maxorder'] + 11; ?>&__elgg_token=<?php echo $token; ?>&__elgg_ts=<?php echo $ts; ?>"><?php echo elgg_echo("bottom"); ?></a> <?php } - ?> + ?> </div><div class="clearfloat"></div> <div class="admin_plugin_enable_disable"> <?php if ($active) { ?> @@ -55,7 +54,7 @@ </div> <h3><?php echo $plugin; ?><?php if (elgg_view("settings/{$plugin}/edit")) { ?> <a class="pluginsettings_link">[<?php echo elgg_echo('settings'); ?>]</a><?php } ?></h3> - + <?php if (elgg_view("settings/{$plugin}/edit")) { ?> <div class="pluginsettings"> <div id="<?php echo $plugin; ?>_settings"> @@ -63,27 +62,27 @@ </div> </div> <?php } ?> - + <?php if ($manifest) { - + ?> <div class="plugin_description"><?php echo elgg_view('output/longtext',array('value' => $manifest['description'])); ?></div> <?php } - + ?> - + <p><a class="manifest_details"><?php echo elgg_echo("admin:plugins:label:moreinfo"); ?></a></p> <div class="manifest_file"> - + <?php if ($manifest) { ?> <?php if ((!$version_check_valid) || (!isset($manifest['elgg_version']))) { ?> <div id="version_check"> - <?php + <?php if (!isset($manifest['elgg_version'])) echo elgg_echo('admin:plugins:warning:elggversionunknown'); else @@ -99,5 +98,5 @@ <?php } ?> </div> - + </div>
\ No newline at end of file diff --git a/views/default/admin/site.php b/views/default/admin/site.php index 077ce3bf3..67cfca5a1 100644 --- a/views/default/admin/site.php +++ b/views/default/admin/site.php @@ -1,20 +1,18 @@ <?php +/** + * Elgg administration site main screen + * + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @link http://elgg.org/ + */ - /** - * Elgg administration site main screen - * - * @package Elgg - * @subpackage Core - * @author Curverider Ltd - * @link http://elgg.org/ - */ +global $CONFIG; - global $CONFIG; - - // Description of what's going on - echo "<div class=\"contentWrapper\">" . elgg_view('output/longtext', array('value' => elgg_echo("admin:site:description"))) . " "; - - echo elgg_view("settings/system",array("action" => $CONFIG->wwwroot."action/admin/site/update_basic")); // Always want to do this first. - - echo "</div>"; -?>
\ No newline at end of file +// Description of what's going on +echo "<div class=\"contentWrapper\">" . elgg_view('output/longtext', array('value' => elgg_echo("admin:site:description"))) . " "; + +echo elgg_view("settings/system",array("action" => $CONFIG->wwwroot."action/admin/site/update_basic")); // Always want to do this first. + +echo "</div>";
\ No newline at end of file diff --git a/views/default/admin/statistics.php b/views/default/admin/statistics.php index 4e0f7c3b1..7c987a607 100644 --- a/views/default/admin/statistics.php +++ b/views/default/admin/statistics.php @@ -1,15 +1,11 @@ <?php - /** - * Elgg statistics screen - * - * @package Elgg - * @subpackage Core +/** + * Elgg statistics screen + * + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @link http://elgg.org/ + */ - * @author Curverider Ltd - - * @link http://elgg.org/ - */ - - global $CONFIG; - -?>
\ No newline at end of file +global $CONFIG;
\ No newline at end of file diff --git a/views/default/admin/statistics_opt/basic.php b/views/default/admin/statistics_opt/basic.php index aa6b48edf..eed94c76b 100644 --- a/views/default/admin/statistics_opt/basic.php +++ b/views/default/admin/statistics_opt/basic.php @@ -1,36 +1,35 @@ <?php - /** - * Elgg statistics screen - * - * @package Elgg - * @subpackage Core - * @author Curverider Ltd - * @link http://elgg.org/ - */ +/** + * Elgg statistics screen + * + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @link http://elgg.org/ + */ + +// Work out number of users +$users_stats = get_number_users(); +$total_users = get_number_users(true); + +global $CONFIG; + +// Get version information +$version = get_version(); +$release = get_version(true); - // Work out number of users - $users_stats = get_number_users(); - $total_users = get_number_users(true); - - - global $CONFIG; - - // Get version information - $version = get_version(); - $release = get_version(true); - ?> <div class="admin_statistics"> - <h3><?php echo elgg_echo('admin:statistics:label:basic'); ?></h3> - <table> - <tr class="odd"> - <td class="column_one"><b><?php echo elgg_echo('admin:statistics:label:version'); ?> :</b></td> - <td><?php echo elgg_echo('admin:statistics:label:version:release'); ?> - <?php echo $release; ?>, <?php echo elgg_echo('admin:statistics:label:version:version'); ?> - <?php echo $version; ?></td> - </tr> - <tr class="even"> - <td class="column_one"><b><?php echo elgg_echo('admin:statistics:label:numusers'); ?> :</b></td> - <td><?php echo $users_stats; ?> <?php echo elgg_echo('active'); ?> / <?php echo $total_users; ?> <?php echo elgg_echo('total') ?></td> - </tr> + <h3><?php echo elgg_echo('admin:statistics:label:basic'); ?></h3> + <table> + <tr class="odd"> + <td class="column_one"><b><?php echo elgg_echo('admin:statistics:label:version'); ?> :</b></td> + <td><?php echo elgg_echo('admin:statistics:label:version:release'); ?> - <?php echo $release; ?>, <?php echo elgg_echo('admin:statistics:label:version:version'); ?> - <?php echo $version; ?></td> + </tr> + <tr class="even"> + <td class="column_one"><b><?php echo elgg_echo('admin:statistics:label:numusers'); ?> :</b></td> + <td><?php echo $users_stats; ?> <?php echo elgg_echo('active'); ?> / <?php echo $total_users; ?> <?php echo elgg_echo('total') ?></td> + </tr> - </table> -</div>
\ No newline at end of file + </table> +</div>
\ No newline at end of file diff --git a/views/default/admin/statistics_opt/numentities.php b/views/default/admin/statistics_opt/numentities.php index b48b86319..9f67512e1 100644 --- a/views/default/admin/statistics_opt/numentities.php +++ b/views/default/admin/statistics_opt/numentities.php @@ -1,55 +1,51 @@ <?php - /** - * Elgg statistics screen - * - * @package Elgg - * @subpackage Core +/** + * Elgg statistics screen + * + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @link http://elgg.org/ + */ - * @author Curverider Ltd - - * @link http://elgg.org/ - */ - - - // Get entity statistics - $entity_stats = get_entity_statistics(); - $even_odd = ""; +// Get entity statistics +$entity_stats = get_entity_statistics(); +$even_odd = ""; ?> <div class="admin_statistics"> - <h3><?php echo elgg_echo('admin:statistics:label:numentities'); ?></h3> - <table> - <?php - foreach ($entity_stats as $k => $entry) - { - arsort($entry); - foreach ($entry as $a => $b) - { - - //This function controls the alternating class - $even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even'; + <h3><?php echo elgg_echo('admin:statistics:label:numentities'); ?></h3> + <table> + <?php + foreach ($entity_stats as $k => $entry) { + arsort($entry); + foreach ($entry as $a => $b) { + + //This function controls the alternating class + $even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even'; + + if ($a == "__base__") { + $a = elgg_echo("item:{$k}"); + if (empty($a)) + $a = $k; + } else { + if (empty($a)) { + $a = elgg_echo("item:{$k}"); + } else { + $a = elgg_echo("item:{$k}:{$a}"); + } - if ($a == "__base__") { - $a = elgg_echo("item:{$k}"); - if (empty($a)) - $a = $k; - } - else { - if (empty($a)) - $a = elgg_echo("item:{$k}"); - else - $a = elgg_echo("item:{$k}:{$a}"); - if (empty($a)) { + if (empty($a)) { $a = "$k $a"; - } - } - echo <<< END - <tr class="{$even_odd}"> - <td class="column_one">{$a}:</td> - <td>{$b}</td> - </tr> + } + } + echo <<< END + <tr class="{$even_odd}"> + <td class="column_one">{$a}:</td> + <td>{$b}</td> + </tr> END; - } - } - ?> - </table> + } + } + ?> + </table> </div>
\ No newline at end of file diff --git a/views/default/admin/statistics_opt/online.php b/views/default/admin/statistics_opt/online.php index 7b82ae085..70a2979c1 100644 --- a/views/default/admin/statistics_opt/online.php +++ b/views/default/admin/statistics_opt/online.php @@ -1,22 +1,20 @@ <?php - /** - * Elgg statistics screen - * - * @package Elgg - * @subpackage Core +/** + * Elgg statistics screen + * + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @link http://elgg.org/ + */ - * @author Curverider Ltd - - * @link http://elgg.org/ - */ - - // users online - get_context('search'); - $users_online = get_online_users(); - get_context('admin'); +// users online +get_context('search'); +$users_online = get_online_users(); +get_context('admin'); ?> <div class="admin_users_online"> - <h3><?php echo elgg_echo('admin:statistics:label:onlineusers'); ?></h3> - <?php echo $users_online; ?> + <h3><?php echo elgg_echo('admin:statistics:label:onlineusers'); ?></h3> + <?php echo $users_online; ?> </div> diff --git a/views/default/admin/user.php b/views/default/admin/user.php index afd4bdd51..409afbe88 100644 --- a/views/default/admin/user.php +++ b/views/default/admin/user.php @@ -1,21 +1,20 @@ <?php +/** + * Elgg administration user main screen + * + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @link http://elgg.org/ + */ - /** - * Elgg administration user main screen - * - * @package Elgg - * @subpackage Core - * @author Curverider Ltd - * @link http://elgg.org/ - */ +// Description of what's going on +echo "<div class=\"contentWrapper\"><span class=\"contentIntro\">" . elgg_view('output/longtext', array('value' => elgg_echo("admin:user:description"))) . "</span></div>"; - // Description of what's going on - echo "<div class=\"contentWrapper\"><span class=\"contentIntro\">" . elgg_view('output/longtext', array('value' => elgg_echo("admin:user:description"))) . "</span></div>"; - - echo elgg_view("admin/user_opt/adduser"); - - echo elgg_view("admin/user_opt/search"); - - if ($vars['list']) echo $vars['list']; - -?>
\ No newline at end of file +echo elgg_view("admin/user_opt/adduser"); + +echo elgg_view("admin/user_opt/search"); + +if ($vars['list']) { + echo $vars['list']; +}
\ No newline at end of file diff --git a/views/default/admin/user_opt/adduser.php b/views/default/admin/user_opt/adduser.php index 146a7bfa7..759678bc1 100644 --- a/views/default/admin/user_opt/adduser.php +++ b/views/default/admin/user_opt/adduser.php @@ -1,13 +1,13 @@ <?php - /** - * Add a user. - * Form to add a new user. - * - * @package Elgg - * @subpackage Core - * @author Curverider Ltd - * @link http://elgg.org/ - */ +/** + * Add a user. + * Form to add a new user. + * + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @link http://elgg.org/ + */ ?> <div class="admin_adduser_link"> diff --git a/views/default/admin/user_opt/search.php b/views/default/admin/user_opt/search.php index b7518bcd5..80838a753 100644 --- a/views/default/admin/user_opt/search.php +++ b/views/default/admin/user_opt/search.php @@ -1,12 +1,12 @@ <?php - /** - * Elgg user search box. - * - * @package Elgg - * @subpackage Core - * @author Curverider Ltd - * @link http://elgg.org/ - */ +/** + * Elgg user search box. + * + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @link http://elgg.org/ + */ ?> <div id="search-box"> <form action="<?php echo $vars['url']; ?>search/" method="get"> @@ -14,10 +14,10 @@ <?php echo elgg_view('input/text',array('internalname' => 'tag')); - + ?> <input type="hidden" name="object" value="user" /> - <input type="submit" name="<?php echo elgg_echo('admin:user:label:seachbutton'); ?>" + <input type="submit" name="<?php echo elgg_echo('admin:user:label:seachbutton'); ?>" value="<?php echo elgg_echo('admin:user:label:seachbutton'); ?>" /> - </form> + </form> </div> |