From ff31226fdeb972aac2f37f0098240cb366a9bb26 Mon Sep 17 00:00:00 2001 From: brettp Date: Wed, 5 May 2010 19:14:48 +0000 Subject: Merged 18_new_admin branch to trunk. git-svn-id: http://code.elgg.org/elgg/trunk@5977 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/admin/appearance/menu_items.php | 89 ++++++++++++ .../default/admin/components/admin_page_layout.php | 36 +++++ views/default/admin/components/plugin.php | 155 ++++++++++++++++++++ views/default/admin/components/plugin_settings.php | 21 +++ views/default/admin/components/sidemenu.php | 105 ++++++++++++++ views/default/admin/main.php | 12 -- views/default/admin/main_opt/plugins.php | 17 --- views/default/admin/main_opt/site.php | 15 -- views/default/admin/main_opt/statistics.php | 15 -- views/default/admin/main_opt/user.php | 15 -- views/default/admin/menu_items.php | 89 ------------ views/default/admin/overview.php | 80 +++++++++++ views/default/admin/overview/numentities.php | 9 ++ views/default/admin/overview/online.php | 24 ++++ views/default/admin/plugins.php | 85 ----------- views/default/admin/plugins/advanced.php | 106 ++++++++++++++ views/default/admin/plugins/simple.php | 96 +++++++++++++ views/default/admin/plugins_opt/plugin.php | 159 --------------------- views/default/admin/site.php | 16 --- views/default/admin/site/advanced.php | 50 +++++++ views/default/admin/site/basic.php | 30 ++++ views/default/admin/statistics.php | 11 -- views/default/admin/statistics_opt/basic.php | 35 ----- views/default/admin/statistics_opt/numentities.php | 51 ------- views/default/admin/statistics_opt/online.php | 24 ---- views/default/admin/user.php | 21 --- views/default/admin/user_opt/adduser.php | 0 views/default/admin/user_opt/search.php | 25 ---- views/default/admin/users/add.php | 6 + views/default/admin/users/find.php | 25 ++++ views/default/admin/users/online.php | 14 ++ 31 files changed, 846 insertions(+), 590 deletions(-) create mode 100644 views/default/admin/appearance/menu_items.php create mode 100644 views/default/admin/components/admin_page_layout.php create mode 100644 views/default/admin/components/plugin.php create mode 100644 views/default/admin/components/plugin_settings.php create mode 100644 views/default/admin/components/sidemenu.php delete mode 100644 views/default/admin/main.php delete mode 100644 views/default/admin/main_opt/plugins.php delete mode 100644 views/default/admin/main_opt/site.php delete mode 100644 views/default/admin/main_opt/statistics.php delete mode 100644 views/default/admin/main_opt/user.php delete mode 100644 views/default/admin/menu_items.php create mode 100644 views/default/admin/overview.php create mode 100644 views/default/admin/overview/numentities.php create mode 100644 views/default/admin/overview/online.php delete mode 100644 views/default/admin/plugins.php create mode 100644 views/default/admin/plugins/advanced.php create mode 100644 views/default/admin/plugins/simple.php delete mode 100644 views/default/admin/plugins_opt/plugin.php delete mode 100644 views/default/admin/site.php create mode 100644 views/default/admin/site/advanced.php create mode 100644 views/default/admin/site/basic.php delete mode 100644 views/default/admin/statistics.php delete mode 100644 views/default/admin/statistics_opt/basic.php delete mode 100644 views/default/admin/statistics_opt/numentities.php delete mode 100644 views/default/admin/statistics_opt/online.php delete mode 100644 views/default/admin/user.php delete mode 100644 views/default/admin/user_opt/adduser.php delete mode 100644 views/default/admin/user_opt/search.php create mode 100644 views/default/admin/users/add.php create mode 100644 views/default/admin/users/find.php create mode 100644 views/default/admin/users/online.php (limited to 'views/default/admin') diff --git a/views/default/admin/appearance/menu_items.php b/views/default/admin/appearance/menu_items.php new file mode 100644 index 000000000..0f2637ba6 --- /dev/null +++ b/views/default/admin/appearance/menu_items.php @@ -0,0 +1,89 @@ + $info) { + $menu_sorted[$info->name] = $info->value->url; +} + +ksort($menu_sorted); + +$pulldown_values = array_flip($menu_sorted); +$pulldown_values[''] = elgg_echo('none'); + +echo elgg_view_title(elgg_echo('admin:menu_items')); +echo "

".elgg_echo('admin:menu_items:configure')."

"; +echo "

".strip_tags(elgg_view('output/longtext', array('value' => elgg_echo("admin:menu_items:description"))))."

"; +$form_body = ''; + +// @todo Could probably make this number configurable +for ($i=0; $i<6; $i++) { + if (array_key_exists($i, $featured_urls)) { + $current_value = $featured_urls[$i]->value->url; + } else { + $current_value = ''; + } + + $form_body .= elgg_view('input/pulldown', array( + 'options_values' => $pulldown_values, + 'internalname' => 'featured_urls[]', + 'value' => $current_value + )); +} + +// add arbitrary links +$form_body .= "

".elgg_echo('admin:add_menu_item')."

"; +$form_body .= elgg_view('output/longtext', array('value' => elgg_echo("admin:add_menu_item:description"))); + +$custom_items = get_config('menu_items_custom_items'); + +$name_str = elgg_echo('name'); +$url_str = elgg_echo('admin:plugins:label:website'); + +$form_body .= '"; + +$form_body .= elgg_view('input/submit', array('value' => elgg_echo('save'))); + +echo elgg_view('input/form', array( + 'body' => $form_body, + 'action' => "{$vars['url']}action/admin/menu_items" +)); +echo "
"; \ No newline at end of file diff --git a/views/default/admin/components/admin_page_layout.php b/views/default/admin/components/admin_page_layout.php new file mode 100644 index 000000000..4f2a67d48 --- /dev/null +++ b/views/default/admin/components/admin_page_layout.php @@ -0,0 +1,36 @@ + +
+
+ '; + echo elgg_view('page_elements/owner_block'); + ?> +
+ +
+ $notices_html
"; + } + echo $vars['content']; + ?> +
+ diff --git a/views/default/admin/components/plugin.php b/views/default/admin/components/plugin.php new file mode 100644 index 000000000..e56cdd4ef --- /dev/null +++ b/views/default/admin/components/plugin.php @@ -0,0 +1,155 @@ + 10) { + $top_url = "{$vars['url']}action/admin/plugins/reorder?plugin={$plugin}&order=1&__elgg_token=$token&__elgg_ts=$ts"; + $top_link = '' . elgg_echo('top') . ''; + + $order = $vars['order'] - 11; + + $up_url = "{$vars['url']}action/admin/plugins/reorder?plugin={$plugin}&order=$order&__elgg_token=$token&__elgg_ts=$ts"; + $up_link = '' . elgg_echo('up') . ''; +} + +if ($vars['order'] < $vars['maxorder']) { + $order = $vars['order'] + 11; + $down_url = "{$vars['url']}action/admin/plugins/reorder?plugin={$plugin}&order=$order&__elgg_token=$token&__elgg_ts=$ts"; + $down_link = '' . elgg_echo('down') . ''; + + $order = $vars['maxorder'] + 11; + $bottom_url = "{$vars['url']}action/admin/plugins/reorder?plugin={$plugin}&order=$order&__elgg_token=$token&__elgg_ts=$ts"; + $bottom_link = '' . elgg_echo('bottom') . ''; +} + +if ($active) { + $url = "{$vars['url']}action/admin/plugins/disable?plugin=$plugin&__elgg_token=$token&__elgg_ts=$ts"; + $enable_disable = '' . elgg_echo('disable') . ''; +} else { + $url = "{$vars['url']}action/admin/plugins/enable?plugin=$plugin&__elgg_token=$token&__elgg_ts=$ts"; + $enable_disable = '' . elgg_echo('enable') . ''; +} + + +$categories_list = ''; +if ($manifest['category']) { + $categories_arr = array(); + $base_url = "{$vars['url']}pg/admin/plugins?category="; + + foreach($manifest['category'] as $category) { + $url = $base_url . urlencode($category); + $categories_arr[] = "" . htmlspecialchars($category) . ''; + } + + $categories_list = implode(', ', $categories_arr); +} + +$screenshots = ''; +if ($manifest['screenshot']) { + $base_url = "{$vars['url']}mod/"; + + $limit = 4; + foreach ($manifest['screenshot'] as $screenshot) { + if ($limit <= 0) { + break; + } + + $screenshot_src = $base_url . $plugin . "/$screenshot"; + $screenshots .= "
    • "; + + $limit--; + } +} + +?> + +
    +
    + +
    + +
    + + [". elgg_echo('settings') ."]"; + } + ?> +

    + +
    $manifest['description'])); ?>
    +
    : ". htmlspecialchars($manifest['author']) ?>
    +
    : ". htmlspecialchars($manifest['version']) ?>
    + +

    + + +
    \ No newline at end of file diff --git a/views/default/admin/components/plugin_settings.php b/views/default/admin/components/plugin_settings.php new file mode 100644 index 000000000..22544e45f --- /dev/null +++ b/views/default/admin/components/plugin_settings.php @@ -0,0 +1,21 @@ + 'plugin', 'value' => $plugin)); +$form_body .= '

    ' . elgg_view('input/submit', array('value' => elgg_echo('save'))); +$form_body .= elgg_view('input/reset', array('value' => elgg_echo('reset'))) . '

    '; + +echo elgg_view_title($plugin_info['name']); + +echo elgg_view('input/form', array('body' => $form_body, 'action' => "{$vars['url']}action/plugins/settings/save")); \ No newline at end of file diff --git a/views/default/admin/components/sidemenu.php b/views/default/admin/components/sidemenu.php new file mode 100644 index 000000000..4e02eecd9 --- /dev/null +++ b/views/default/admin/components/sidemenu.php @@ -0,0 +1,105 @@ +admin_sections; +$current_section = $vars['page'][0]; +$child_section = (isset($vars['page'][1])) ? $vars['page'][1] : NULL; + +// "Plugin Settings" is a special sidemenu item that is added automatically +// it's calculated here instead of in admin_init() because of preformance concerns. +$installed_plugins = get_installed_plugins(); +$plugin_settings_children = $sort = array(); +foreach ($installed_plugins as $plugin_id => $info) { + if (!$info['active']) { + continue; + } + + // @todo might not need to check if plugin is enabled here because + // this view wouldn't exist if it's not. right? + if (is_plugin_enabled($plugin_id) && elgg_view_exists("settings/{$plugin_id}/edit")) { + $plugin_settings_children[$plugin_id] = array( + 'title' => $info['manifest']['name'] + ); + $sort[] = elgg_strtolower($info['manifest']['name']); + } +} + +array_multisort($sort, SORT_ASC, SORT_STRING, $plugin_settings_children); + +if ($plugin_settings_children) { + // merge in legacy support with new support. + if (!isset($sections['plugin_settings'])) { + $sections['plugin_settings'] = array( + 'title' => elgg_echo('admin:plugin_settings'), + 'children' => $plugin_settings_children + ); + } else { + $sections['plugin_settings']['title'] = elgg_echo('admin:plugin_settings'); + if (isset($sections['plugin_settings']['children'])) { + $children = array_merge($plugin_settings_children, $sections['plugin_settings']['children']); + $sections['plugin_settings']['children'] = $children; + } + } +} + +?> + + + + \ No newline at end of file diff --git a/views/default/admin/main.php b/views/default/admin/main.php deleted file mode 100644 index e345f56d6..000000000 --- a/views/default/admin/main.php +++ /dev/null @@ -1,12 +0,0 @@ - elgg_echo("admin:description"))); diff --git a/views/default/admin/main_opt/plugins.php b/views/default/admin/main_opt/plugins.php deleted file mode 100644 index b8ae611d3..000000000 --- a/views/default/admin/main_opt/plugins.php +++ /dev/null @@ -1,17 +0,0 @@ - -
    -

    -


    - ">

    -
    \ No newline at end of file diff --git a/views/default/admin/main_opt/site.php b/views/default/admin/main_opt/site.php deleted file mode 100644 index e21dcc3fe..000000000 --- a/views/default/admin/main_opt/site.php +++ /dev/null @@ -1,15 +0,0 @@ - -
    -

    -


    - ">

    -
    \ No newline at end of file diff --git a/views/default/admin/main_opt/statistics.php b/views/default/admin/main_opt/statistics.php deleted file mode 100644 index 5b063b82e..000000000 --- a/views/default/admin/main_opt/statistics.php +++ /dev/null @@ -1,15 +0,0 @@ - -
    -

    -


    - ">

    -
    diff --git a/views/default/admin/main_opt/user.php b/views/default/admin/main_opt/user.php deleted file mode 100644 index f1dc28e5e..000000000 --- a/views/default/admin/main_opt/user.php +++ /dev/null @@ -1,15 +0,0 @@ - -
    -

    -


    - ">

    -
    \ No newline at end of file diff --git a/views/default/admin/menu_items.php b/views/default/admin/menu_items.php deleted file mode 100644 index 2bf71f083..000000000 --- a/views/default/admin/menu_items.php +++ /dev/null @@ -1,89 +0,0 @@ - $info) { - $menu_sorted[$info->name] = $info->value->url; -} - -ksort($menu_sorted); - -$pulldown_values = array_flip($menu_sorted); -$pulldown_values[''] = elgg_echo('none'); - -echo elgg_view_title(elgg_echo('admin:menu_items')); -echo "

    ".elgg_echo('admin:menu_items:configure')."

    "; -echo "

    ".strip_tags(elgg_view('output/longtext', array('value' => elgg_echo("admin:menu_items:description"))))."

    "; -$form_body = ''; - -// @todo Could probably make this number configurable -for ($i=0; $i<6; $i++) { - if (array_key_exists($i, $featured_urls)) { - $current_value = $featured_urls[$i]->value->url; - } else { - $current_value = ''; - } - - $form_body .= elgg_view('input/pulldown', array( - 'options_values' => $pulldown_values, - 'internalname' => 'featured_urls[]', - 'value' => $current_value - )); -} - -// add arbitrary links -$form_body .= "

    ".elgg_echo('admin:add_menu_item')."

    "; -$form_body .= elgg_view('output/longtext', array('value' => elgg_echo("admin:add_menu_item:description"))); - -$custom_items = get_config('menu_items_custom_items'); - -$name_str = elgg_echo('name'); -$url_str = elgg_echo('admin:plugins:label:website'); - -$form_body .= '"; - -$form_body .= elgg_view('input/submit', array('value' => elgg_echo('save'))); - -echo elgg_view('input/form', array( - 'body' => $form_body, - 'action' => "{$vars['url']}action/admin/menu_items" -)); -echo "
    "; \ No newline at end of file diff --git a/views/default/admin/overview.php b/views/default/admin/overview.php new file mode 100644 index 000000000..6fe0bcd45 --- /dev/null +++ b/views/default/admin/overview.php @@ -0,0 +1,80 @@ + +
    +

    + + + + + + + + + + +
    : - , -
    : /
    +
    + + +
    +

    + + $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 (empty($a)) { + $a = "$k $a"; + } + } + echo <<< END + + + + +END; + } + } + ?> +
    {$a}:{$b}
    +
    \ No newline at end of file diff --git a/views/default/admin/overview/numentities.php b/views/default/admin/overview/numentities.php new file mode 100644 index 000000000..0d0e1b83b --- /dev/null +++ b/views/default/admin/overview/numentities.php @@ -0,0 +1,9 @@ + + +
    +

    + +
    + \ No newline at end of file diff --git a/views/default/admin/plugins.php b/views/default/admin/plugins.php deleted file mode 100644 index 5a5d37f8c..000000000 --- a/views/default/admin/plugins.php +++ /dev/null @@ -1,85 +0,0 @@ - elgg_echo('admin:plugins:categories:all')), $vars['categories']); - -$category_pulldown = elgg_view('input/pulldown', array( - 'internalname' => 'category', - 'options_values' => $categories, - 'value' => $vars['show_category'] -)); - -$category_button = elgg_view('input/button', array( - 'value' => elgg_echo('filter'), - 'class' => 'action_button' -)); - -$category_form = elgg_view('input/form', array( - 'body' => $category_pulldown . $category_button -)); - -// Page Header elements -$title = elgg_view_title(elgg_echo('admin:plugins')); - -// @todo Until "en/disable all" means "All plugins on this page" hide when not looking at all. -if (!isset($vars['show_category']) || empty($vars['show_category'])) { - $buttons = "url}action/admin/plugins/enableall?__elgg_token=$token&__elgg_ts=$ts\">".elgg_echo('enableall')." url}action/admin/plugins/disableall?__elgg_token=$token&__elgg_ts=$ts\">".elgg_echo('disableall')." "; - $buttons .= "

    "; -} else { - $buttons = ''; -} - -$buttons .= $category_form; - -// construct page header -?> -
    -
    -
    -
    - elgg_echo("admin:plugins:description"))); - -$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) { - echo elgg_view("admin/plugins_opt/plugin", array('plugin' => $plugin, 'details' => $data, 'maxorder' => $max, 'order' => array_search($plugin, $plugin_list))); - $n++; -} - -?> - - diff --git a/views/default/admin/plugins/advanced.php b/views/default/admin/plugins/advanced.php new file mode 100644 index 000000000..d5def1eb1 --- /dev/null +++ b/views/default/admin/plugins/advanced.php @@ -0,0 +1,106 @@ + $plugin) { + $plugin_categories = $plugin['manifest']['category']; + + // handle plugins that don't declare categories + if ((!$plugin_categories && $show_category) || ($show_category && !in_array($show_category, $plugin_categories))) { + unset($installed_plugins[$id]); + } + + foreach ($plugin_categories as $category) { + if (!array_key_exists($category, $categories)) { + $categories[$category] = elgg_echo("admin:plugins:label:moreinfo:categories:$category"); + } + } +} + +$ts = time(); +$token = generate_action_token($ts); +$categories = array_merge(array('' => elgg_echo('admin:plugins:categories:all')), $categories); + +$category_pulldown = elgg_view('input/pulldown', array( + 'internalname' => 'category', + 'options_values' => $categories, + 'value' => $show_category +)); + +$category_button = elgg_view('input/button', array( + 'value' => elgg_echo('filter'), + 'class' => 'action_button' +)); + +$category_form = elgg_view('input/form', array( + 'body' => $category_pulldown . $category_button +)); + +// Page Header elements +$title = elgg_view_title(elgg_echo('admin:plugins')); + +// @todo Until "en/disable all" means "All plugins on this page" hide when not looking at all. +if (!isset($show_category) || empty($show_category)) { + $buttons = "url}action/admin/plugins/enableall?__elgg_token=$token&__elgg_ts=$ts\">".elgg_echo('enableall')." url}action/admin/plugins/disableall?__elgg_token=$token&__elgg_ts=$ts\">".elgg_echo('disableall')." "; + $buttons .= "

    "; +} else { + $buttons = ''; +} + +$buttons .= $category_form; + +// construct page header +?> +
    +
    +
    +
    +
    + $foo) { + if ($key > $max) $max = $key; +} + +// Display list of plugins +$n = 0; +foreach ($installed_plugins as $plugin => $data) { + echo elgg_view('admin/components/plugin', array( + 'plugin' => $plugin, + 'details' => $data, + 'maxorder' => $max, + 'order' => array_search($plugin, $plugin_list) + )); + $n++; +} +?> + \ No newline at end of file diff --git a/views/default/admin/plugins/simple.php b/views/default/admin/plugins/simple.php new file mode 100644 index 000000000..ad85f9ce0 --- /dev/null +++ b/views/default/admin/plugins/simple.php @@ -0,0 +1,96 @@ + $plugin) { + if (!isset($plugin['manifest']['admin_interface']) || $plugin['manifest']['admin_interface'] == 'advanced') { + continue; + } + + $plugin['installed_name'] = $installed_name; + + $plugin_list[$plugin['manifest']['name']] = $plugin; +} + +ksort($plugin_list); +$form_body .= <<<___END +
    +
    $title
    +
    + '; +$form_body .= elgg_view('input/submit', array('value' => elgg_echo('save'))); +$form_body .= elgg_view('input/reset', array('value' => elgg_echo('reset'), 'class' => 'action_button disabled')); + +echo elgg_view('input/form', array( + 'action' => "{$vars['url']}action/admin/plugins/simple_update_states", + 'body' => $form_body, + 'class' => 'admin_plugins_simpleview' +)); \ No newline at end of file diff --git a/views/default/admin/plugins_opt/plugin.php b/views/default/admin/plugins_opt/plugin.php deleted file mode 100644 index 61a197043..000000000 --- a/views/default/admin/plugins_opt/plugin.php +++ /dev/null @@ -1,159 +0,0 @@ - 10) { - $top_url = "{$vars['url']}action/admin/plugins/reorder?plugin={$plugin}&order=1&__elgg_token=$token&__elgg_ts=$ts"; - $top_link = '' . elgg_echo('top') . ''; - - $order = $vars['order'] - 11; - - $up_url = "{$vars['url']}action/admin/plugins/reorder?plugin={$plugin}&order=$order&__elgg_token=$token&__elgg_ts=$ts"; - $up_link = '' . elgg_echo('up') . ''; -} - -if ($vars['order'] < $vars['maxorder']) { - $order = $vars['order'] + 11; - $down_url = "{$vars['url']}action/admin/plugins/reorder?plugin={$plugin}&order=$order&__elgg_token=$token&__elgg_ts=$ts"; - $down_link = '' . elgg_echo('down') . ''; - - $order = $vars['maxorder'] + 11; - $bottom_url = "{$vars['url']}action/admin/plugins/reorder?plugin={$plugin}&order=$order&__elgg_token=$token&__elgg_ts=$ts"; - $bottom_link = '' . elgg_echo('bottom') . ''; -} - -if ($active) { - $url = "{$vars['url']}action/admin/plugins/disable?plugin=$plugin&__elgg_token=$token&__elgg_ts=$ts"; - $enable_disable = '' . elgg_echo('disable') . ''; -} else { - $url = "{$vars['url']}action/admin/plugins/enable?plugin=$plugin&__elgg_token=$token&__elgg_ts=$ts"; - $enable_disable = '' . elgg_echo('enable') . ''; -} - - -$categories_list = ''; -if ($manifest['category']) { - $categories_arr = array(); - $base_url = "{$vars['url']}pg/admin/plugins?category="; - - foreach($manifest['category'] as $category) { - $url = $base_url . urlencode($category); - $categories_arr[] = "" . htmlspecialchars($category) . ''; - } - - $categories_list = implode(', ', $categories_arr); -} - -$screenshots = ''; -if ($manifest['screenshot']) { - $base_url = "{$vars['url']}mod/"; - - $limit = 4; - foreach ($manifest['screenshot'] as $screenshot) { - if ($limit <= 0) { - break; - } - - $screenshot_src = $base_url . $plugin . "/$screenshot"; - $screenshots .= "
    • "; - - $limit--; - } -} - -?> - -
    -
    - -
    - -
    - - [". elgg_echo('settings') ."]"; - - $settings_panel = ""; - } - ?> -

    - -
    $manifest['description'])); ?>
    -
    : ". htmlspecialchars($manifest['author']) ?>
    -
    : ". htmlspecialchars($manifest['version']) ?>
    - -

    - - -
    \ No newline at end of file diff --git a/views/default/admin/site.php b/views/default/admin/site.php deleted file mode 100644 index 2c2775ad0..000000000 --- a/views/default/admin/site.php +++ /dev/null @@ -1,16 +0,0 @@ -".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. \ No newline at end of file diff --git a/views/default/admin/site/advanced.php b/views/default/admin/site/advanced.php new file mode 100644 index 000000000..da7b98a1a --- /dev/null +++ b/views/default/admin/site/advanced.php @@ -0,0 +1,50 @@ +"; + $form_body .= elgg_echo('installation:' . $field) . "
    "; + $warning = elgg_echo('installation:warning:' . $field); + if ($warning != 'installation:warning:' . $field) echo "" . $warning . "
    "; + $value = $vars['config']->$field; + $form_body .= elgg_view("input/text",array('internalname' => $field, 'value' => $value)); + $form_body .= "

    "; +} + +$form_body .= "

    " . elgg_echo('admin:site:access:warning') . "
    "; +$form_body .= elgg_echo('installation:sitepermissions') . elgg_view('input/access', array('internalname' => 'default_access','value' => $vars['config']->default_access)) . "

    "; +$form_body .= "

    " . elgg_echo('installation:allow_user_default_access:description') . "
    " .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:allow_user_default_access:label')), 'internalname' => 'allow_user_default_access', 'value' => ($vars['config']->allow_user_default_access ? elgg_echo('installation:allow_user_default_access:label') : "") )) . "

    "; +$form_body .= "

    " . elgg_echo('installation:simplecache:description') . "
    " .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:simplecache:label')), 'internalname' => 'simplecache_enabled', 'value' => ($vars['config']->simplecache_enabled ? elgg_echo('installation:simplecache:label') : "") )) . "

    "; +$form_body .= "

    " . elgg_echo('installation:viewpathcache:description') . "
    " .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:viewpathcache:label')), 'internalname' => 'viewpath_cache_enabled', 'value' => (($vars['config']->viewpath_cache_enabled) ? elgg_echo('installation:viewpathcache:label') : "") )) . "

    "; + +$debug_options = array('0' => elgg_echo('installation:debug:none'), 'ERROR' => elgg_echo('installation:debug:error'), 'WARNING' => elgg_echo('installation:debug:warning'), 'NOTICE' => elgg_echo('installation:debug:notice')); +$form_body .= "

    " . elgg_echo('installation:debug'); +$form_body .= elgg_view('input/pulldown', array('options_values' => $debug_options, 'internalname' => 'debug', 'value' => $vars['config']->debug)); +$form_body .= '

    '; + +$form_body .= "

    " . elgg_echo('installation:httpslogin') . "
    " .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:httpslogin:label')), 'internalname' => 'https_login', 'value' => ($vars['config']->https_login ? elgg_echo('installation:httpslogin:label') : "") )) . "

    "; + +$form_body .= "

    " . elgg_echo('installation:disableapi') . "
    "; +$on = elgg_echo('installation:disableapi:label'); +if ((isset($CONFIG->disable_api)) && ($CONFIG->disable_api == true)) { + $on = ($vars['config']->disable_api ? "" : elgg_echo('installation:disableapi:label')); +} +$form_body .= elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:disableapi:label')), 'internalname' => 'api', 'value' => $on )); +$form_body .= "

    "; + +$form_body .= elgg_view('input/hidden', array('internalname' => 'settings', 'value' => 'go')); + +$form_body .= "
    ".elgg_view('input/submit', array('value' => elgg_echo("save"))); +$form_body = "
    ".$form_body."
    "; +echo elgg_view('input/form', array('action' => $action, 'body' => $form_body)); diff --git a/views/default/admin/site/basic.php b/views/default/admin/site/basic.php new file mode 100644 index 000000000..104823a28 --- /dev/null +++ b/views/default/admin/site/basic.php @@ -0,0 +1,30 @@ +"; + $form_body .= elgg_echo('installation:' . $field) . "
    "; + $warning = elgg_echo('installation:warning:' . $field); + if ($warning != 'installation:warning:' . $field) echo "" . $warning . "
    "; + $value = $vars['config']->$field; + $form_body .= elgg_view("input/text",array('internalname' => $field, 'value' => $value)); + $form_body .= "

    "; +} + +$languages = get_installed_translations(); +$form_body .= "

    " . elgg_echo('installation:language') . elgg_view("input/pulldown", array('internalname' => 'language', 'value' => $vars['config']->language, 'options_values' => $languages)) . "

    "; + +$form_body .= "
    ".elgg_view('input/submit', array('value' => elgg_echo("save"))); +$form_body = "
    ".$form_body."
    "; +echo elgg_view('input/form', array('action' => $action, 'body' => $form_body)); diff --git a/views/default/admin/statistics.php b/views/default/admin/statistics.php deleted file mode 100644 index 7c987a607..000000000 --- a/views/default/admin/statistics.php +++ /dev/null @@ -1,11 +0,0 @@ - -
    -

    - - - - - - - - - - -
    : - , -
    : /
    -
    \ No newline at end of file diff --git a/views/default/admin/statistics_opt/numentities.php b/views/default/admin/statistics_opt/numentities.php deleted file mode 100644 index 4336c5a82..000000000 --- a/views/default/admin/statistics_opt/numentities.php +++ /dev/null @@ -1,51 +0,0 @@ - -
    -

    - - $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 (empty($a)) { - $a = "$k $a"; - } - } - echo <<< END - - - - -END; - } - } - ?> -
    {$a}:{$b}
    -
    \ No newline at end of file diff --git a/views/default/admin/statistics_opt/online.php b/views/default/admin/statistics_opt/online.php deleted file mode 100644 index 6485a3bac..000000000 --- a/views/default/admin/statistics_opt/online.php +++ /dev/null @@ -1,24 +0,0 @@ - - -
    -

    - -
    - \ No newline at end of file diff --git a/views/default/admin/user.php b/views/default/admin/user.php deleted file mode 100644 index ba7eb3d4a..000000000 --- a/views/default/admin/user.php +++ /dev/null @@ -1,21 +0,0 @@ -".elgg_view('output/longtext', array('value' => elgg_echo("admin:user:description"))).""; -//echo elgg_view("admin/user_opt/adduser"); -// add a new user form -echo elgg_view('account/forms/useradd', array('show_admin'=>true)); -// search for a user -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 deleted file mode 100644 index e69de29bb..000000000 diff --git a/views/default/admin/user_opt/search.php b/views/default/admin/user_opt/search.php deleted file mode 100644 index f853dcf3c..000000000 --- a/views/default/admin/user_opt/search.php +++ /dev/null @@ -1,25 +0,0 @@ - -
    -
    -

    - 'q')); ?> - - - -
    -
    - \ No newline at end of file diff --git a/views/default/admin/users/add.php b/views/default/admin/users/add.php new file mode 100644 index 000000000..4275b27e1 --- /dev/null +++ b/views/default/admin/users/add.php @@ -0,0 +1,6 @@ +true)); \ No newline at end of file diff --git a/views/default/admin/users/find.php b/views/default/admin/users/find.php new file mode 100644 index 000000000..9684cb88c --- /dev/null +++ b/views/default/admin/users/find.php @@ -0,0 +1,25 @@ + +
    +
    +

    + 'q')); ?> + + + +
    +
    + \ No newline at end of file diff --git a/views/default/admin/users/online.php b/views/default/admin/users/online.php new file mode 100644 index 000000000..22b183da8 --- /dev/null +++ b/views/default/admin/users/online.php @@ -0,0 +1,14 @@ + + +
    +

    + +
    +