diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-03-03 17:53:05 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-03-03 17:53:05 +0000 |
| commit | 4766f36a4d74924f21ff329c4318ce4e069ffa04 (patch) | |
| tree | 969b84632f2a8b0db79788a8a6db8e41d63e5cb4 /views/default | |
| parent | 57a217fd6b708844407486046a1faa23b46cac08 (diff) | |
| download | elgg-4766f36a4d74924f21ff329c4318ce4e069ffa04.tar.gz elgg-4766f36a4d74924f21ff329c4318ce4e069ffa04.tar.bz2 | |
Pulled in the interface changes.
git-svn-id: http://code.elgg.org/elgg/trunk@5257 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/default')
99 files changed, 2055 insertions, 2858 deletions
diff --git a/views/default/account/forms/forgotten_password.php b/views/default/account/forms/forgotten_password.php index 5ffb1be1a..b360bcc63 100644 --- a/views/default/account/forms/forgotten_password.php +++ b/views/default/account/forms/forgotten_password.php @@ -15,11 +15,17 @@ $form_body .= elgg_view('input/captcha'); $form_body .= "<p>" . elgg_view('input/submit', array('value' => elgg_echo('request'))) . "</p>"; ?> -<div class="contentWrapper"> -<?php -echo elgg_view('input/form', array( - 'action' => "{$vars['url']}action/user/requestnewpassword", - 'body' => $form_body) -); -?> -</div>
\ No newline at end of file +<div id="elgg_content" class="sidebar"> + <div id="elgg_page_contents" class="clearfloat forgotten_password"> + <h2><?php echo elgg_echo('user:password:lost'); ?></h2> + <?php + echo elgg_view('input/form', array( + 'action' => "{$vars['url']}action/user/requestnewpassword", + 'body' => $form_body) + ); + ?> + </div> +</div> +<script type="text/javascript"> + $(document).ready(function() { $('input[name=username]').focus(); }); +</script>
\ No newline at end of file diff --git a/views/default/account/forms/login.php b/views/default/account/forms/login.php index 394c1ea88..766b2ca28 100644 --- a/views/default/account/forms/login.php +++ b/views/default/account/forms/login.php @@ -10,16 +10,16 @@ global $CONFIG; -$form_body = "<p class=\"loginbox\"><label>" . elgg_echo('username') . "<br />" . elgg_view('input/text', array('internalname' => 'username', 'class' => 'login-textarea')) . "</label>"; +$form_body = "<label>" . elgg_echo('username') . "<br />" . elgg_view('input/text', array('internalname' => 'username', 'class' => 'login_textarea')) . "</label>"; $form_body .= "<br />"; -$form_body .= "<label>" . elgg_echo('password') . "<br />" . elgg_view('input/password', array('internalname' => 'password', 'class' => 'login-textarea')) . "</label><br />"; +$form_body .= "<label>" . elgg_echo('password') . "<br />" . elgg_view('input/password', array('internalname' => 'password', 'class' => 'login_textarea')) . "</label><br />"; $form_body .= elgg_view('login/extend'); -$form_body .= elgg_view('input/submit', array('value' => elgg_echo('login'))) . " <div id=\"persistent_login\"><label><input type=\"checkbox\" name=\"persistent\" value=\"true\" />".elgg_echo('user:persistent')."</label></div></p>"; -$form_body .= "<p class=\"loginbox\">"; +$form_body .= elgg_view('input/submit', array('value' => elgg_echo('login'))) . " <div class='persistent_login'><label><input type='checkbox' name='persistent' value='true' />".elgg_echo('user:persistent')."</label></div></p>"; +$form_body .= "<p class='loginbox'>"; $form_body .= (!isset($CONFIG->disable_registration) || !($CONFIG->disable_registration)) ? "<a href=\"{$vars['url']}pg/register/\">" . elgg_echo('register') . "</a> | " : ""; -$form_body .= "<a href=\"{$vars['url']}account/forgotten_password.php\">" . elgg_echo('user:password:lost') . "</a></p>"; +$form_body .= "<a href=\"{$vars['url']}account/forgotten_password.php\">" . elgg_echo('user:password:lost') . "</a>"; $login_url = $vars['url']; if ((isset($CONFIG->https_login)) && ($CONFIG->https_login)) { @@ -27,7 +27,7 @@ if ((isset($CONFIG->https_login)) && ($CONFIG->https_login)) { } ?> -<div id="login-box"> +<div id="login"> <h2><?php echo elgg_echo('login'); ?></h2> <?php echo elgg_view('input/form', array('body' => $form_body, 'action' => "{$login_url}action/login")); diff --git a/views/default/account/forms/register.php b/views/default/account/forms/register.php index 3e53b6f05..0265ce187 100644 --- a/views/default/account/forms/register.php +++ b/views/default/account/forms/register.php @@ -17,12 +17,12 @@ if (($_SESSION['user']->admin) && ($vars['show_admin'])) { $admin_option = true; } -$form_body = "<p><label>" . elgg_echo('name') . "<br />" . elgg_view('input/text' , array('internalname' => 'name', 'class' => "general-textarea", 'value' => $name)) . "</label><br />"; +$form_body = "<p><label>" . elgg_echo('name') . "<br />" . elgg_view('input/text' , array('internalname' => 'name', 'class' => "input_text", 'value' => $name)) . "</label><br />"; -$form_body .= "<label>" . elgg_echo('email') . "<br />" . elgg_view('input/text' , array('internalname' => 'email', 'class' => "general-textarea", 'value' => $email)) . "</label><br />"; -$form_body .= "<label>" . elgg_echo('username') . "<br />" . elgg_view('input/text' , array('internalname' => 'username', 'class' => "general-textarea", 'value' => $username)) . "</label><br />"; -$form_body .= "<label>" . elgg_echo('password') . "<br />" . elgg_view('input/password' , array('internalname' => 'password', 'class' => "general-textarea")) . "</label><br />"; -$form_body .= "<label>" . elgg_echo('passwordagain') . "<br />" . elgg_view('input/password' , array('internalname' => 'password2', 'class' => "general-textarea")) . "</label><br />"; +$form_body .= "<label>" . elgg_echo('email') . "<br />" . elgg_view('input/text' , array('internalname' => 'email', 'class' => "input_text", 'value' => $email)) . "</label><br />"; +$form_body .= "<label>" . elgg_echo('username') . "<br />" . elgg_view('input/text' , array('internalname' => 'username', 'class' => "input_text", 'value' => $username)) . "</label><br />"; +$form_body .= "<label>" . elgg_echo('password') . "<br />" . elgg_view('input/password' , array('internalname' => 'password', 'class' => "input_password")) . "</label><br />"; +$form_body .= "<label>" . elgg_echo('passwordagain') . "<br />" . elgg_view('input/password' , array('internalname' => 'password2', 'class' => "input_password")) . "</label><br />"; // view to extend to add more fields to the registration form $form_body .= elgg_view('register/extend'); @@ -39,8 +39,12 @@ $form_body .= elgg_view('input/hidden', array('internalname' => 'invitecode', 'v $form_body .= elgg_view('input/hidden', array('internalname' => 'action', 'value' => 'register')); $form_body .= elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('register'))) . "</p>"; ?> - -<div id="register-box"> -<h2><?php echo elgg_echo('register'); ?></h2> -<?php echo elgg_view('input/form', array('action' => "{$vars['url']}action/register", 'body' => $form_body)) ?> -</div>
\ No newline at end of file +<div id="elgg_content" class="clearfloat sidebar"> + <div id="elgg_page_contents" class="clearfloat register"> + <h2><?php echo elgg_echo('register'); ?></h2> + <?php echo elgg_view('input/form', array('action' => "{$vars['url']}action/register", 'body' => $form_body)) ?> + </div> +</div> +<script type="text/javascript"> + $(document).ready(function() { $('input[name=name]').focus(); }); +</script>
\ No newline at end of file diff --git a/views/default/account/forms/useradd.php b/views/default/account/forms/useradd.php index 09b4c4718..734854d08 100644 --- a/views/default/account/forms/useradd.php +++ b/views/default/account/forms/useradd.php @@ -13,10 +13,9 @@ if (($_SESSION['user']->admin) && ($vars['show_admin'])) { $admin_option = true; } -$form_body = "<p><label>" . elgg_echo('name') . "<br />" . elgg_view('input/text' , array('internalname' => 'name')) . "</label></p>"; - -$form_body .= "<p><label>" . elgg_echo('email') . "<br />" . elgg_view('input/text' , array('internalname' => 'email')) . "</label></p>"; +$form_body = "<p><label>" . elgg_echo('name') . "<br />" . elgg_view('input/text' , array('internalname' => 'name')) . "</label></p>"; $form_body .= "<p><label>" . elgg_echo('username') . "<br />" . elgg_view('input/text' , array('internalname' => 'username')) . "</label></p>"; +$form_body .= "<p><label>" . elgg_echo('email') . "<br />" . elgg_view('input/text' , array('internalname' => 'email')) . "</label></p>"; $form_body .= "<p><label>" . elgg_echo('password') . "<br />" . elgg_view('input/password' , array('internalname' => 'password')) . "</label></p>"; $form_body .= "<p><label>" . elgg_echo('passwordagain') . "<br />" . elgg_view('input/password' , array('internalname' => 'password2')) . "</label></p>"; @@ -27,7 +26,7 @@ if ($admin_option) { $form_body .= elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('register'))) . "</p>"; ?> -<div id="add-box"> -<h2><?php echo elgg_echo('adduser'); ?></h2> +<div class="admin_settings add_user"> + <h3><?php echo elgg_echo('adduser'); ?></h3> <?php echo elgg_view('input/form', array('action' => "{$vars['url']}action/useradd", 'body' => $form_body)) ?> </div>
\ No newline at end of file diff --git a/views/default/admin/main.php b/views/default/admin/main.php index fc143244d..e345f56d6 100644 --- a/views/default/admin/main.php +++ b/views/default/admin/main.php @@ -9,4 +9,4 @@ */ // Description of what's going on -echo "<p>" . elgg_view('output/longtext', array('value' => elgg_echo("admin:description"))) . "</p>"; +echo elgg_view('output/longtext', array('value' => elgg_echo("admin:description"))); diff --git a/views/default/admin/main_opt/plugins.php b/views/default/admin/main_opt/plugins.php index b1e2f0078..b8ae611d3 100644 --- a/views/default/admin/main_opt/plugins.php +++ b/views/default/admin/main_opt/plugins.php @@ -10,7 +10,7 @@ global $CONFIG; ?> -<div class="admin-menu-option"> +<div class="menu_admin_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> diff --git a/views/default/admin/main_opt/site.php b/views/default/admin/main_opt/site.php index 7c34015ba..e21dcc3fe 100644 --- a/views/default/admin/main_opt/site.php +++ b/views/default/admin/main_opt/site.php @@ -8,7 +8,7 @@ * @link http://elgg.org/ */ ?> -<div class="admin-menu-option"> +<div class="menu_admin_option"> <h2><?php echo elgg_echo('admin:site'); ?> </h2> <p><?php echo elgg_echo('admin:site:opt:description'); ?><br /> <a href="<?php echo $CONFIG->wwwroot . "pg/admin/site/"; ?>"><?php echo elgg_echo('admin:site:opt:linktext'); ?></a></p> diff --git a/views/default/admin/main_opt/statistics.php b/views/default/admin/main_opt/statistics.php index fec4c3f20..5b063b82e 100644 --- a/views/default/admin/main_opt/statistics.php +++ b/views/default/admin/main_opt/statistics.php @@ -8,7 +8,7 @@ * @link http://elgg.org/ */ ?> -<div class="admin-menu-option"> +<div class="menu_admin_option"> <h2><?php echo elgg_echo('admin:statistics'); ?> </h2> <p><?php echo elgg_echo('admin:statistics:opt:description'); ?><br /> <a href="<?php echo $CONFIG->wwwroot . "pg/admin/statistics/"; ?>"><?php echo elgg_echo('admin:statistics:opt:linktext'); ?></a></p> diff --git a/views/default/admin/main_opt/user.php b/views/default/admin/main_opt/user.php index e82f97625..f1dc28e5e 100644 --- a/views/default/admin/main_opt/user.php +++ b/views/default/admin/main_opt/user.php @@ -8,7 +8,7 @@ * @link http://elgg.org/ */ ?> -<div class="admin-menu-option"> +<div class="menu_admin_option"> <h2><?php echo elgg_echo('admin:user'); ?> </h2> <p><?php echo elgg_echo('admin:user:opt:description'); ?><br /> <a href="<?php echo $CONFIG->wwwroot . "pg/admin/user/"; ?>"><?php echo elgg_echo('admin:user:opt:linktext'); ?></a></p> diff --git a/views/default/admin/plugins.php b/views/default/admin/plugins.php index f73530f44..70e5d2683 100644 --- a/views/default/admin/plugins.php +++ b/views/default/admin/plugins.php @@ -15,7 +15,7 @@ $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>"; +echo $buttons . elgg_view('output/longtext', array('value' => elgg_echo("admin:plugins:description"))); $limit = get_input('limit', 10); $offset = get_input('offset', 0); @@ -33,20 +33,6 @@ foreach($plugin_list as $key => $foo) { // 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))); - + 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 +}
\ 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 33718f2ac..d813b8c01 100644 --- a/views/default/admin/plugins_opt/plugin.php +++ b/views/default/admin/plugins_opt/plugin.php @@ -26,7 +26,7 @@ if ($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="plugin_details <?php if ($active) echo "active"; else echo "not_active" ?>"> <div class="admin_plugin_reorder"> <?php if ($vars['order'] > 10) { @@ -56,7 +56,7 @@ $token = generate_action_token($ts); <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 class="pluginsettings hidden"> <div id="<?php echo $plugin; ?>_settings"> <?php echo elgg_view("object/plugin", array('plugin' => $plugin, 'entity' => find_plugin_settings($plugin))) ?> </div> @@ -77,7 +77,7 @@ $token = generate_action_token($ts); <p><a class="manifest_details"><?php echo elgg_echo("admin:plugins:label:moreinfo"); ?></a></p> - <div class="manifest_file"> + <div class="manifest_file hidden"> <?php if ($manifest) { ?> <?php if ((!$version_check_valid) || (!isset($manifest['elgg_version']))) { ?> diff --git a/views/default/admin/site.php b/views/default/admin/site.php index 67cfca5a1..0893e4970 100644 --- a/views/default/admin/site.php +++ b/views/default/admin/site.php @@ -11,8 +11,6 @@ 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('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 +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/statistics_opt/basic.php b/views/default/admin/statistics_opt/basic.php index eed94c76b..f89314fef 100644 --- a/views/default/admin/statistics_opt/basic.php +++ b/views/default/admin/statistics_opt/basic.php @@ -19,9 +19,9 @@ $version = get_version(); $release = get_version(true); ?> -<div class="admin_statistics"> +<div class="admin_settings site_stats"> <h3><?php echo elgg_echo('admin:statistics:label:basic'); ?></h3> - <table> + <table class="styled"> <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> diff --git a/views/default/admin/statistics_opt/numentities.php b/views/default/admin/statistics_opt/numentities.php index 9f67512e1..4336c5a82 100644 --- a/views/default/admin/statistics_opt/numentities.php +++ b/views/default/admin/statistics_opt/numentities.php @@ -12,9 +12,9 @@ $entity_stats = get_entity_statistics(); $even_odd = ""; ?> -<div class="admin_statistics"> +<div class="admin_settings site_entities"> <h3><?php echo elgg_echo('admin:statistics:label:numentities'); ?></h3> - <table> + <table class="styled"> <?php foreach ($entity_stats as $k => $entry) { arsort($entry); diff --git a/views/default/admin/statistics_opt/online.php b/views/default/admin/statistics_opt/online.php index 70a2979c1..b30e8a396 100644 --- a/views/default/admin/statistics_opt/online.php +++ b/views/default/admin/statistics_opt/online.php @@ -9,12 +9,16 @@ */ // 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; ?> -</div> +if( (is_plugin_enabled('search')) && (is_plugin_enabled('profile')) ) { + get_context('search'); + $users_online = get_online_users(); + get_context('admin'); + ?> + + <div class="admin_settings users_online"> + <h3><?php echo elgg_echo('admin:statistics:label:onlineusers'); ?></h3> + <?php echo $users_online; ?> + </div> +<?php +} +?>
\ No newline at end of file diff --git a/views/default/admin/user.php b/views/default/admin/user.php index 409afbe88..eb07d120e 100644 --- a/views/default/admin/user.php +++ b/views/default/admin/user.php @@ -8,11 +8,12 @@ * @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>"; - -echo elgg_view("admin/user_opt/adduser"); - +// Intro +echo 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']) { diff --git a/views/default/admin/user_opt/adduser.php b/views/default/admin/user_opt/adduser.php index 759678bc1..e69de29bb 100644 --- a/views/default/admin/user_opt/adduser.php +++ b/views/default/admin/user_opt/adduser.php @@ -1,18 +0,0 @@ -<?php -/** - * 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"> - <a href="#" onclick="$('#add_user_showhide').toggle()"><?php echo elgg_echo('admin:user:adduser:label'); ?></a> -</div> -<div id="add_user_showhide" style="display:none" > -<?php echo elgg_view('account/forms/useradd', array('show_admin'=>true)); ?> -</div>
\ No newline at end of file diff --git a/views/default/admin/user_opt/search.php b/views/default/admin/user_opt/search.php index 2e337755b..f853dcf3c 100644 --- a/views/default/admin/user_opt/search.php +++ b/views/default/admin/user_opt/search.php @@ -7,18 +7,19 @@ * @author Curverider Ltd * @link http://elgg.org/ */ + +if( (is_plugin_enabled('search')) && (is_plugin_enabled('profile')) ) { ?> -<div id="search-box"> - <form action="<?php echo $vars['url']; ?>pg/search/" method="get"> - <b><?php echo elgg_echo('admin:user:label:search'); ?></b> - <?php - - echo elgg_view('input/text',array('internalname' => 'q')); - - ?> - <input type="hidden" name="entity_type" value="user" /> - <input type="hidden" name="search_type" value="entities" /> - <input type="submit" name="<?php echo elgg_echo('admin:user:label:searchbutton'); ?>" - value="<?php echo elgg_echo('admin:user:label:searchbutton'); ?>" /> - </form> -</div> + <div class="admin_settings user_search"> + <form action="<?php echo $vars['url']; ?>pg/search/" method="get"> + <h3><?php echo elgg_echo('admin:user:label:search'); ?></h3> + <?php echo elgg_view('input/text',array('internalname' => 'q')); ?> + <input type="hidden" name="entity_type" value="user" /> + <input type="hidden" name="search_type" value="entities" /> + <input type="submit" name="<?php echo elgg_echo('admin:user:label:searchbutton'); ?>" + value="<?php echo elgg_echo('admin:user:label:searchbutton'); ?>" /> + </form> + </div> +<?php +} +?>
\ No newline at end of file diff --git a/views/default/annotation/annotate.php b/views/default/annotation/annotate.php index 0348a0ce8..9e0d20881 100644 --- a/views/default/annotation/annotate.php +++ b/views/default/annotation/annotate.php @@ -1,40 +1,27 @@ <?php -/** - * Elgg comment river view - * - * @package Elgg - * @subpackage Core - * @author Curverider Ltd - * @link http://elgg.org/ - */ -$performed_by = get_entity($vars['item']->subject_guid); -$object = get_entity($vars['item']->object_guid); -$url = $object->getURL(); -$title = $object->title; -if (!$title) { - $title = elgg_echo('untitled'); -} -$subtype = get_subtype_from_id($object->subtype); - -//grab the annotation, if one exists -if ($vars['item']->annotation_id != 0) { - $comment = get_annotation($vars['item']->annotation_id)->value; -} -$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>"; -$string = sprintf(elgg_echo("river:posted:generic"),$url) . " "; -$string .= elgg_echo("{$subtype}:river:annotate") . " | <a href=\"{$object->getURL()}\">" . $title . "</a>"; -$string .= "<div class=\"river_content_display\">"; - -if ($comment) { - $contents = strip_tags($comment);//this is so we don't get large images etc in the activity river - if (strlen($contents) > 200) { - $string .= substr($contents, 0, strpos($contents, ' ', 200)) . "..."; - } else { - $string .= $contents; + $performed_by = get_entity($vars['item']->subject_guid); + $object = get_entity($vars['item']->object_guid); + $url = $object->getURL(); + $title = $object->title; + if(!$title) + $title = elgg_echo('file:untitled'); + $subtype = get_subtype_from_id($object->subtype); + //grab the annotation, if one exists + if($vars['item']->annotation_id != 0) + $comment = get_annotation($vars['item']->annotation_id)->value; + $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>"; + $string = "<div class=\"river_content_title\">" . sprintf(elgg_echo("river:posted:generic"),$url) . " "; + $string .= elgg_echo("{$subtype}:river:annotate") . " <a href=\"{$object->getURL()}\">" . $title . "</a> " . friendly_time($object->time_created) . "</div>"; + if(get_context() != 'riverdashboard'){ + $string .= "<div class=\"river_content_display\">"; + if($comment){ + $contents = strip_tags($comment);//this is so we don't get large images etc in the activity river + if(strlen($contents) > 200) + $string .= substr($contents, 0, strpos($contents, ' ', 200)) . "..."; + else + $string .= $contents; + } + $string .= "</div>"; } -} - -$string .= "</div>"; - echo $string;
\ No newline at end of file diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php index ca0f69eaf..7395d781a 100644 --- a/views/default/annotation/generic_comment.php +++ b/views/default/annotation/generic_comment.php @@ -1,12 +1,6 @@ <?php /** * Elgg generic comment - * - * @package Elgg - * @subpackage Core - * @author Curverider Ltd - * @link http://elgg.org/ - * */ $owner = get_user($vars['annotation']->owner_guid); @@ -25,21 +19,13 @@ $owner = get_user($vars['annotation']->owner_guid); ?> </div> <div class="generic_comment_details"> - - <!-- output the actual comment --> - <?php echo elgg_view("output/longtext",array("value" => $vars['annotation']->value)); ?> - - <p class="generic_comment_owner"> - <a href="<?php echo $owner->getURL(); ?>"><?php echo $owner->name; ?></a> <?php echo friendly_time($vars['annotation']->time_created); ?> - </p> - <?php // if the user looking at the comment can edit, show the delete link if ($vars['annotation']->canEdit()) { ?> - <p> + <div class="delete_button"> <?php echo elgg_view("output/confirmlink",array( @@ -49,10 +35,15 @@ $owner = get_user($vars['annotation']->owner_guid); )); ?> - </p> + </div> <?php } //end of can edit if statement ?> - </div><!-- end of generic_comment_details --> + <p class="generic_comment_owner"> + <a href="<?php echo $owner->getURL(); ?>"><?php echo $owner->name; ?></a> <?php echo friendly_time($vars['annotation']->time_created); ?> + </p> + <!-- output the actual comment --> + <div class="generic_comment_body"><?php echo elgg_view("output/longtext",array("value" => $vars['annotation']->value)); ?></div> + </div><div class="clearfloat"></div><!-- end of generic_comment_details --> </div><!-- end of generic_comment div -->
\ No newline at end of file diff --git a/views/default/annotation/latest_comments.php b/views/default/annotation/latest_comments.php new file mode 100755 index 000000000..85ddfab7b --- /dev/null +++ b/views/default/annotation/latest_comments.php @@ -0,0 +1,39 @@ +<?php +/** + * Display latest comments on objects + **/ + +if($vars['comments']){ + global $CONFIG; + + echo "<div class='sidebar container'>"; + echo "<h2>" . elgg_echo('latestcomments') . "</h2>"; + foreach($vars['comments'] as $comment){ + //grab the entity the comment is on + $entity = get_entity($comment->entity_guid); + //comment owner + $comment_owner = get_user($comment->owner_guid); + $friendlytime = friendly_time($comment->time_created); // get timestamp for comment + + //set the title + if($entity->title) + $objecttitle = $entity->title; + else + $objecttitle = elgg_echo('file:untitled'); + + //if the entity has been deleted, don't link to it + if($entity){ + $url = $entity->getURL(); // get url to file for comment link + $url_display = "<a href=\"{$url}\">{$objecttitle}</a>"; + //$owner = $entity->getOwnerEntity(); // get file owner + }else{ + $url_display = $objecttitle; + } + + echo "<div class='LatestComment'><span class='generic_comment_icon'>" . elgg_view("profile/icon",array('entity' => $comment_owner, 'size' => 'tiny')) . "</span>"; + echo "<p class='owner_timestamp'><a href=\"{$vars['url']}pg/profile/{$comment_owner->username}\">{$comment_owner->name}</a> " . elgg_echo('on') . " {$url_display} <small>{$friendlytime}</small></p>"; + echo "<div class='clearfloat'></div></div>"; + + } + echo "</div>"; +}
\ No newline at end of file diff --git a/views/default/canvas/default.php b/views/default/canvas/default.php index 0cfa8b49a..9ad941ccc 100644 --- a/views/default/canvas/default.php +++ b/views/default/canvas/default.php @@ -8,8 +8,7 @@ * @link http://elgg.org/ */ -for ($i = 1; $i < 8; $i++) { - if (isset($vars["area{$i}"])) { - echo $vars["area{$i}"]; - } -}
\ No newline at end of file +if (isset($vars['area1'])) { + echo $vars['area1']; +} + diff --git a/views/default/canvas/layouts/one_column.php b/views/default/canvas/layouts/one_column.php index c71c2def6..68a75f784 100644 --- a/views/default/canvas/layouts/one_column.php +++ b/views/default/canvas/layouts/one_column.php @@ -8,10 +8,8 @@ * @link http://elgg.org/ */ ?> - -<!-- main content --> -<div id="one_column"> - -<?php echo $vars['area1']; ?> - -</div><!-- /one_column -->
\ No newline at end of file +<div id="elgg_content" class="clearfloat"> + <div id="elgg_page_contents" class="clearfloat one_column"> + <?php echo $vars['area1']; ?> + </div> +</div>
\ No newline at end of file diff --git a/views/default/canvas/layouts/one_column_with_sidebar.php b/views/default/canvas/layouts/one_column_with_sidebar.php new file mode 100644 index 000000000..f7fff4d08 --- /dev/null +++ b/views/default/canvas/layouts/one_column_with_sidebar.php @@ -0,0 +1,23 @@ +<?php +/** + * Elgg 2 column left sidebar canvas layout + * + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @link http://elgg.org/ + */ +?> +<div id="elgg_content" class="clearfloat sidebar"> + <div id="elgg_sidebar"> + <?php + echo elgg_view('page_elements/owner_block'); + if (isset($vars['area1'])) echo $vars['area1']; + if (isset($vars['area3'])) echo $vars['area3']; + ?> + </div> + + <div id="elgg_page_contents" class="clearfloat"> + <?php if (isset($vars['area2'])) echo $vars['area2']; ?> + </div> +</div> diff --git a/views/default/canvas/layouts/two_column_left_sidebar.php b/views/default/canvas/layouts/two_column_left_sidebar.php deleted file mode 100644 index 40eb77b1a..000000000 --- a/views/default/canvas/layouts/two_column_left_sidebar.php +++ /dev/null @@ -1,30 +0,0 @@ -<?php -/** - * Elgg 2 column left sidebar canvas layout - * - * @package Elgg - * @subpackage Core - * @author Curverider Ltd - * @link http://elgg.org/ - */ -?> -<!-- left sidebar --> -<div id="two_column_left_sidebar"> - - <?php - - echo elgg_view('page_elements/owner_block',array('content' => $vars['area1'])); - - ?> - - <?php if (isset($vars['area3'])) echo $vars['area3']; ?> - -</div><!-- /two_column_left_sidebar --> - -<!-- main content --> -<div id="two_column_left_sidebar_maincontent"> - -<?php if (isset($vars['area2'])) echo $vars['area2']; ?> - -</div><!-- /two_column_left_sidebar_maincontent --> - diff --git a/views/default/canvas/layouts/widgets.php b/views/default/canvas/layouts/widgets.php index 7b3470dd2..fa0d2ab0c 100644 --- a/views/default/canvas/layouts/widgets.php +++ b/views/default/canvas/layouts/widgets.php @@ -1,42 +1,52 @@ <?php -/** - * Elgg widget layout - * - * @package Elgg - * @subpackage Core - * @author Curverider Ltd - * @link http://elgg.org/ - */ -$widgettypes = get_widget_types(); - -$owner = page_owner_entity(); - -$area1widgets = get_widgets(page_owner(),get_context(),1); -$area2widgets = get_widgets(page_owner(),get_context(),2); -$area3widgets = get_widgets(page_owner(),get_context(),3); - -if (empty($area1widgets) && empty($area2widgets) && empty($area3widgets)) { - if (isset($vars['area3'])) { - $vars['area1'] = $vars['area3']; - } - if (isset($vars['area4'])) { - $vars['area2'] = $vars['area4']; - } -} - -if ($owner && $owner->canEdit()) { - -?> + /** + * Elgg widget layout + */ + + $widgettypes = get_widget_types(); + + $owner = page_owner_entity(); + + $area1widgets = get_widgets(page_owner(),get_context(),1); + $area2widgets = get_widgets(page_owner(),get_context(),2); + $area3widgets = get_widgets(page_owner(),get_context(),3); + + if (empty($area1widgets) && empty($area2widgets) && empty($area3widgets)) { + + if (isset($vars['area3'])) $vars['area1'] = $vars['area3']; + if (isset($vars['area4'])) $vars['area2'] = $vars['area4']; + + } + + if (is_array($widgettypes) && sizeof($widgettypes) > 0 && $owner && $owner->canEdit()) { + + + + if($_SESSION['user']->guid == page_owner() || ($owner instanceof ElggGroup && $owner->canEdit())){ + + if(get_context() == "profile") { + ?> + <!-- add remove widget button --> + <div class="add_widgets" style="margin:-18px 0 10px;"> + <a href="javascript:void(0);" class="action_button toggle_customise_edit_panel"><?php echo(elgg_echo('dashboard:configure')); ?></a> + </div><div class="clearfloat"></div> + <?php + } + } + ?> -<div id="customise_editpanel"> +<div id="customise_editpanel" class="hidden"> <div id="customise_editpanel_rhs"> <h2><?php echo elgg_echo("widgets:gallery"); ?></h2> <div id="widget_picker_gallery"> + <?php + foreach($widgettypes as $handler => $widget) { + ?> <table class="draggable_widget" cellspacing="0"><tr><td> @@ -45,8 +55,8 @@ if ($owner && $owner->canEdit()) { <input type="hidden" name="multiple" value="<?php if ((isset($widget->handler)) && (isset($widgettypes[$widget->handler]->multiple))) echo $widgettypes[$widget->handler]->multiple; ?>" /> <input type="hidden" name="side" value="<?php if ((isset($widget->handler)) && (isset($widgettypes[$widget->handler])) && (is_array($widgettypes[$widget->handler]->positions))) echo in_array('side',$widgettypes[$widget->handler]->positions); ?>" /> <input type="hidden" name="main" value="<?php if ((isset($widget->handler)) && (isset($widgettypes[$widget->handler])) && (is_array($widgettypes[$widget->handler]->positions))) echo in_array('main',$widgettypes[$widget->handler]->positions); ?>" /> - <input type="hidden" name="handler" value="<?php echo htmlentities($handler, ENT_QUOTES, 'UTF-8'); ?>" /> - <input type="hidden" name="description" value="<?php echo htmlentities($widget->description, ENT_QUOTES, 'UTF-8'); ?>" /> + <input type="hidden" name="handler" value="<?php echo htmlentities($handler); ?>" /> + <input type="hidden" name="description" value="<?php echo htmlentities($widget->description, null, 'UTF-8'); ?>" /> <input type="hidden" name="guid" value="0" /> </h3> </td> @@ -64,6 +74,7 @@ if ($owner && $owner->canEdit()) { </div><!-- /#customise_editpanel_rhs --> </div><!-- /#widget_picker_gallery --> + <div class="customise_editpanel_instructions"> <h2><?php echo elgg_echo('widgets:add'); ?></h2> <?php echo elgg_view('output/longtext', array('value' => elgg_echo('widgets:add:description'))); ?> @@ -73,25 +84,28 @@ if ($owner && $owner->canEdit()) { <div id="customise_page_view"> <table cellspacing="0"> -<tr> - <td colspan="2" align="left" valign="top"> + <tr> + <td colspan="2" align="left" valign="top"> + + <?php +if(get_context() != "profile"){ /* on groups */ + ?> - <?php - if(get_context() == "profile"){ - ?> <h2 class="profile_box"><?php echo elgg_echo("widgets:profilebox"); ?></h2> - <div id="profile_box_widgets"> - <p><small><?php echo elgg_echo('widgets:position:fixed'); ?></small></p> - </div> - <?php - } - ?> - - </td> - - <td rowspan="2" align="left" valign="top"> + <div id="profile_box_widgets"> + <p><small><?php echo elgg_echo('widgets:position:fixed'); ?></small></p> + </div> + + <?php + } + ?> + + </td> + + + <td rowspan="2" align="left" valign="top"> <h2><?php echo elgg_echo("widgets:rightcolumn"); ?></h2> - <div id="rightcolumn_widgets" <?php if(get_context() == "profile")echo "class=\"long\""; ?>> + <div id="rightcolumn_widgets" <?php if(get_context() != "profile")echo "class=\"long\""; ?> > <?php $rightcolumn_widgets = ""; if (is_array($area3widgets) && sizeof($area3widgets) > 0) { @@ -101,17 +115,17 @@ if ($owner && $owner->canEdit()) { } $rightcolumn_widgets .= "{$widget->handler}::{$widget->getGUID()}"; ?> - + <table class="draggable_widget" cellspacing="0"><tr><td width="149px"> <h3> <?php echo $widgettypes[$widget->handler]->name; ?> - <input type="hidden" name="handler" value="<?php - echo $widget->handler; + <input type="hidden" name="handler" value="<?php + echo $widget->handler; ?>" /> <input type="hidden" name="multiple" value="<?php echo $widgettypes[$widget->handler]->multiple; ?>" /> <input type="hidden" name="side" value="<?php echo in_array('side',$widgettypes[$widget->handler]->positions); ?>" /> <input type="hidden" name="main" value="<?php echo in_array('main',$widgettypes[$widget->handler]->positions); ?>" /> - <input type="hidden" name="description" value="<?php echo htmlentities($widgettypes[$widget->handler]->description, ENT_QUOTES, 'UTF-8'); ?>" /> + <input type="hidden" name="description" value="<?php echo htmlentities($widgettypes[$widget->handler]->description); ?>" /> <input type="hidden" name="guid" value="<?php echo $widget->getGUID(); ?>" /> </h3> </td> @@ -119,19 +133,19 @@ if ($owner && $owner->canEdit()) { <td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/spacer.gif" width="14px" height="14px" class="more_info" /></a></td> <td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/spacer.gif" width="15px" height="15px" class="drag_handle" /></a></td> </tr></table> - + <?php - + } } ?> - + </div> - </td><!-- /rightcolumn td --> - -</tr> - -<tr> + </td><!-- /rightcolumn td --> + + </tr> + + <tr> <td> <h2><?php echo elgg_echo("widgets:leftcolumn"); ?></h2> @@ -150,13 +164,13 @@ if ($owner && $owner->canEdit()) { <table class="draggable_widget" cellspacing="0"><tr><td width="149px"> <h3> <?php echo $widgettypes[$widget->handler]->name; ?> - <input type="hidden" name="handler" value="<?php - echo $widget->handler; + <input type="hidden" name="handler" value="<?php + echo $widget->handler; ?>" /> <input type="hidden" name="multiple" value="<?php echo $widgettypes[$widget->handler]->multiple; ?>" /> <input type="hidden" name="side" value="<?php echo in_array('side',$widgettypes[$widget->handler]->positions); ?>" /> <input type="hidden" name="main" value="<?php echo in_array('main',$widgettypes[$widget->handler]->positions); ?>" /> - <input type="hidden" name="description" value="<?php echo htmlentities($widgettypes[$widget->handler]->description, ENT_QUOTES, 'UTF-8'); ?>" /> + <input type="hidden" name="description" value="<?php echo htmlentities($widgettypes[$widget->handler]->description); ?>" /> <input type="hidden" name="guid" value="<?php echo $widget->getGUID(); ?>" /> </h3> </td> @@ -166,7 +180,7 @@ if ($owner && $owner->canEdit()) { </tr></table> <?php - + } } ?> @@ -191,13 +205,13 @@ if ($owner && $owner->canEdit()) { <table class="draggable_widget" cellspacing="0"><tr><td width="149px"> <h3> <?php echo $widgettypes[$widget->handler]->name; ?> - <input type="hidden" name="handler" value="<?php - echo $widget->handler; + <input type="hidden" name="handler" value="<?php + echo $widget->handler; ?>" /> <input type="hidden" name="multiple" value="<?php echo $widgettypes[$widget->handler]->multiple; ?>" /> <input type="hidden" name="side" value="<?php echo in_array('side',$widgettypes[$widget->handler]->positions); ?>" /> <input type="hidden" name="main" value="<?php echo in_array('main',$widgettypes[$widget->handler]->positions); ?>" /> - <input type="hidden" name="description" value="<?php echo htmlentities($widgettypes[$widget->handler]->description, ENT_QUOTES, 'UTF-8'); ?>" /> + <input type="hidden" name="description" value="<?php echo htmlentities($widgettypes[$widget->handler]->description); ?>" /> <input type="hidden" name="guid" value="<?php echo $widget->getGUID(); ?>" /> </h3> </td> @@ -207,7 +221,7 @@ if ($owner && $owner->canEdit()) { </tr></table> <?php - + } } ?> @@ -226,98 +240,100 @@ if ($owner && $owner->canEdit()) { </div><!-- /#customise_page_view --> <form action="<?php echo $vars['url']; ?>action/widgets/reorder" method="post"> +<?php echo elgg_view('input/securitytoken'); ?> <textarea type="textarea" value="Left widgets" style="display:none" name="debugField1" id="debugField1" /><?php echo $leftcolumn_widgets; ?></textarea> <textarea type="textarea" value="Middle widgets" style="display:none" name="debugField2" id="debugField2" /><?php echo $middlecolumn_widgets; ?></textarea> <textarea type="textarea" value="Right widgets" style="display:none" name="debugField3" id="debugField3" /><?php echo $rightcolumn_widgets; ?></textarea> <input type="hidden" name="context" value="<?php echo get_context(); ?>" /> <input type="hidden" name="owner" value="<?php echo page_owner(); ?>" /> - -<?php -$ts = time(); -$token = generate_action_token($ts); -?> -<input type="hidden" name="__elgg_ts" value="<?php echo $ts; ?>" /> -<input type="hidden" name="__elgg_token" value="<?php echo $token; ?>" /> - -<input type="submit" value="<?php echo elgg_echo('save'); ?>" class="submit_button" onclick="$('a.toggle_customise_edit_panel').click();" /> -<input type="button" value="<?php echo elgg_echo('cancel'); ?>" class="cancel_button" onclick="$('a.toggle_customise_edit_panel').click();" /> +<input type="submit" onfocus="blur()" value="<?php echo elgg_echo('save'); ?>" class="submit_button" onclick="$('a.Action_Button.toggle_customise_edit_panel').click();" /> +<input type="button" onfocus="blur()" value="<?php echo elgg_echo('cancel'); ?>" class="cancel_button" onclick="$('a.Action_Button.toggle_customise_edit_panel').click();" /> </form> </div><!-- /customise_editpanel --> <?php - + } - + ?> + <table cellspacing="0" id="widget_table"> -<tr> - <td colspan="2" align="left" valign="top" height="1px"> + <tr> + <td colspan="2" align="left" valign="top" height="1px"> <!-- profile box or 'dashboard info' notice --> <?php if (isset($vars['area1'])) echo $vars['area1']; ?> </td> - <td rowspan="2" align="left" valign="top" height="100%"> - <?php - if($_SESSION['user']->guid == page_owner()){ + <td rowspan="2" align="left" valign="top" height="100%"> + + <?php + if($_SESSION['user']->guid == page_owner() || ($owner instanceof ElggGroup && $owner->canEdit())){ + + if(get_context() != "profile") { ?> - <!-- customise page button --> - <a href="javascript:void(0);" class="toggle_customise_edit_panel"><?php echo(elgg_echo('dashboard:configure')); ?></a> - <!-- <div style="clear:both;"></div> --> + <!-- customise page button appears in different place on groups widgets --> + <div class="add_widgets"> + <a href="javascript:void(0);" class="action_button toggle_customise_edit_panel"><?php echo(elgg_echo('dashboard:configure')); ?></a> + </div> <?php + } } ?> + <div id="widgets_right"> <?php - + if (is_array($area3widgets) && sizeof($area3widgets) > 0) foreach($area3widgets as $widget) { echo elgg_view_entity($widget); } ?> - - </div><!-- /#widgets_right --> - </td> -</tr> -<tr> + + </div><!-- /#widgets_right --> + </td> + </tr> + <tr> <td align="left" valign="top"> - + <!-- left widgets --> <div id="widgets_left"> - + <?php - + if (is_array($area1widgets) && sizeof($area1widgets) > 0) foreach($area1widgets as $widget) { echo elgg_view_entity($widget); } ?> - + </div><!-- /#widgets_left --> - + </td> <td align="left" valign="top"> - + <!-- widgets middle --> <div id="widgets_middle"> - + <?php if (isset($vars['area2'])) echo $vars['area2']; ?> <?php - + if (is_array($area2widgets) && sizeof($area2widgets) > 0) foreach($area2widgets as $widget) { echo elgg_view_entity($widget); } - + ?> - + </div><!-- /#widgets_middle --> - + </td> </tr> </table> + + diff --git a/views/default/canvas_header/submenu_group.php b/views/default/canvas_header/submenu_group.php index 2ec9ab451..bf9fb6ab8 100644 --- a/views/default/canvas_header/submenu_group.php +++ b/views/default/canvas_header/submenu_group.php @@ -15,5 +15,6 @@ if (isset($vars['group_name'])) { if (isset($vars['submenu'])) { $submenu = "<ul>" . $vars['submenu'] . "</ul>"; - echo "<div class=\"submenu_group\"><div class=\"submenu_group_{$groupname}\">{$submenu}</div></div>"; + //echo "<div class=\"submenu_group\"><div class=\"submenu_group_{$groupname}\">{$submenu}</div></div>"; + echo $submenu; }
\ No newline at end of file diff --git a/views/default/comments/forms/edit.php b/views/default/comments/forms/edit.php index 3116bd3da..a52d8659c 100644 --- a/views/default/comments/forms/edit.php +++ b/views/default/comments/forms/edit.php @@ -8,12 +8,15 @@ * * @uses $vars['entity'] */ + + if (isset($vars['entity']) && isloggedin()) { + + $form_body = "<div class='contentWrapper comment'><p class='longtext_editarea'><label>".elgg_echo("generic_comments:text")."<br />" . elgg_view('input/longtext',array('internalname' => 'generic_comment')) . "</label></p>"; + $form_body .= elgg_view('input/hidden', array('internalname' => 'entity_guid', 'value' => $vars['entity']->getGUID())); + $form_body .= elgg_view('input/submit', array('value' => elgg_echo("save"))) . "</div>"; + + echo elgg_view('input/form', array('body' => $form_body, 'action' => "{$vars['url']}action/comments/add")); -if (isset($vars['entity']) && isloggedin()) { - $form_body = "<div class=\"contentWrapper\"><p class='longtext_editarea'><label>".elgg_echo("generic_comments:text")."<br />" . elgg_view('input/longtext',array('internalname' => 'generic_comment')) . "</label></p>"; - $form_body .= "<p>" . elgg_view('input/hidden', array('internalname' => 'entity_guid', 'value' => $vars['entity']->getGUID())); - $form_body .= elgg_view('input/submit', array('value' => elgg_echo("save"))) . "</p></div>"; - - echo elgg_view('input/form', array('body' => $form_body, 'action' => "{$vars['url']}action/comments/add")); - -}
\ No newline at end of file + } + +?>
\ No newline at end of file diff --git a/views/default/css.php b/views/default/css.php index e5df6a0b2..80885ef7d 100644 --- a/views/default/css.php +++ b/views/default/css.php @@ -1,20 +1,42 @@ -<?php /** - * Elgg Default Theme - * core CSS file - * - * Updated 30 Sept 09 - * - * @package Elgg - * @subpackage Core - * @link http://elgg.org/ - * + * ELGG DEFAULT CSS * @uses $vars['wwwroot'] The site URL - */ -?> +*/ + +/* Table of Contents: + + RESET CSS reduce browser inconsistencies in line height, margins, font size... + CSS BASICS <body> <p> <a> <h1> + PAGE LAYOUT main page content blocks: header, sidebar, footer... + GENERIC SELECTORS reusable generic classes + ELGG TOPBAR elgg topbar + TOOLS MENU drop-down tools menu in topbar + HEADER CONTENTS + FOOTER CONTENTS + SYSTEM MESSAGES system messages overlay + BREADCRUMBS + SUBMENU current page/tool submenu in sidebar + PAGINATION re-usable default page navigation + ELGG TABBED NAVIGATION primary tabbed elgg navigation in header + LOGIN / REGISTER login box, register, and lost password page styles + CONTENT HEADER + ENTITY LISTINGS elgg's default entity listings + USER SETTINGS & ADMIN AREA styles for user settings and default admin area + GENERAL FORM ELEMENTS default styles for all elgg input/form elements + + + +*/ +/* Colors: + + #4690D6 - elgg light blue + #0054A7 - elgg dark blue +*/ + + /* *************************************** - RESET BASE STYLES + RESET CSS *************************************** */ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, @@ -34,19 +56,28 @@ table, caption, tbody, tfoot, thead, tr, th, td { font-family: inherit; vertical-align: baseline; } -/* remember to define focus styles! */ +img { + border-width:0; + border-color:transparent; +} :focus { - outline: 0; + outline:0 none; + -moz-outline-style: none; } ol, ul { - list-style: none; + list-style:none outside none; } em, i { font-style:italic; } -/* tables still need cellspacing="0" (for ie6) */ +ins { + text-decoration:none; +} +del { + text-decoration:line-through; +} table { - border-collapse: separate; + border-collapse: collapse; border-spacing: 0; } caption, th, td { @@ -61,74 +92,46 @@ q:before, q:after { blockquote, q { quotes: "" ""; } -.clearfloat { - clear:both; - height:0; - font-size: 1px; - line-height: 0px; -} -/* *************************************** - DEFAULTS -*************************************** */ -/* elgg open source blue #4690d6 */ -/* elgg open source dark blue #0054a7 */ -/* elgg open source light yellow #FDFFC3 */ -/* elgg open source light blue #bbdaf7 */ +/* *************************************** + BASICS +*************************************** */ body { text-align:left; margin:0 auto; padding:0; - background: #dedede; - font: 80%/1.4 "Lucida Grande", Verdana, sans-serif; - color: #333333; + background-color: white; + font-size: 80%; + line-height: 1.4em; + font-family: "Lucida Grande",Arial,Tahoma,Verdana,sans-serif; } a { - color: #4690d6; + color: #4690D6; text-decoration: none; -moz-outline-style: none; outline: none; } -a:visited { - -} -a:hover { - color: #0054a7; +a:hover, +a.selected { + color: #555555; text-decoration: underline; } p { - margin: 0px 0px 15px 0; -} -img { - border: none; -} -ul { - margin: 5px 0px 15px; - padding-left: 20px; -} -ul li { - margin: 0px; -} -ol { - margin: 5px 0px 15px; - padding-left: 20px; -} -ul li { - margin: 0px; + margin-bottom:15px; } -form { - margin: 0px; - padding: 0px; +p:last-child { + margin-bottom:0; } small { font-size: 90%; } h1, h2, h3, h4, h5, h6 { font-weight: bold; - line-height: normal; + line-height: auto; + color:#0054A7; } h1 { font-size: 1.8em; } h2 { font-size: 1.5em; } @@ -136,29 +139,24 @@ h3 { font-size: 1.2em; } h4 { font-size: 1.0em; } h5 { font-size: 0.9em; } h6 { font-size: 0.8em; } - dt { - margin: 0; - padding: 0; font-weight: bold; } dd { margin: 0 0 1em 1em; - padding: 0; } pre, code { font-family:Monaco,"Courier New",Courier,monospace; font-size:12px; background:#EBF5FF; overflow:auto; - + overflow-x: auto; /* Use horizontal scroller if needed; for Firefox 2, not needed in Firefox 3 */ white-space: pre-wrap; /* css-3 */ white-space: -moz-pre-wrap !important; /* Mozilla, since 1999 */ white-space: -pre-wrap; /* Opera 4-6 */ white-space: -o-pre-wrap; /* Opera 7 */ word-wrap: break-word; /* Internet Explorer 5.5+ */ - } code { padding:2px 3px; @@ -173,415 +171,289 @@ blockquote { margin:0px 0 15px 0; line-height:1.3em; background:#EBF5FF; - border:none !important; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; -} -blockquote p { - margin:0 0 5px 0; + border:none; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; } + /* *************************************** - PAGE LAYOUT - MAIN STRUCTURE + GENERIC SELECTORS *************************************** */ -#page_container { - margin:0; - padding:0; +h2 { + border-bottom:1px solid #CCCCCC; + padding-bottom:5px; +} +.clearfloat:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; +} +.divider { + border-top:1px solid #cccccc; } -#page_wrapper { - width:990px; - margin:0 auto; - padding:0; - min-height: 300px; - +.hidden { + display:none; } -#layout_header { - text-align:left; - width:100%; - height:67px; - background:#dedede; +.radius8 { + -webkit-border-radius: 8px; + -moz-border-radius: 8px; } -#wrapper_header { - margin:0; - padding:10px 20px 20px 0px; +.margin_top { + margin-top:10px; } -#wrapper_header h1 { - margin:10px 0 0 0; - letter-spacing: -0.03em; +form.action { + margin-top:10px; } -#layout_canvas { - margin:0 0 20px 0; - padding:20px; - min-height: 360px; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - background: white; - border-bottom:1px solid #cccccc; - border-right:1px solid #cccccc; +.tags { + background-image:url(<?php echo $vars['url']; ?>mod/elgg_layout/graphics/icon_tag.png); + background-repeat: no-repeat; + background-position: left 2px; + padding:1px 0 0 16px; + font-size: 90%; } - - -/* canvas layout: 1 column, no sidebar */ -#one_column { -/* width:928px; */ - margin:0; - min-height: 360px; - background: #dedede; - padding:0 0 10px 0; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; +.ajax_loader { + background-color: white; + background-image: url(<?php echo $vars['url']; ?>mod/elgg_layout/graphics/ajax_loader_bw.gif); + background-repeat: no-repeat; + background-position: center 30px; + /* + width:auto; + height:100px; + margin:0 10px 0 10px; +*/ } - -/* canvas layout: 2 column left sidebar */ -#two_column_left_sidebar { - width:210px; - margin:0 20px 0 0; - min-height:360px; - float:left; - background: #dedede; - padding:0px; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - border-bottom:1px solid #cccccc; - border-right:1px solid #cccccc; +#elgg_sidebar h3 { + border-bottom:1px solid #CCCCCC; + margin-bottom:5px; + margin-top:20px; + padding-bottom:5px; } -#two_column_left_sidebar_maincontent { - width:718px; - margin:0; - min-height: 360px; - float:left; - background: #dedede; - padding:0 0 5px 0; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; +/* *************************************** + PAGE LAYOUT - MAIN BLOCKS POSITIONING +*************************************** */ +#elgg_topbar { + background:#333333 url(<?php echo $vars['url']; ?>_graphics/toptoolbar_background.gif) repeat-x top left; + color:#eeeeee; + border-bottom:1px solid #000000; + min-width:998px; + position:relative; + width:100%; + height:24px; + z-index: 9000; } - - - - -#two_column_left_sidebar_maincontent_boxes { - margin:0 0px 20px 20px; - padding:0 0 5px 0; - width:718px; - background: #dedede; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - float:left; +#elgg_header { + overflow: hidden; + position: relative; + width: 100%; + height:90px; + background-color: #4690D6; } -#two_column_left_sidebar_boxes { - width:210px; - margin:0px 0 20px 0px; - min-height:360px; - float:left; - padding:0; +#elgg_header_contents { + width:990px; + position: relative; + margin:0 auto; + height:90px; } -#two_column_left_sidebar_boxes .sidebarBox { - margin:0px 0 22px 0; - background: #dedede; - padding:4px 10px 10px 10px; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - border-bottom:1px solid #cccccc; - border-right:1px solid #cccccc; +#elgg_search { + bottom:5px; + height:23px; + position:absolute; + right:0; } -#two_column_left_sidebar_boxes .sidebarBox h3 { - padding:0 0 5px 0; - font-size:1.25em; - line-height:1.2em; - color:#0054A7; +#elgg_main_nav { + z-index: 7000; + position: absolute; + height:23px; + bottom:0; + left:0; + width:auto; } - -/* canvas layout: 2 column right sidebar */ -#two_column_right_sidebar { - width:210px; - margin:0 0 0 20px; - min-height:360px; - float:left; - background: #dedede; - padding:0px; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - border-bottom:1px solid #cccccc; - border-right:1px solid #cccccc; +#elgg_content { /* wraps sidebar and page contents */ + width:990px; + position: relative; + margin:0 auto; + min-height:400px; } - - -.contentWrapper { - background:white; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - padding:10px; - margin:0 10px 10px 10px; +#elgg_content.sidebar { /* class on #elgg_content div to give a full-height sidebar background */ + background-image:url(<?php echo $vars['url']; ?>mod/elgg_layout/graphics/sidebar_background.gif); + background-repeat:repeat-y; + background-position: right top; } -span.contentIntro p { - margin:0 0 0 0; +#elgg_page_contents { /* main page contents */ + float:left; + width:730px; + position: relative; + min-height: 360px; + margin:10px 20px 20px 10px; } -.notitle { - margin-top:10px; +#elgg_page_contents.one_column { /* class on #elgg_page_contents when no sidebar */ + width:970px; + margin-right:10px; } - -/* canvas layout: widgets (profile and dashboard) */ -#widgets_left { - width:303px; - margin:0 20px 20px 0; +#elgg_sidebar { /* elgg sidebar */ + float:right; + width:210px; + margin:20px 10px; + position: relative; min-height:360px; - padding:0; } -#widgets_middle { - width:303px; - margin:0 0 20px 0; - padding:0; -} -#widgets_right { - width:303px; - margin:0px 0 20px 20px; - float:left; - padding:0; -} -#widget_table td { - border:0; - padding:0; - margin:0; - text-align: left; - vertical-align: top; +#elgg_footer { + position: relative; + z-index: 999; } -/* IE6 fixes */ -* html #widgets_right { float:none; } -* html #profile_info_column_left { - margin:0 10px 0 0; - width:200px; +#elgg_footer_contents { + border-top:1px solid #DEDEDE; + margin:0 auto; + width:990px; + padding:3px 0 10px 0; + text-align: right; } -* html #dashboard_info { width:585px; } -/* IE7 */ -*:first-child+html #profile_info_column_left { width:200px; } + /* *************************************** - SPOTLIGHT + ELGG MAIN NAVIGATION in header *************************************** */ -#layout_spotlight { - margin:20px 0 20px 0; - padding:0; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - background: white; - border-bottom:1px solid #cccccc; - border-right:1px solid #cccccc; -} -#wrapper_spotlight { +.navigation, +.navigation ul { margin:0; padding:0; - height:auto; -} -#wrapper_spotlight #spotlight_table h2 { - color:#4690d6; - font-size:1.25em; - line-height:1.2em; -} -#wrapper_spotlight #spotlight_table li { - list-style: square; - line-height: 1.2em; - margin:5px 20px 5px 0; - color:#4690d6; + display:inline; + float:left; + list-style-type: none; + z-index: 7000; + position: relative; } -#wrapper_spotlight .collapsable_box_content { +.navigation li { + list-style: none; + font-weight: bold; + position: relative; + display:block; + height:23px; + float:left; margin:0; - padding:10px 10px 5px 10px; - background:none; - min-height:60px; - border:none; - border-top:1px solid #cccccc; -} -#spotlight_table { - margin:0 0 2px 0; -} -#spotlight_table .spotlightRHS { - float:right; - width:270px; - margin:0 0 0 50px; -} -/* IE7 */ -*:first-child+html #wrapper_spotlight .collapsable_box_content { - width:958px; -} -#layout_spotlight .collapsable_box_content p { padding:0; } -#wrapper_spotlight .collapsable_box_header { - border: none; - background: none; -} - - -/* *************************************** - FOOTER -*************************************** */ -#layout_footer { - background: #b6b6b6; - height:80px; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - margin:0 0 20px 0; -} -#layout_footer table { -margin:0 0 0 20px; +.navigation a { + display:block; } -#layout_footer a, #layout_footer p { -color:#333333; -margin:0; +.navigation a { + color:white; + margin:0 1px 0 0px; + text-decoration:none; + font-weight: bold; + font-size: 1em; + padding:3px 13px 0px 13px; + height:20px; } -#layout_footer .footer_toolbar_links { - text-align:right; - padding:15px 0 0 0; - font-size:1.2em; +.navigation li a.hover, +.navigation a:hover { + background:white; + color:#43575e; + -moz-border-radius-topleft:4px; + -moz-border-radius-topright:4px; + -webkit-border-top-left-radius:4px; + -webkit-border-top-right-radius:4px; } -#layout_footer .footer_legal_links { - text-align:right; +.navigation li.selected a { + background:white; + color:#43575e; + -moz-border-radius-topleft:4px; + -moz-border-radius-topright:4px; + -webkit-border-top-left-radius:4px; + -webkit-border-top-right-radius:4px; + margin-top:2px; } + /* *************************************** -HORIZONTAL ELGG TOPBAR + ELGG TOPBAR *************************************** */ -#elgg_topbar { - background:#333333 url(<?php echo $vars['url']; ?>_graphics/toptoolbar_background.gif) repeat-x top left; - color:#eeeeee; - border-bottom:1px solid #000000; - min-width:998px; - position:relative; - width:100%; - height:24px; - z-index: 9000; /* if you have multiple position:relative elements, then IE sets up separate Z layer contexts for each one, which ignore each other */ -} -#elgg_topbar_container_left { +#elgg_topbar_contents { float:left; height:24px; left:0px; top:0px; position:absolute; text-align:left; - width:60%; -} -#elgg_topbar_container_right { - float:right; - height:24px; - position:absolute; - right:0px; - top:0px; - /* width:120px;*/ - text-align:right; -} -#elgg_topbar_container_search { - float:right; - height:21px; - /*width:280px;*/ - position:relative; - right:120px; - text-align:right; - margin:3px 0 0 0; + width:100%; } -#elgg_topbar_container_left .toolbarimages { - float:left; +#elgg_topbar_contents a { margin-right:20px; -} -#elgg_topbar_container_left .toolbarlinks { - margin:0 0 10px 0; - float:left; -} -#elgg_topbar_container_left .toolbarlinks2 { - margin:3px 0 0 0; + padding-top:2px; + display:inline; float:left; -} -#elgg_topbar_container_left a.loggedinuser { + text-align: left; color:#eeeeee; - font-weight:bold; - margin:0 0 0 5px; } -#elgg_topbar_container_left a.pagelinks { - color:white; - margin:0 15px 0 5px; - display:block; - padding:3px; -} -#elgg_topbar_container_left a.pagelinks:hover { - background: #4690d6; - text-decoration: none; -} -#elgg_topbar_container_left a.privatemessages { - background:transparent url(<?php echo $vars['url']; ?>_graphics/toolbar_messages_icon.gif) no-repeat left 2px; - padding:0 0 4px 16px; - margin:0 15px 0 5px; - cursor:pointer; +#elgg_topbar_contents a:hover { + color:#71cbff; + text-decoration: none; } -#elgg_topbar_container_left a.privatemessages:hover { - text-decoration: none; - background:transparent url(<?php echo $vars['url']; ?>_graphics/toolbar_messages_icon.gif) no-repeat left -36px; -} -#elgg_topbar_container_left a.privatemessages_new { - background:transparent url(<?php echo $vars['url']; ?>_graphics/toolbar_messages_icon.gif) no-repeat left -17px; - padding:0 0 0 18px; - margin:0 15px 0 5px; - color:white; -} -/* IE6 */ -* html #elgg_topbar_container_left a.privatemessages_new { background-position: left -18px; } -/* IE7 */ -*+html #elgg_topbar_container_left a.privatemessages_new { background-position: left -18px; } - -#elgg_topbar_container_left a.privatemessages_new:hover { - text-decoration: none; -} - -#elgg_topbar_container_left a.usersettings { - margin:0 0 0 20px; - color:#999999; - padding:3px; +#elgg_topbar_contents a img.user_mini_avatar { + border:1px solid #eeeeee; + margin:1px 0 0 10px; + display: block; } -#elgg_topbar_container_left a.usersettings:hover { - color:#eeeeee; +#elgg_topbar_contents a img.site_logo { + display: block; + margin-left:5px; + margin-top: -1px; } -#elgg_topbar_container_left img { - margin:0 0 0 5px; +#elgg_topbar_contents .log_out { + float:right; } -#elgg_topbar_container_left .user_mini_avatar { - border:1px solid #eeeeee; - margin:0 0 0 20px; +#elgg_topbar_contents .log_out a { + display: inline; + text-align: right; + margin-right:10px; + color:#999999; } -#elgg_topbar_container_right { - padding:3px 0 0 0; +#elgg_topbar_contents .log_out a:hover { + color:#71cbff; } -#elgg_topbar_container_right a { - color:#eeeeee; - margin:0 5px 0 0; - background:transparent url(<?php echo $vars['url']; ?>_graphics/elgg_toolbar_logout.gif) no-repeat top right; - padding:0 21px 0 0; - display:block; - height:20px; +#elgg_topbar_contents a.settings { + background:transparent url(<?php echo $vars['url']; ?>mod/elgg_layout/graphics/topbar_icons.png) no-repeat left -41px; + padding-left:20px !important; + float:right; + margin-right:30px; } -/* IE6 fix */ -* html #elgg_topbar_container_right a { - width: 120px; +#elgg_topbar_contents a.admin { + background:transparent url(<?php echo $vars['url']; ?>mod/elgg_layout/graphics/topbar_icons.png) no-repeat left -41px; + padding-left:20px !important; + float:right; + margin-right:30px; } -#elgg_topbar_container_right a:hover { - background-position: right -21px; +#elgg_topbar_contents a.help { + background:transparent url(<?php echo $vars['url']; ?>mod/elgg_layout/graphics/topbar_icons.png) no-repeat 0 -133px; + padding-left:18px !important; + float:right; + margin-right:30px; } -#elgg_topbar_panel { - background:#333333; - color:#eeeeee; - height:200px; - width:100%; - padding:10px 20px 10px 20px; - display:none; - position:relative; + + + + +/* @todo PH check + move into shared access? */ +#elgg_topbar_contents a.shared_access { + background:transparent url(<?php echo $vars['url']; ?>_graphics/icons_shared_access.png) no-repeat 0 -15px; + padding-left:20px !important; + float:right; } + + /* *************************************** - TOP BAR - VERTICAL TOOLS MENU + TOOLS MENU *************************************** */ -/* elgg toolbar menu setup */ -ul.topbardropdownmenu, ul.topbardropdownmenu ul { +#elgg_topbar_contents ul.tools_menu, +#elgg_topbar_contents ul.tools_menu ul { margin:0; padding:0; display:inline; @@ -590,10 +462,14 @@ ul.topbardropdownmenu, ul.topbardropdownmenu ul { z-index: 9000; position: relative; } -ul.topbardropdownmenu { - margin:0pt 20px 0pt 5px; +#elgg_topbar_contents ul.tools_menu { + margin:0 20px 0 5px; +} +#elgg_topbar_contents li.menu a.tools { + background:transparent url(<?php echo $vars['url']; ?>mod/elgg_layout/graphics/topbar_icons.png) no-repeat 3px 1px; + padding-left:24px !important; } -ul.topbardropdownmenu li { +#elgg_topbar_contents ul.tools_menu li { display: block; list-style: none; margin: 0; @@ -601,798 +477,834 @@ ul.topbardropdownmenu li { float: left; position: relative; } -ul.topbardropdownmenu a { +#elgg_topbar_contents ul.tools_menu a { display:block; } -ul.topbardropdownmenu ul { +#elgg_topbar_contents ul.tools_menu ul { display: none; position: absolute; left: 0; margin: 0; padding: 0; } -/* IE6 fix */ -* html ul.topbardropdownmenu ul { - line-height: 1.1em; -} -/* IE6/7 fix */ -ul.topbardropdownmenu ul a { - zoom: 1; -} -ul.topbardropdownmenu ul li { +#elgg_topbar_contents ul.tools_menu ul li { float: none; -} -/* elgg toolbar menu style */ -ul.topbardropdownmenu ul { +} +/* elgg toolbar drop-down menu style */ +#elgg_topbar_contents ul.tools_menu ul { width: 150px; top: 24px; + overflow: hidden; border-top:1px solid black; } -ul.topbardropdownmenu *:hover { +#elgg_topbar_contents ul.tools_menu *:hover { background-color: none; } -ul.topbardropdownmenu a { - padding:3px; +#elgg_topbar_contents ul.tools_menu a { + padding:2px 7px 4px 7px; text-decoration:none; color:white; + overflow-y: hidden; } -ul.topbardropdownmenu li.hover a { - background-color: #4690d6; +#elgg_topbar_contents ul.tools_menu li.hover a { + background-color: #333333; text-decoration: none; } -ul.topbardropdownmenu ul li.drop a { - font-weight: normal; -} -/* IE7 fixes */ -*:first-child+html #elgg_topbar_container_left a.pagelinks { - -} -*:first-child+html ul.topbardropdownmenu li.drop a.menuitemtools { - padding-bottom:6px; -} -ul.topbardropdownmenu ul li a { - background-color: #999999;/* menu off state color */ +#elgg_topbar_contents ul.tools_menu ul li a { + background-color: #333333; /* menu off-state color */ font-weight: bold; padding-left:6px; padding-top:4px; padding-bottom:0; height:22px; + width:150px; + display: block; border-bottom: 1px solid white; } -ul.topbardropdownmenu ul a.hover { - background-color: #333333; +#elgg_topbar_contents ul.tools_menu ul a.hover { + background-color: #0054a7; /* menu hover-state color */ } -ul.topbardropdownmenu ul a { +#elgg_topbar_contents ul.tools_menu ul a { opacity: 0.9; - filter: alpha(opacity=90); } + /* *************************************** -SYSTEM MESSSAGES + HEADER CONTENTS *************************************** */ -.messages { - background:#ccffcc; - color:#000000; - padding:3px 10px 3px 10px; - z-index: 8000; - margin:0; - position:fixed; - top:30px; - width:969px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border:4px solid #00CC00; - cursor: pointer; +#elgg_header_contents h1 a { + font-size: 2em; + line-height:1.7em; + color: white; + font-style: italic; + font-family: Georgia, times, serif; + display: block; + text-decoration: none; + text-shadow:1px 2px 4px #333333; } -.messages_error { - border:4px solid #D3322A; - background:#F7DAD8; - color:#000000; - padding:3px 10px 3px 10px; - z-index: 8000; +#elgg_header_contents #elgg_search input.search_input { + -webkit-border-radius: 10px; + -moz-border-radius: 10px; + background-color:transparent; + border:1px solid #71b9f7; + color:white; + font-size:12px; + font-weight:bold; margin:0; - position:fixed; - top:30px; - width:969px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - cursor: pointer; -} -.closeMessages { - float:right; - margin-top:17px; + padding:2px 4px 2px 26px; + width:198px; + background-image: url(<?php echo $vars['url']; ?>mod/elgg_layout/graphics/search.png); + background-position: 3px 0; + background-repeat: no-repeat; +} +#elgg_header_contents #elgg_search input.search_input:focus { + background-color:white; + color:#0054A7; + border:1px solid white; + background-position: 3px -37px; } -.closeMessages a { - color:#666666; - cursor: pointer; - text-decoration: none; - font-size: 80%; +#elgg_header_contents #elgg_search input.search_input:active { + background-color:white; + color:#0054A7; + border:1px solid white; + background-position: 3px -37px; } -.closeMessages a:hover { - color:black; +#elgg_header_contents #elgg_search input.search_submit_button { + display:none; } /* *************************************** -COLLAPSABLE BOXES + FOOTER CONTENTS *************************************** */ -.collapsable_box { - margin: 0 0 20px 0; - height:auto; - +#elgg_footer_contents, +#elgg_footer_contents a, +#elgg_footer_contents p { + color:#999999; } -/* IE6 fix */ -* html .collapsable_box { - height:10px; +#elgg_footer_contents a:hover { + color:#666666; } -.collapsable_box_header { - color: #4690d6; - padding: 5px 10px 5px 10px; +.#elgg_footer_contents p { margin:0; - border-left: 1px solid white; - border-right: 1px solid #cccccc; - border-bottom: 1px solid #cccccc; - -moz-border-radius-topleft:8px; - -moz-border-radius-topright:8px; - -webkit-border-top-right-radius:8px; - -webkit-border-top-left-radius:8px; - background:#dedede; } -.collapsable_box_header h1 { - color: #0054a7; - font-size:1.25em; - line-height: 1.2em; +.powered_by_elgg_badge { + float:right; } -.collapsable_box_content { - padding: 10px 0 10px 0; - margin:0; - height:auto; - background:#dedede; - -moz-border-radius-bottomleft:8px; - -moz-border-radius-bottomright:8px; - -webkit-border-bottom-right-radius:8px; - -webkit-border-bottom-left-radius:8px; - border-left: 1px solid white; - border-right: 1px solid #cccccc; - border-bottom: 1px solid #cccccc; + + +/* *************************************** + SYSTEM MESSAGES +*************************************** */ +#elgg_system_message { + background-color:black; + color:white; + font-weight: bold; + display:block; + padding:3px 10px; + z-index: 9600; + position:fixed; + right:20px; + margin-top:10px; + width:auto; + cursor: pointer; + opacity:0.9; + -webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45); /* safari v3+ */ + -moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45); /* FF v3.5+ */ } -.collapsable_box_content .contentWrapper { - margin-bottom:5px; +#elgg_system_message.error { + background-color:red; } -.collapsable_box_editpanel { - display: none; - background: #a8a8a8; - padding:10px 10px 5px 10px; - border-left: 1px solid white; - border-bottom: 1px solid white; +#elgg_system_message p { + margin:0; } -.collapsable_box_editpanel p { - margin:0 0 5px 0; + + +/* *************************************** + BREADCRUMBS +*************************************** */ +#breadcrumbs { + font-size: 80%; + line-height:1.2em; + color:#bababa; + position: relative; + top:-8px; + left:0; } -.collapsable_box_header a.toggle_box_contents { - color: #4690d6; - cursor:pointer; - font-family: Arial, Helvetica, sans-serif; - font-size:20px; - font-weight: bold; - text-decoration:none; - float:right; - margin: 0; - margin-top: -7px; +#breadcrumbs a { + color:#999999; + font-weight:bold; + text-decoration: none; } -.collapsable_box_header a.toggle_box_edit_panel { - color: #4690d6; - cursor:pointer; - font-size:9px; - text-transform: uppercase; - text-decoration:none; - font-weight: normal; - float:right; - margin: 3px 10px 0 0; +#breadcrumbs a:hover { + color: #0054a7; + text-decoration: underline; } -.collapsable_box_editpanel label { - font-weight: normal; - font-size: 100%; + + +/* *************************************** + SUBMENU +*************************************** */ +.submenu ul { + margin:0; + padding:0; + list-style: none; } -/* used for collapsing a content box */ -.display_none { - display:none; +.submenu ul li.selected a { + background: #4690D6; + color:white; } -/* used on spotlight box - to cancel default box margin */ -.no_space_after { - margin: 0 0 0 0; +.submenu ul li a { + display:block; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + background-color:white; + margin:0 0 3px 0; + padding:2px 4px 2px 8px; +} +.submenu ul li a:hover { + background:#0054A7; + color:white; + text-decoration:none; } /* *************************************** - GENERAL FORM ELEMENTS + PAGINATION *************************************** */ -label { - font-weight: bold; - color:#333333; - font-size: 120%; -} -input { - font: 120% Arial, Helvetica, sans-serif; - padding: 5px; - border: 1px solid #cccccc; - color:#666666; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; -} -input[type="checkbox"] { - padding: 1px; - border-style: none; -} -textarea { - font: 120% Arial, Helvetica, sans-serif; - border: solid 1px #cccccc; - padding: 5px; - color:#666666; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; +.pagination { + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + background:white; + margin:5px 10px 5px 10px; + padding:5px; } -textarea:focus, input[type="text"]:focus { - border: solid 1px #4690d6; - background-color: #e4ecf5; - color:#333333; +.pagination .pagination_number { + display:block; + float:left; + background:#ffffff; + border:1px solid #4690d6; + text-align: center; + color:#4690d6; + font-size: 12px; + font-weight: normal; + margin:0 6px 0 0; + padding:0px 4px; + cursor: pointer; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; } -.submit_button { - font: 12px/100% Arial, Helvetica, sans-serif; - font-weight: bold; - color: #ffffff; +.pagination .pagination_number:hover { background:#4690d6; - border: 1px solid #4690d6; - -webkit-border-radius: 4px; + color:white; + text-decoration: none; +} +.pagination .pagination_more { + display:block; + float:left; + background:#ffffff; + border:1px solid #ffffff; + text-align: center; + color:#4690d6; + font-size: 12px; + font-weight: normal; + margin:0 6px 0 0; + padding:0px 4px; + -webkit-border-radius: 4px; -moz-border-radius: 4px; - width: auto; - height: 25px; - padding: 2px 6px 2px 6px; - margin:10px 0 10px 0; - cursor: pointer; } -.submit_button:hover, input[type="submit"]:hover { - background: #0054a7; - border-color: #0054a7; +.pagination .pagination_previous, +.pagination .pagination_next { + display:block; + float:left; + border:1px solid #4690d6; + color:#4690d6; + text-align: center; + font-size: 12px; + font-weight: normal; + margin:0 6px 0 0; + padding:0px 4px; + cursor: pointer; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; } - -input[type="submit"] { - font: 12px/100% Arial, Helvetica, sans-serif; - font-weight: bold; - color: #ffffff; +.pagination .pagination_previous:hover, +.pagination .pagination_next:hover { background:#4690d6; - border: 1px solid #4690d6; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - width: auto; - height: 25px; - padding: 2px 6px 2px 6px; - margin:10px 0 10px 0; - cursor: pointer; + color:white; + text-decoration: none; } -.cancel_button { - font: 12px/100% Arial, Helvetica, sans-serif; +.pagination .pagination_currentpage { + display:block; + float:left; + background:#4690d6; + border:1px solid #4690d6; + text-align: center; + color:white; + font-size: 12px; font-weight: bold; - color: #999999; - background:#dddddd; - border: 1px solid #999999; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - width: auto; - height: 25px; - padding: 2px 6px 2px 6px; - margin:10px 0 10px 10px; + margin:0 6px 0 0; + padding:0px 4px; cursor: pointer; -} -.cancel_button:hover { - background: #cccccc; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; } -.input-password, -.input-text, -.input-tags, -.input-url, -.input-textarea { - width:98%; -} -.input-textarea { - height: 200px; +/* *************************************** + ELGG TABBED PAGE NAVIGATION +*************************************** */ +.elgg_horizontal_tabbed_nav { + margin-bottom:5px; + padding: 0; + border-bottom: 2px solid #cccccc; + display:table; + width:100%; +} +.elgg_horizontal_tabbed_nav ul { + list-style: none; + padding: 0; + margin: 0; +} +.elgg_horizontal_tabbed_nav li { + float: left; + border: 2px solid #cccccc; + border-bottom-width: 0; + background: #eeeeee; + margin: 0 0 0 10px; + -moz-border-radius-topleft:5px; + -moz-border-radius-topright:5px; + -webkit-border-top-left-radius:5px; + -webkit-border-top-right-radius:5px; +} +.elgg_horizontal_tabbed_nav a { + text-decoration: none; + display: block; + padding:3px 10px 0 10px; + text-align: center; + height:21px; + color:#999999; +} +.elgg_horizontal_tabbed_nav a:hover { + background: #dedede; + color:#4690D6; +} +.elgg_horizontal_tabbed_nav .selected { + border-color: #cccccc; + background: white; +} +.elgg_horizontal_tabbed_nav .selected a { + position: relative; + top: 2px; + background: white; } /* *************************************** LOGIN / REGISTER *************************************** */ -#login-box { - margin:0 0 10px 0; - padding:0 0 10px 0; - background: #dedede; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - width:240px; - text-align:left; -} -#login-box form { - margin:0 10px 0 10px; - padding:0 10px 4px 10px; - background: white; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - width:200px; +/* login in sidebar */ +#elgg_sidebar #login { + width:auto; } -#login-box h2 { - color:#0054A7; - font-size:1.35em; - line-height:1.2em; - margin:0 0 0 8px; - padding:5px 5px 0 5px; +#elgg_sidebar #login form { + width:auto; } -#login-box .login-textarea { - width:178px; +#elgg_sidebar #login .login_textarea { + width:196px; } -#login-box label, -#register-box label { +/* default login and register forms */ +#login label, +.register label { font-size: 1.2em; color:gray; } -#login-box p.loginbox { - margin:0; -} -#login-box input[type="text"], -#login-box input[type="password"], -#register-box input[type="text"], -#register-box input[type="password"] { +#login input[type="text"], +#login input[type="password"], +.register input[type="text"], +.register input[type="password"] { margin:0 0 10px 0; } -#register-box input[type="text"], -#register-box input[type="password"] { +.register input[type="text"], +.register input[type="password"] { width:380px; } -#login-box h2, -#login-box-openid h2, -#register-box h2, -#add-box h2, -#forgotten_box h2 { - color:#0054A7; - font-size:1.35em; - line-height:1.2em; - margin:0pt 0pt 5px; -} -#register-box { - text-align:left; - width:400px; - padding:10px; - background: #dedede; - margin:0; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; +#login .persistent_login { + float:left; + display:block; + margin-top:-34px; + margin-left:100px; } -#persistent_login label { +#login .persistent_login label { font-size:1.0em; font-weight: normal; + cursor: pointer; } -/* login and openID boxes when not running custom_index mod */ -#two_column_left_sidebar #login-box { - width:auto; - background: none; -} -#two_column_left_sidebar #login-box form { - width:auto; - margin:10px 10px 0 10px; - padding:5px 0 5px 10px; -} -#two_column_left_sidebar #login-box h2 { - margin:0 0 0 5px; - padding:5px 5px 0 5px; -} -#two_column_left_sidebar #login-box .login-textarea { - width:158px; -} -/* login and openID boxes when not running custom_index mod */ -#two_column_right_sidebar #login-box { - width:auto; - background: none; -} -#two_column_right_sidebar #login-box form { - width:auto; - margin:10px 10px 0 10px; - padding:5px 0 5px 10px; -} -#two_column_right_sidebar #login-box h2 { - margin:0 0 0 5px; - padding:5px 5px 0 5px; -} -#two_column_right_sidebar #login-box .login-textarea { - width:158px; -} + /* *************************************** - PROFILE -*************************************** */ -#profile_info { - margin:0 0 20px 0; - padding:20px; - border-bottom:1px solid #cccccc; - border-right:1px solid #cccccc; - background: #e9e9e9; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; -} -#profile_info_column_left { + CONTENT HEADER +**************************************** */ +#content_header { + border-bottom:1px solid #CCCCCC; +} +#content_header:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; +} +.content_header_title, +.content_header_filter { float:left; - padding: 0; - margin:0 20px 0 0; } -#profile_info_column_middle { - float:left; - width:365px; - padding: 0; +.content_header_title { + margin-right:10px; + max-width: 530px; } -#profile_info_column_right { - width:578px; - margin:0 0 0 0; - background:#dedede; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - padding:4px; -} -#dashboard_info { - margin:0px 0px 0 0px; - padding:20px; - border-bottom:1px solid #cccccc; - border-right:1px solid #cccccc; - background: #bbdaf7; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; +.content_header_title h2 { + border:none; + margin-bottom:0; + padding-bottom:5px; } -#profile_menu_wrapper { - margin:10px 0 10px 0; - width:200px; +.content_header_options { + float:right; } -#profile_menu_wrapper p { - border-bottom:1px solid #cccccc; +.content_header_options .action_button { + float:right; + margin:0 0 5px 10px; } -#profile_menu_wrapper p:first-child { - border-top:1px solid #cccccc; +.content_header_filter { + background: url(<?php echo $vars['url']; ?>mod/elgg_layout/graphics/content_header_filter.gif) no-repeat 0 0; } -#profile_menu_wrapper a { - display:block; - padding:0 0 0 3px; +.content_header_filter select.styled { + height:25px; + cursor: pointer; } -#profile_menu_wrapper a:hover { - color:#ffffff; - background:#4690d6; - text-decoration:none; +span.select { + position: absolute; + width: 342px; + height: 25px; + padding: 3px 24px 0 8px; + color: #fff; + font-weight: bold; + font-size: 1.35em; + background: url(<?php echo $vars['url']; ?>mod/elgg_layout/graphics/content_header_filter.gif) no-repeat; + overflow: hidden; + text-align: left; } -p.user_menu_friends, p.user_menu_profile, -p.user_menu_removefriend, -p.user_menu_friends_of { +select.styled .select_option { + font-size:1.3em; margin:0; -} -#profile_menu_wrapper .user_menu_admin { - border-top:none; + padding:3px; } -#profile_info_column_middle p { - margin:7px 0 7px 0; - padding:2px 4px 2px 4px; -} -/* profile owner name */ -#profile_info_column_middle h2 { - padding:0 0 14px 0; + + +/* *************************************** + DEFAULT ENTITY LISTINGS +**************************************** */ +.entity_listing { + border-bottom:1px dotted #cccccc; + clear:both; + display:block; margin:0; + padding:5px 0 7px; + position:relative; } -#profile_info_column_middle .profile_status { - background:#bbdaf7; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - padding:2px 4px 2px 4px; - line-height:1.2em; -} -#profile_info_column_middle .profile_status span { - display:block; - font-size:90%; - color:#666666; +.entity_listing:first-child { + border-top:1px dotted #cccccc; } -#profile_info_column_middle a.status_update { - float:right; +.entity_listing:hover { + background-color: #eeeeee; } -#profile_info_column_middle .odd { - background:#dedede; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; +.entity_listing_icon { + float:left; + margin-left:3px; + margin-top:3px; } -#profile_info_column_middle .even { - background:#dedede; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; +.entity_listing_icon img { + width: auto; } -#profile_info_column_right p { - margin:0 0 7px 0; +.entity_listing_info { + float:left; + margin-left:7px; + min-height:28px; + width:693px; } -#profile_info_column_right .profile_aboutme_title { +.entity_listing_info p { margin:0; - padding:0; - line-height:1em; -} -/* edit profile button */ -.profile_info_edit_buttons { - float:right; - margin:0 !important; - padding:0 !important; + line-height:1.2em; } -.profile_info_edit_buttons a { - font: 12px/100% Arial, Helvetica, sans-serif; +.entity_listing_info p.entity_title { font-weight: bold; - color: #ffffff; - background:#4690d6; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - width: auto; - padding: 2px 6px 2px 6px; - margin:0; - cursor: pointer; + font-size: 1.1em; } -.profile_info_edit_buttons a:hover { - background: #0054a7; - text-decoration: none; - color:white; -} - - -/* *************************************** - RIVER -*************************************** */ -#river, -.river_item_list { - border-top:1px solid #dddddd; - - overflow:hidden; +.entity_listing_info p.entity_title a { + color:#0054A7; } -.river_item p { +.entity_listing_info p.entity_subtext { margin:0; - padding:0 0 0 21px; - line-height:1.1em; - min-height:17px; -} -.river_item { - border-bottom:1px solid #dddddd; - padding:2px 0 2px 0; -} -.river_item_time { - font-size:90%; + padding:0; color:#666666; + font-size: 90%; } -.river_item .river_item_useravatar { - float:left; - margin:0 5px 0 0; -} -/* IE6 fix */ -* html .river_item p { - padding:3px 0 3px 20px; +/* entity metadata block */ +.entity_metadata { + float:right; + margin:0 3px 0 15px; + color:#aaaaaa; + font-size: 90%; } -/* IE7 */ -*:first-child+html .river_item p { - min-height:17px; +.entity_metadata table { + width:280px; } -.river_user_update { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_profile.gif) no-repeat left -1px; +.entity_metadata table td { + height:30px; + vertical-align:middle; } -.river_object_user_profileupdate { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_profile.gif) no-repeat left -1px; +.entity_metadata table td.entity_edit { + text-align:right; } -.river_object_user_profileiconupdate { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_profile.gif) no-repeat left -1px; +.entity_metadata table td.entity_edit a { + color:#aaaaaa; + margin:0 0 0 10px; } -.river_object_annotate { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px; +.entity_metadata table td.entity_edit a:hover { + color:#0054a7; } -.river_object_bookmarks_create { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_bookmarks.gif) no-repeat left -1px; +.entity_metadata table td.entity_delete { + padding-top:2px; + width:26px; } -.river_object_bookmarks_comment { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px; + + + +/* *************************************** + USER SETTINGS & ADMIN AREA +*************************************** */ +/* GENERAL STYLES */ +.user_settings, +.admin_settings { + margin-bottom:20px; } -.river_object_status_create { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_status.gif) no-repeat left -1px; +.user_settings p, +.admin_settings p { + margin-bottom:6px; } -.river_object_file_create { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_files.gif) no-repeat left -1px; +.user_settings h3, +.admin_settings h3 { + background:#e4e4e4; + color:#333333; + padding:5px; + margin-top:10px; + margin-bottom:10px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; } -.river_object_file_update { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_files.gif) no-repeat left -1px; +.user_settings label, +.admin_settings label { + color:#333333; + font-size:100%; + font-weight:normal; } -.river_object_file_comment { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px; +.user_settings table.styled, +.admin_settings table.styled { + width:100%; } -.river_object_widget_create { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_plugin.gif) no-repeat left -1px; +.user_settings table.styled, +.admin_settings table.styled { + border-top:1px solid #cccccc; } -.river_object_forums_create { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px; +.user_settings table.styled td, +.admin_settings table.styled td { + padding:2px 4px 2px 4px; + border-bottom:1px solid #cccccc; } -.river_object_forums_update { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px; +.user_settings table.styled td.column_one, +.admin_settings table.styled td.column_one { + width:200px; } -.river_object_widget_update { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_plugin.gif) no-repeat left -1px; +.user_settings table.styled tr:hover, +.admin_settings table.styled tr:hover { + background: #E4E4E4; } -.river_object_blog_create { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_blog.gif) no-repeat left -1px; +.add_user form { + width:300px; } -.river_object_blog_update { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_blog.gif) no-repeat left -1px; +/* PLUGINS MANAGEMENT (ADMIN) */ +.plugin_details { + margin:0 0 5px 0; + padding:0 7px 4px 10px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; } -.river_object_blog_comment { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px; +.plugin_details p { + margin:0; + padding:0; } -.river_object_forumtopic_create { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px; +.plugin_details a.pluginsettings_link { + cursor:pointer; + font-size:80%; } -.river_user_friend { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_friends.gif) no-repeat left -1px; +.plugin_details a.manifest_details { + cursor:pointer; + font-size:80%; } -.river_object_relationship_friend_create { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_friends.gif) no-repeat left -1px; +.active { + border:1px solid #999999; + background:white; } -.river_object_relationship_member_create { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px; +.not_active { + border:1px solid #999999; + background:#dedede; } -.river_object_thewire_create { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_thewire.gif) no-repeat left -1px; + + +/* *************************************** + GENERAL FORM ELEMENTS +*************************************** */ +/* default elgg core input field classes */ +.input_text, +.input_tags, +.input_url, +.input_textarea { + width:98%; } -.river_group_join { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px; +.input_access { + margin:5px 0 0 0; } -.river_object_groupforumtopic_annotate { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px; +.input_password { + width:200px; } -.river_object_groupforumtopic_create { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px; +.input_textarea { + height: 200px; } -.river_object_sitemessage_create { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_blog.gif) no-repeat left -1px; +input[type="checkbox"] { + margin:0 3px 0 0; + padding:0; + border:none; } -.river_user_messageboard { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px; +label { + font-weight: bold; + color:#333333; + font-size: 110%; } -.river_object_page_create { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_pages.gif) no-repeat left -1px; +input { + font: 120% Arial, Helvetica, sans-serif; + padding: 5px; + border: 1px solid #cccccc; + color:#666666; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; } -.river_object_page_update { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_pages.gif) no-repeat left -1px; +textarea { + font: 120% Arial, Helvetica, sans-serif; + border: solid 1px #cccccc; + padding: 5px; + color:#666666; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; } -.river_object_page_top_create { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_pages.gif) no-repeat left -1px; +textarea:focus, +input[type="text"]:focus { + border: solid 1px #4690d6; + background: #e4ecf5; + color:#333333; } -.river_object_page_top_update { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_pages.gif) no-repeat left -1px; +.submit_button { + font-size: 14px; + font-weight: bold; + color: white; + text-shadow:1px 1px 0px black; + text-decoration:none; + border: 1px solid #4690d6; + background-color:#4690d6; + background-image: url(<?php echo $vars['url']; ?>mod/elgg_layout/graphics/button_graduation.png); + background-repeat: repeat-x; + background-position: left 10px; + -webkit-border-radius: 7px; + -moz-border-radius: 7px; + width: auto; + padding: 2px 4px; + margin:0 10px 10px 0; + cursor: pointer; + -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40); /* safari v3+ */ + -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40); /* FF v3.5+ */ } -.river_object_page_top_comment { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px; +.submit_button:hover { + color: white; + border-color: #0054a7; + text-decoration:none; + background-color:#0054a7; + background-image: url(<?php echo $vars['url']; ?>mod/elgg_layout/graphics/button_graduation.png); + background-repeat: repeat-x; + background-position: left 10px; } -.river_object_page_comment { - background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px; +input[type="password"]:focus { + border: solid 1px #4690d6; + background-color: #e4ecf5; + color:#333333; } - -/* *************************************** - ENTITY LISTINGS -*************************************** */ -.search_listing { - display: block; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - background:white; - margin:0 10px 5px 10px; - padding:5px; +input[type="submit"] { + font-size: 14px; + font-weight: bold; + color: white; + text-shadow:1px 1px 0px black; + text-decoration:none; + border: 1px solid #4690d6; + background-color:#4690d6; + background-image: url(<?php echo $vars['url']; ?>mod/elgg_layout/graphics/button_graduation.png); + background-repeat: repeat-x; + background-position: left 10px; + -webkit-border-radius: 7px; + -moz-border-radius: 7px; + width: auto; + padding: 2px 4px; + margin:10px 0 10px 0; + cursor: pointer; + -moz-outline-style: none; + outline: none; + -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40); /* safari v3+ */ + -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40); /* FF v3.5+ */ } -.search_listing_icon { - float:left; +input[type="submit"]:hover { + border-color: #0054a7; + text-decoration:none; + background-color:#0054a7; + background-image: url(<?php echo $vars['url']; ?>mod/elgg_layout/graphics/button_graduation.png); + background-repeat: repeat-x; + background-position: left 10px; } -.search_listing_icon img { - width: 40px; +.cancel_button { + font-size: 14px; + font-weight: bold; + text-decoration:none; + color: #333333; + background-color:#dddddd; + background-image: url(<?php echo $vars['url']; ?>mod/elgg_layout/graphics/button_graduation.png); + background-repeat: repeat-x; + background-position: left 10px; + border: 1px solid #999999; + -webkit-border-radius: 7px; + -moz-border-radius: 7px; + width: auto; + padding: 2px 4px; + margin:10px 0 10px 10px; + cursor: pointer; } -.search_listing_icon .avatar_menu_button img { - width: 15px; +.cancel_button:hover { + background-color: #999999; + background-position: left 10px; + text-decoration:none; + color:white; } -.search_listing_info { - margin-left: 50px; - min-height: 40px; +a.action_button { + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + background-color:#cccccc; + background-image: url(<?php echo $vars['url']; ?>mod/elgg_layout/graphics/button_background.gif); + background-repeat: repeat-x; + background-position: 0 0; + border:1px solid #999999; + color:#333333; + /*display:block;*/ + padding:2px 15px 2px 15px; + text-align:center; + font-weight:bold; + text-decoration:none; + text-shadow:0 1px 0 white; + cursor:pointer; } -/* IE 6 fix */ -* html .search_listing_info { - height:40px; +a.action_button:hover, +a.action_button:focus { + background-position:0 -15px; + color:#111111; + text-decoration: none; } -.search_listing_info p { - margin:0 0 3px 0; - line-height:1.2em; +a.action_button:active { + background-image:none; } -.search_listing_info p.owner_timestamp { - margin:0; - padding:0; - color:#666666; - font-size: 90%; +a.action_button.disabled { + color:#999999; + padding:2px 7px 2px 7px; } -table.entity_gallery { - border-spacing: 10px; - margin:0 0 0 0; +a.action_button.disabled:hover { + background-position:0 -15px; + color:#111111; + border:1px solid #999999; } -.entity_gallery td { - padding: 5px; +a.action_button.disabled:active { + background-image:none; } -.entity_gallery_item { - background: white; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - width:170px; +a.action_button.download { + color: white; + background-color:#4690d6; + background-image: url(<?php echo $vars['url']; ?>mod/elgg_layout/graphics/button_graduation.png); + background-repeat: repeat-x; + background-position: left 10px; + /*display:inline-block;*/ + width:auto; + height:auto; + padding: 3px 6px 3px 6px; + margin:0 0 10px 0; } -.entity_gallery_item:hover { - background: black; +a.action_button.download:hover { + background: #0054a7; + border-color: #0054a7; color:white; } -.entity_gallery_item .search_listing { - background: none; - text-align: center; -} -.entity_gallery_item .search_listing_header { - text-align: center; -} -.entity_gallery_item .search_listing_icon { - position: relative; - text-align: center; -} -.entity_gallery_item .search_listing_info { - margin: 5px; -} -.entity_gallery_item .search_listing_info p { - margin: 5px; - margin-bottom: 10px; -} -.entity_gallery_item .search_listing { - background: none; - text-align: center; -} -.entity_gallery_item .search_listing_icon { - position: absolute; - margin-bottom: 20px; +/* small round delete button */ +.delete_button { + width:14px; + height:14px; + margin:0; + float:right; } -.entity_gallery_item .search_listing_info { - margin: 5px; +.delete_button a { + display:block; + cursor: pointer; + width:14px; + height:14px; + background: url("<?php echo $vars['url']; ?>mod/elgg_layout/graphics/icon_delete.png") no-repeat 0 0; + text-indent: -9000px; } -.entity_gallery_item .search_listing_info p { - margin: 5px; - margin-bottom: 10px; +.delete_button a:hover { + background-position: 0 -16px; } +/* ////////////////////////////////////////////////////////////////////////////////////////// >>>End Verified */ -/* *************************************** - FRIENDS -*************************************** */ -/* friends widget */ -#widget_friends_list { - display:table; - width:275px; - margin:0 10px 0 10px; - padding:8px 0 4px 8px; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - background:white; -} -.widget_friends_singlefriend { - float:left; - margin:0 5px 5px 0; -} -/* *************************************** - ADMIN AREA - PLUGIN SETTINGS -*************************************** */ -.plugin_details { - margin:0 10px 5px 10px; - padding:0 7px 4px 10px; + + + + + + +/* @todo OLD ADMIN AREA - will be replaced/updated with multi-admin */ +.admin_settings.users_online .profile_status { + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + background:#bbdaf7; + line-height:1.2em; + padding:2px 4px; +} +.admin_settings.users_online .profile_status span { + font-size:90%; + color:#666666; +} +.admin_settings.users_online p.owner_timestamp { + padding-left:3px; +} +.admin_users_online .search_listing { + margin:0 0 5px 0; + padding:5px; + border:1px solid #cccccc; -webkit-border-radius: 5px; -moz-border-radius: 5px; } @@ -1406,33 +1318,12 @@ table.entity_gallery { font-size:80%; color:#999999; } -.plugin_details a.pluginsettings_link { - cursor:pointer; - font-size:80%; -} -.active { - border:1px solid #999999; - background:white; -} -.not-active { - border:1px solid #999999; - background:#dedede; -} -.plugin_details p { - margin:0; - padding:0; -} -.plugin_details a.manifest_details { - cursor:pointer; - font-size:80%; -} .manifest_file { - background:#dedede; + background-color:#eeeeee; -webkit-border-radius: 8px; -moz-border-radius: 8px; padding:5px 10px 5px 10px; margin:4px 0 4px 0; - display:none; } .admin_plugin_enable_disable { width:150px; @@ -1440,15 +1331,15 @@ table.entity_gallery { float:right; text-align: right; } -.contentIntro .enableallplugins, -.contentIntro .disableallplugins { + .enableallplugins, + .disableallplugins { float:right; } -.contentIntro .enableallplugins { + .enableallplugins { margin-left:10px; } -.contentIntro .enableallplugins, -.not-active .admin_plugin_enable_disable a { + .enableallplugins, +.not_active .admin_plugin_enable_disable a { font: 12px/100% Arial, Helvetica, sans-serif; font-weight: bold; color: #ffffff; @@ -1460,13 +1351,13 @@ table.entity_gallery { padding: 4px; cursor: pointer; } -.contentIntro .enableallplugins:hover, -.not-active .admin_plugin_enable_disable a:hover { + .enableallplugins:hover, +.not_active .admin_plugin_enable_disable a:hover { background: #0054a7; border: 1px solid #0054a7; text-decoration: none; } -.contentIntro .disableallplugins, + .disableallplugins, .active .admin_plugin_enable_disable a { font: 12px/100% Arial, Helvetica, sans-serif; font-weight: bold; @@ -1479,7 +1370,7 @@ table.entity_gallery { padding: 4px; cursor: pointer; } -.contentIntro .disableallplugins:hover, + .disableallplugins:hover, .active .admin_plugin_enable_disable a:hover { background: #333333; border: 1px solid #333333; @@ -1487,11 +1378,10 @@ table.entity_gallery { } .pluginsettings { margin:15px 0 5px 0; - background:#bbdaf7; + background-color:#eeeeee; -webkit-border-radius: 8px; -moz-border-radius: 8px; padding:10px; - display:none; } .pluginsettings h3 { padding:0 0 5px 0; @@ -1503,13 +1393,31 @@ table.entity_gallery { margin:0; border:none; } -.input-access { - margin:5px 0 0 0; -} -/* *************************************** - GENERIC COMMENTS -*************************************** */ + +/* + + +#elgg_topbar_panel { + background:#333333; + color:#eeeeee; + height:200px; + width:100%; + padding:10px 20px 10px 20px; + display:none; + position:relative; +} +#elggFooterContents .footer_legal_links { + text-align:right; +} +#elggFooterContents .footersidebar { + text-align:right; +} +#elggFooterContents table td.footersidebar a img { + float:right; + padding:5px 0; +} + .generic_comment_owner { font-size: 90%; color:#666666; @@ -1536,1000 +1444,206 @@ table.entity_gallery { font-size:90%; border-top: 1px solid #aaaaaa; } -/* IE6 */ -* html #generic_comment_tbl { width:676px !important;} -/* *************************************** -PAGE-OWNER BLOCK -*************************************** */ -#owner_block { - padding:10px; -} -#owner_block_icon { - float:left; - margin:0 10px 0 0; -} -#owner_block_rss_feed, -#owner_block_odd_feed { - padding:5px 0 0 0; -} -#owner_block_rss_feed a { - font-size: 90%; - color:#999999; - padding:0 0 4px 20px; - background: url(<?php echo $vars['url']; ?>_graphics/icon_rss.gif) no-repeat left top; -} -#owner_block_odd_feed a { - font-size: 90%; - color:#999999; - padding:0 0 4px 20px; - background: url(<?php echo $vars['url']; ?>_graphics/icon_odd.gif) no-repeat left top; -} -#owner_block_rss_feed a:hover, -#owner_block_odd_feed a:hover { - color: #0054a7; -} -#owner_block_desc { - padding:4px 0 4px 0; - margin:0 0 0 0; - line-height: 1.2em; - border-bottom:1px solid #cccccc; - color:#666666; -} -#owner_block_content { - margin:0 0 4px 0; - padding:3px 0 0 0; - min-height:35px; - font-weight: bold; -} -#owner_block_content a { - line-height: 1em; -} -.ownerblockline { - padding:0; - margin:0; - border-bottom:1px solid #cccccc; - height:1px; -} -#owner_block_submenu { - margin:20px 0 20px 0; - padding: 0; - width:100%; -} -#owner_block_submenu ul { - list-style: none; - padding: 0; - margin: 0; -} -#owner_block_submenu ul li.selected a { - background: #4690d6; - color:white; -} -#owner_block_submenu ul li.selected a:hover { - background: #4690d6; - color:white; -} -#owner_block_submenu ul li a { - text-decoration: none; - display: block; - margin: 2px 0 0 0; - color:#4690d6; - padding:4px 6px 4px 10px; - font-weight: bold; - line-height: 1.1em; - -webkit-border-radius: 10px; - -moz-border-radius: 10px; -} -#owner_block_submenu ul li a:hover { - color:white; - background: #0054a7; -} - -/* IE 6 + 7 menu arrow position fix */ -* html #owner_block_submenu ul li.selected a { - background-position: left 10px; -} -*:first-child+html #owner_block_submenu ul li.selected a { - background-position: left 8px; -} +Object page headers blogs/pages/files etc -#owner_block_submenu .submenu_group { - border-bottom: 1px solid #cccccc; - margin:10px 0 0 0; - padding-bottom: 10px; -} -#owner_block_submenu .submenu_group .submenu_group_filter ul li a, -#owner_block_submenu .submenu_group .submenu_group_filetypes ul li a { - color:#666666; -} -#owner_block_submenu .submenu_group .submenu_group_filter ul li.selected a, -#owner_block_submenu .submenu_group .submenu_group_filetypes ul li.selected a { - background:#999999; - color:white; +table.search_gallery { + border-spacing: 10px; + margin:0 0 0 0; } -#owner_block_submenu .submenu_group .submenu_group_filter ul li a:hover, -#owner_block_submenu .submenu_group .submenu_group_filetypes ul li a:hover { - color:white; - background: #999999; +.search_gallery td { + padding: 5px; } - - -/* *************************************** - PAGINATION -*************************************** */ -.pagination { - -webkit-border-radius: 8px; +.search_gallery_item { + background: white; + -webkit-border-radius: 8px; -moz-border-radius: 8px; - background:white; - margin:5px 10px 5px 10px; - padding:5px; -} -.pagination .pagination_number { - display:block; - float:left; - background:#ffffff; - border:1px solid #4690d6; - text-align: center; - color:#4690d6; - font-size: 12px; - font-weight: normal; - margin:0 6px 0 0; - padding:0px 4px; - cursor: pointer; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; + width:170px; } -.pagination .pagination_number:hover { - background:#4690d6; +.search_gallery_item:hover { + background: black; color:white; - text-decoration: none; } -.pagination .pagination_more { - display:block; - float:left; - background:#ffffff; - border:1px solid #ffffff; +.search_gallery_item .search_listing { + background: none; text-align: center; - color:#4690d6; - font-size: 12px; - font-weight: normal; - margin:0 6px 0 0; - padding:0px 4px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; } -.pagination .pagination_previous, -.pagination .pagination_next { - display:block; - float:left; - border:1px solid #4690d6; - color:#4690d6; +.search_gallery_item .search_listing_header { text-align: center; - font-size: 12px; - font-weight: normal; - margin:0 6px 0 0; - padding:0px 4px; - cursor: pointer; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; -} -.pagination .pagination_previous:hover, -.pagination .pagination_next:hover { - background:#4690d6; - color:white; - text-decoration: none; } -.pagination .pagination_currentpage { - display:block; - float:left; - background:#4690d6; - border:1px solid #4690d6; +.search_gallery_item .search_listing_icon { + position: relative; text-align: center; - color:white; - font-size: 12px; - font-weight: bold; - margin:0 6px 0 0; - padding:0px 4px; - cursor: pointer; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; } - - -/* *************************************** - FRIENDS COLLECTIONS ACCORDIAN -*************************************** */ -ul#friends_collections_accordian { - margin: 0 0 0 0; - padding: 0; -} -#friends_collections_accordian li { - margin: 0 0 0 0; - padding: 0; - list-style-type: none; - color: #666666; +.search_gallery_item .search_listing_info { + margin: 5px; } -#friends_collections_accordian li h2 { - background:#4690d6; - color: white; - padding:4px 2px 4px 6px; - margin:10px 0 10px 0; - font-size:1.2em; - cursor:pointer; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; +.search_gallery_item .search_listing_info p { + margin: 5px; + margin-bottom: 10px; } -#friends_collections_accordian li h2:hover { - background:#333333; - color:white; +.search_gallery_item .search_listing { + background: none; + text-align: center; } -#friends_collections_accordian .friends_picker { - background:white; - padding:0; - display:none; +.search_gallery_item .search_listing_icon { + position: absolute; + margin-bottom: 20px; } -#friends_collections_accordian .friends_collections_controls { - font-size:70%; - float:right; +.search_gallery_item .search_listing_info { + margin: 5px; } -#friends_collections_accordian .friends_collections_controls a { - color:#999999; - font-weight:normal; +.search_gallery_item .search_listing_info p { + margin: 5px; + margin-bottom: 10px; } - -/* *************************************** - FRIENDS PICKER SLIDER -*************************************** */ -.friendsPicker_container h3 { - font-size:4em !important; - text-align: left; - margin:0 0 10px 0 !important; - color:#999999 !important; - background: none !important; - padding:0 !important; -} -.friendsPicker .friendsPicker_container .panel ul { - text-align: left; - margin: 0; +#NewListStyle { padding:0; + margin:0; } -.friendsPicker_wrapper { - margin: 0; - padding:0; +#NewListStyle .search_listing { + -webkit-border-radius: 0; + -moz-border-radius: 0; + background:none; + border-bottom:1px dotted #CCCCCC; + margin:0; + padding:5px 0 7px 0; + display: inline-block; position: relative; - width: 100%; + clear:both; } -.friendsPicker { - position: relative; - overflow: hidden; - margin: 0; - padding:0; - width: 678px; - - height: auto; - background: #dedede; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; +#NewListStyle .ListTop { + margin:0 0; + clear:both; + width:auto; } -.friendspicker_savebuttons { - background: white; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - margin:0 10px 10px 10px; +#NewListStyle .search_listing:hover { + background-color: #eeeeee; } -.friendsPicker .friendsPicker_container { /* long container used to house end-to-end panels. Width is calculated in JS */ - position: relative; - left: 0; - top: 0; - width: 100%; - list-style-type: none; +#NewListStyle .search_listing:last-child { + border-bottom:1px dotted #CCCCCC; } -.friendsPicker .friendsPicker_container .panel { + +#NewListStyle .search_listing_icon { float:left; - height: 100%; - position: relative; - width: 678px; - margin: 0; - padding:0; -} -.friendsPicker .friendsPicker_container .panel .wrapper { - margin: 0; - padding:4px 10px 10px 10px; - min-height: 230px; -} -.friendsPickerNavigation { - margin: 0 0 10px 0; - padding:0; -} -.friendsPickerNavigation ul { - list-style: none; - padding-left: 0; -} -.friendsPickerNavigation ul li { - float: left; - margin:0; - background:white; -} -.friendsPickerNavigation a { - font-weight: bold; - text-align: center; - background: white; - color: #999999; - text-decoration: none; - display: block; - padding: 0; - width:20px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; -} -.tabHasContent { - background: white; color:#333333 !important; + margin-left:3px; + margin-top:3px; } -.friendsPickerNavigation li a:hover { - background: #333333; - color:white !important; -} -.friendsPickerNavigation li a.current { - background: #4690D6; - color:white !important; -} -.friendsPickerNavigationAll { - margin:0px 0 0 20px; +#NewListStyle .search_listing .search_listing_info { float:left; + margin-left:7px; + min-height:28px; + width:693px; } -.friendsPickerNavigationAll a { - font-weight: bold; - text-align: left; - font-size:0.8em; - background: white; - color: #999999; - text-decoration: none; - display: block; - padding: 0 4px 0 4px; - width:auto; -} -.friendsPickerNavigationAll a:hover { - background: #4690D6; - color:white; -} -.friendsPickerNavigationL, .friendsPickerNavigationR { - position: absolute; - top: 46px; - text-indent: -9000em; -} -.friendsPickerNavigationL a, .friendsPickerNavigationR a { - display: block; - height: 43px; - width: 43px; -} -.friendsPickerNavigationL { - right: 48px; - z-index:1; -} -.friendsPickerNavigationR { - right: 0; - z-index:1; -} -.friendsPickerNavigationL { - background: url("<?php echo $vars['url']; ?>_graphics/friends_picker_arrows.gif") no-repeat left top; -} -.friendsPickerNavigationR { - background: url("<?php echo $vars['url']; ?>_graphics/friends_picker_arrows.gif") no-repeat -60px top; -} -.friendsPickerNavigationL:hover { - background: url("<?php echo $vars['url']; ?>_graphics/friends_picker_arrows.gif") no-repeat left -44px; -} -.friendsPickerNavigationR:hover { - background: url("<?php echo $vars['url']; ?>_graphics/friends_picker_arrows.gif") no-repeat -60px -44px; -} -.friends_collections_controls a.delete_collection { - display:block; - cursor: pointer; - width:14px; - height:14px; - margin:2px 3px 0 0; - background: url("<?php echo $vars['url']; ?>_graphics/icon_customise_remove.png") no-repeat 0 0; -} -.friends_collections_controls a.delete_collection:hover { - background-position: 0 -16px; -} -.friendspicker_savebuttons .submit_button, -.friendspicker_savebuttons .cancel_button { - margin:5px 20px 5px 5px; -} - -#collectionMembersTable { - background: #dedede; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - margin:10px 0 0 0; - padding:10px 10px 0 10px; -} - - -/* *************************************** -WIDGET PICKER (PROFILE & DASHBOARD) -*************************************** */ -/* 'edit page' button */ -a.toggle_customise_edit_panel { +#NewListStyle .search_listing .search_listing_info .ItemMetaData { float:right; - clear:right; - color: #4690d6; - background: white; - border:1px solid #cccccc; - padding: 5px 10px 5px 10px; - margin:0 0 20px 0; - width:280px; - text-align: left; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; -} -a.toggle_customise_edit_panel:hover { - color: #ffffff; - background: #0054a7; - border:1px solid #0054a7; - text-decoration:none; -} -#customise_editpanel { - display:none; - margin: 0 0 20px 0; - padding:10px; - background: #dedede; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; -} - -/* Top area - instructions */ -.customise_editpanel_instructions { - width:690px; - padding:0 0 10px 0; -} -.customise_editpanel_instructions h2 { - padding:0 0 10px 0; -} -.customise_editpanel_instructions p { - margin:0 0 5px 0; - line-height: 1.4em; + margin-left:15px; + margin-top:0; + margin-right: 3px; + color:#AAAAAA; + font-size: 90%; } -/* RHS (widget gallery area) */ -#customise_editpanel_rhs { +.ItemMetaData.special { float:right; - width:230px; - background:white; -} -#customise_editpanel #customise_editpanel_rhs h2 { - color:#333333; - font-size: 1.4em; - margin:0; - padding:6px; -} -#widget_picker_gallery { - border-top:1px solid #cccccc; - background:white; - width:210px; - height:340px; - padding:10px; - overflow:scroll; - overflow-x:hidden; + margin-left:15px; + margin-top:0; + margin-right: 3px; + color:#AAAAAA; + font-size: 90%; } -/* main page widget area */ -#customise_page_view { - width:656px; - padding:10px; - margin:0 0 10px 0; - background:white; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; -} -#customise_page_view h2 { - border-top:1px solid #cccccc; - border-right:1px solid #cccccc; - border-left:1px solid #cccccc; - margin:0; - padding:5px; - width:200px; - color: #0054a7; - background: #dedede; - font-size:1.25em; - line-height: 1.2em; -} -#profile_box_widgets { - width:422px; - margin:0 10px 10px 0; - padding:5px 5px 0px 5px; - min-height: 50px; - border:1px solid #cccccc; - background: #dedede; +used on groups members listings where there is only a delete button in table +#NewListStyle .search_listing .search_listing_info .ItemMetaData table.singlecell { + width:auto; } -#customise_page_view h2.profile_box { - width:422px; - color: #999999; -} -#profile_box_widgets p { - color:#999999; -} -#leftcolumn_widgets { - width:200px; - margin:0 10px 0 0; - padding:5px 5px 40px 5px; - min-height: 190px; - border:1px solid #cccccc; -} -#middlecolumn_widgets { - width:200px; - margin:0 10px 0 0; - padding:5px 5px 40px 5px; - min-height: 190px; - border:1px solid #cccccc; -} -#rightcolumn_widgets { - width:200px; +#NewListStyle .search_listing_info p.tags { + font-size:90%; margin:0; - padding:5px 5px 40px 5px; - min-height: 190px; - border:1px solid #cccccc; -} -#rightcolumn_widgets.long { - min-height: 288px; -} -/* IE6 fix */ -* html #leftcolumn_widgets { - height: 190px; -} -* html #middlecolumn_widgets { - height: 190px; -} -* html #rightcolumn_widgets { - height: 190px; -} -* html #rightcolumn_widgets.long { - height: 338px; -} - -#customise_editpanel table.draggable_widget { - width:200px; - background: #cccccc; - margin: 10px 0 0 0; - vertical-align:text-top; - border:1px solid #cccccc; -} -#widget_picker_gallery table.draggable_widget { - width:200px; - background: #cccccc; - margin: 10px 0 0 0; -} - -/* take care of long widget names */ -#customise_editpanel table.draggable_widget h3 { - word-wrap:break-word;/* safari, webkit, ie */ - width:140px; - line-height: 1.1em; - overflow: hidden;/* ff */ - padding:4px; -} -#widget_picker_gallery table.draggable_widget h3 { - word-wrap:break-word; - width:145px; - line-height: 1.1em; - overflow: hidden; - padding:4px; -} -#customise_editpanel img.more_info { - background: url(<?php echo $vars['url']; ?>_graphics/icon_customise_info.gif) no-repeat top left; - cursor:pointer; -} -#customise_editpanel img.drag_handle { - background: url(<?php echo $vars['url']; ?>_graphics/icon_customise_drag.gif) no-repeat top left; - cursor:move; -} -#customise_editpanel img { - margin-top:4px; -} -#widget_moreinfo { - position:absolute; - border:1px solid #333333; - background:#e4ecf5; - color:#333333; - padding:5px; - display:none; - width: 200px; - line-height: 1.2em; -} -/* droppable area hover class */ -.droppable-hover { - background:#bbdaf7; -} -/* target drop area class */ -.placeholder { - border:2px dashed #AAA; - width:196px !important; - margin: 10px 0 10px 0; -} -/* class of widget while dragging */ -.ui-sortable-helper { - background: #4690d6; - color:white; - padding: 4px; - margin: 10px 0 0 0; - width:200px; -} -/* IE6 fix */ -* html .placeholder { - margin: 0; -} -/* IE7 */ -*:first-child+html .placeholder { - margin: 0; -} -/* IE6 fix */ -* html .ui-sortable-helper h3 { - padding: 4px; -} -* html .ui-sortable-helper img.drag_handle, * html .ui-sortable-helper img.remove_me, * html .ui-sortable-helper img.more_info { - padding-top: 4px; -} -/* IE7 */ -*:first-child+html .ui-sortable-helper h3 { - padding: 4px; -} -*:first-child+html .ui-sortable-helper img.drag_handle, *:first-child+html .ui-sortable-helper img.remove_me, *:first-child+html .ui-sortable-helper img.more_info { - padding-top: 4px; + padding-top:1px; } +*/ /* *************************************** - BREADCRUMBS + COLLAPSABLE BOXES - for widgets? *************************************** */ -#pages_breadcrumbs { - font-size: 80%; - color:#bababa; - padding:0; - margin:2px 0 0 10px; -} -#pages_breadcrumbs a { - color:#999999; - text-decoration: none; -} -#pages_breadcrumbs a:hover { - color: #0054a7; - text-decoration: underline; -} - +/* +.collapsable_box { + margin: 0 0 20px 0; + height:auto; -/* *************************************** - MISC. -*************************************** */ -/* general page titles in main content area */ -#content_area_user_title h2 { - margin:0 0 0 8px; - padding:5px; - color:#0054A7; - font-size:1.35em; - line-height:1.2em; } -/* reusable generic collapsible box */ -.collapsible_box { +.collapsable_box_header { + color: #4690d6; + padding: 5px 10px 5px 10px; + margin:0; + border-left: 1px solid white; + border-right: 1px solid #cccccc; + border-bottom: 1px solid #cccccc; + -moz-border-radius-topleft:8px; + -moz-border-radius-topright:8px; + -webkit-border-top-right-radius:8px; + -webkit-border-top-left-radius:8px; background:#dedede; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - padding:5px 10px 5px 10px; - margin:4px 0 4px 0; - display:none; } -a.collapsibleboxlink { - cursor:pointer; +.collapsable_box_header h1 { + color: #0054a7; + font-size:1.25em; + line-height: 1.2em; } - -/* tag icon */ -.object_tag_string { - background: url(<?php echo $vars['url']; ?>_graphics/icon_tag.gif) no-repeat left 2px; - padding:0 0 0 14px; +.collapsable_box_content { + padding: 10px 0 10px 0; margin:0; + height:auto; + background:#dedede; + -moz-border-radius-bottomleft:8px; + -moz-border-radius-bottomright:8px; + -webkit-border-bottom-right-radius:8px; + -webkit-border-bottom-left-radius:8px; + border-left: 1px solid white; + border-right: 1px solid #cccccc; + border-bottom: 1px solid #cccccc; } - -/* profile picture upload n crop page */ -#profile_picture_form { - height:145px; -} -#current_user_avatar { - float:left; - width:160px; - height:130px; - border-right:1px solid #cccccc; - margin:0 20px 0 0; -} -#profile_picture_croppingtool { - border-top: 1px solid #cccccc; - margin:20px 0 0 0; - padding:10px 0 0 0; -} -#profile_picture_croppingtool #user_avatar { - float: left; - margin-right: 20px; -} -#profile_picture_croppingtool #applycropping { - -} -#profile_picture_croppingtool #user_avatar_preview { - float: left; - position: relative; - overflow: hidden; - width: 100px; - height: 100px; -} - - -/* *************************************** - SETTINGS & ADMIN -*************************************** */ -.admin_statistics, -.admin_users_online, -.usersettings_statistics, -.admin_adduser_link, -#add-box, -#search-box, -#logbrowser_search_area { - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - background:white; - margin:0 10px 10px 10px; - padding:10px; -} - -.usersettings_statistics h3, -.admin_statistics h3, -.admin_users_online h3, -.user_settings h3, -.notification_methods h3 { - background:#e4e4e4; - color:#333333; - font-size:1.1em; - line-height:1em; - margin:0 0 10px 0; - padding:5px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; -} -h3.settings { - background:#e4e4e4; - color:#333333; - font-size:1.1em; - line-height:1em; - margin:10px 0 4px 0; - padding:5px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; -} -.admin_users_online .profile_status { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - background:#bbdaf7; - line-height:1.2em; - padding:2px 4px; -} -.admin_users_online .profile_status span { - font-size:90%; - color:#666666; -} -.admin_users_online p.owner_timestamp { - padding-left:3px; -} - - -.admin_debug label, -.admin_usage label { - color:#333333; - font-size:100%; - font-weight:normal; -} - -.admin_usage { - border-bottom:1px solid #cccccc; - padding:0 0 20px 0; -} -.usersettings_statistics .odd, -.admin_statistics .odd { - -} -.usersettings_statistics .even, -.admin_statistics .even { - -} -.usersettings_statistics td, -.admin_statistics td { - padding:2px 4px 2px 4px; - border-bottom:1px solid #cccccc; -} -.usersettings_statistics td.column_one, -.admin_statistics td.column_one { - width:200px; -} -.usersettings_statistics table, -.admin_statistics table { - width:100%; -} -.usersettings_statistics table, -.admin_statistics table { - border-top:1px solid #cccccc; +.collapsable_box_content { + margin-bottom:5px; } -.usersettings_statistics table tr:hover, -.admin_statistics table tr:hover { - background: #E4E4E4; +.collapsable_box_editpanel { + display: none; + background: #a8a8a8; + padding:10px 10px 5px 10px; + border-left: 1px solid white; + border-bottom: 1px solid white; } -.admin_users_online .search_listing { +.collapsable_box_editpanel p { margin:0 0 5px 0; - padding:5px; - border:2px solid #cccccc; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; -} - - - -/* force tinyMCE editor initial width for safari */ -.mceLayout { - width:683px; -} -p.longtext_editarea { - margin:0 !important; } -.toggle_editor_container { - margin:0 0 15px 0; -} -/* add/remove longtext tinyMCE editor */ -a.toggle_editor { - display:block; +.collapsable_box_header a.toggle_box_contents { + color: #4690d6; + cursor:pointer; + font-family: Arial, Helvetica, sans-serif; + font-size:20px; + font-weight: bold; + text-decoration:none; float:right; - text-align:right; - color:#666666; - font-size:1em; - font-weight:normal; -} - -div.ajax_loader { - background: white url(<?php echo $vars['url']; ?>_graphics/ajax_loader.gif) no-repeat center 30px; - width:auto; - height:100px; - margin:0 10px 0 10px; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; -} - - - -/* reusable elgg horizontal tabbed navigation -(used on friends collections, external pages, & riverdashboard mods) -*/ -#elgg_horizontal_tabbed_nav { - margin:0 0 5px 0; - padding: 0; - border-bottom: 2px solid #cccccc; - display:table; - width:100%; -} -#elgg_horizontal_tabbed_nav ul { - list-style: none; - padding: 0; margin: 0; + margin-top: -7px; } -#elgg_horizontal_tabbed_nav li { - float: left; - border: 2px solid #cccccc; - border-bottom-width: 0; - background: #eeeeee; - margin: 0 0 0 10px; - -moz-border-radius-topleft:5px; - -moz-border-radius-topright:5px; - -webkit-border-top-left-radius:5px; - -webkit-border-top-right-radius:5px; -} -#elgg_horizontal_tabbed_nav a { - text-decoration: none; - display: block; - padding:3px 10px 0 10px; - color: #999999; - text-align: center; - height:21px; -} -/* IE6 fix */ -* html #elgg_horizontal_tabbed_nav a { display: inline; } - -#elgg_horizontal_tabbed_nav a:hover { - color: #4690d6; - background: #dedede; -} -#elgg_horizontal_tabbed_nav .selected { - border-color: #cccccc; - background: white; -} -#elgg_horizontal_tabbed_nav .selected a { - position: relative; - top: 2px; - background: white; +.collapsable_box_header a.toggle_box_edit_panel { color: #4690d6; + cursor:pointer; + font-size:9px; + text-transform: uppercase; + text-decoration:none; + font-weight: normal; + float:right; + margin: 3px 10px 0 0; } -/* IE6 fix */ -* html #elgg_horizontal_tabbed_nav .selected a { top: 3px; } - - - - -/* *************************************** - Auto Suggest Boxes -*************************************** */ - -.ac_results { - padding: 0px; - border: 1px solid black; - background-color: white; - overflow: hidden; - z-index: 99999; -} - -.ac_results ul { - width: 100%; - list-style-position: outside; - list-style: none; - padding: 0; - margin: 0; -} - -.ac_results li { - margin: 0px; - padding: 2px 5px; - cursor: default; - display: block; - /* - if width will be 100% horizontal scrollbar will apear - when scroll mode will be used - */ - /*width: 100%;*/ - font: menu; - font-size: 12px; - /* - it is very important, if line-height not setted or setted - in relative units scroll will be broken in firefox - */ - line-height: 16px; - overflow: hidden; -} - -.ac_loading { - background: white url(<?php echo $vars['url']; ?>_graphics/indicator.gif) right center no-repeat; -} - -.ac_odd { - background-color: #eee; -} - -.ac_over { - background-color: #0A246A; - color: white; -} - -.autocomplete { - width:300px; -} - -.ac_results strong { - font-weight: bold; -} - -.user_picker .user_picker_entry { - clear: both; - padding: 1em; -} - -.livesearch_icon { - float: left; - padding-right: 1em; -} - -.draggable { - cursor: move; +.collapsable_box_editpanel label { + font-weight: normal; + font-size: 100%; } +*/ diff --git a/views/default/css_ie.php b/views/default/css_ie.php new file mode 100755 index 000000000..a3262744d --- /dev/null +++ b/views/default/css_ie.php @@ -0,0 +1,27 @@ +/** + * elgg_layout css for Internet Explorer > ie6 + * @uses $vars['wwwroot'] The site URL +*/ + +#elgg_topbar_contents a.privatemessages_new span { + display:block; + padding:1px; + position:relative; + text-align:center; + float:left; + top:auto; + right:auto; +} +#elgg_topbar_contents a.privatemessages_new { + padding:0 0 0 20px; +} + +ul.topbar_tools ul a { + zoom: 1; +} +ul.topbar_tools li.menu a.tools { + padding-bottom:6px; +} +ul.topbar_tools ul a { + filter: alpha(opacity=90); +}
\ No newline at end of file diff --git a/views/default/css_ie6.php b/views/default/css_ie6.php new file mode 100755 index 000000000..6b4ced9d7 --- /dev/null +++ b/views/default/css_ie6.php @@ -0,0 +1,27 @@ +/** + * elgg_layout css for Internet Explorer6 + * @uses $vars['wwwroot'] The site URL +*/ + +* {zoom: 1;} + +ul.topbar_tools ul { + line-height: 1.1em; +} +ul.topbar_tools ul a { + zoom: 1; +} +ul.topbar_tools ul a { + filter: alpha(opacity=90); +} + +.collapsable_box { + height:10px; +} + +.search_listing_info { + /* height:40px; */ +} + +.delete_button a { background-position-y: 2px; } +.delete_button a:hover { background-position-y: -14px; }
\ No newline at end of file diff --git a/views/default/entities/entity_list.php b/views/default/entities/entity_list.php index ec9ebd6ed..90fe6ead3 100644 --- a/views/default/entities/entity_list.php +++ b/views/default/entities/entity_list.php @@ -46,7 +46,6 @@ if ($pagination) { )); } -$html .= $nav; if ($viewtype == 'list') { if (is_array($entities) && sizeof($entities) > 0) { foreach($entities as $entity) { diff --git a/views/default/entities/entity_listing.php b/views/default/entities/entity_listing.php index d934a2b0c..3d6c37f2f 100644 --- a/views/default/entities/entity_listing.php +++ b/views/default/entities/entity_listing.php @@ -8,22 +8,11 @@ * @link http://elgg.org/ */ ?> - -<div class="search_listing"> - - <div class="search_listing_icon"> - <?php - - echo $vars['icon']; - - ?> +<div class="entity_listing clearfloat"> + <div class="entity_listing_icon"> + <?php echo $vars['icon']; ?> </div> - <div class="search_listing_info"> - <?php - - echo $vars['info']; - - ?> + <div class="entity_listing_info"> + <?php echo $vars['info']; ?> </div> - </div> diff --git a/views/default/friends/picker.php b/views/default/friends/picker.php index 2b5c81b18..1ac8b23af 100644 --- a/views/default/friends/picker.php +++ b/views/default/friends/picker.php @@ -249,8 +249,6 @@ if (!isset($vars['replacement'])) { if ($formtarget) { - echo elgg_view('input/securitytoken'); - if (isset($vars['formcontents'])) echo $vars['formcontents']; diff --git a/views/default/friends/river/create.php b/views/default/friends/river/create.php index e577ba721..da9dde1f0 100644 --- a/views/default/friends/river/create.php +++ b/views/default/friends/river/create.php @@ -8,16 +8,16 @@ * * @uses $vars['entity'] */ -$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject(); +$performed_by = get_entity($vars['item']->subject_guid); $performed_on = get_entity($vars['item']->object_guid); $url = $performed_on->getURL(); $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>"; -$string = sprintf(elgg_echo("friends:river:add"),$url) . " "; -$string .= "<a href=\"{$performed_on->getURL()}\">{$performed_on->name}</a>"; +$string = "<div class=\"river_content_title\">" . sprintf(elgg_echo("friends:river:add"),$url) . " "; +$string .= "<a href=\"{$performed_on->getURL()}\">{$performed_on->name}</a></div>"; $string .= "<div class=\"river_content_display\">"; -$string .= "<table><tr><td>" . elgg_view("profile/icon",array('entity' => $performed_by, 'size' => 'small')) . "</td>"; -$string .= "<td><div class=\"following_icon\"></div></td><td>" . elgg_view("profile/icon",array('entity' => $performed_on, 'size' => 'small')) . "</td></tr></table>"; +$string .= "<table><tr><td>" . elgg_view("profile/icon",array('entity' => $performed_by, 'size' => 'tiny')) . "</td>"; +$string .= "<td><div class=\"following_icon\"></div></td><td>" . elgg_view("profile/icon",array('entity' => $performed_on, 'size' => 'tiny')) . "</td></tr></table>"; $string .= "</div>"; echo $string;
\ No newline at end of file diff --git a/views/default/group/search/finishblurb.php b/views/default/group/search/finishblurb.php index 9d3759cb3..756ad03c0 100644 --- a/views/default/group/search/finishblurb.php +++ b/views/default/group/search/finishblurb.php @@ -1,20 +1,20 @@ -<?php
-/**
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- * @deprecated 1.7
- */
-elgg_deprecated_notice('view groups/search/finishblurb was deprecated.', 1.7);
-
-if ($vars['count'] > $vars['threshold']) {
-
-?>
-<div class="contentWrapper"><a href="<?php echo $vars['url']; ?>pg/search/groups/?tag=<?php echo urlencode($vars['tag']); ?>">
- <?php
- echo elgg_echo("group:search:finishblurb");
- ?></a>
-</div>
-<?php
-}
+<?php +/** + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @link http://elgg.org/ + * @deprecated 1.7 + */ +elgg_deprecated_notice('view groups/search/finishblurb was deprecated.', 1.7); + +if ($vars['count'] > $vars['threshold']) { + +?> +<div class="contentWrapper"><a href="<?php echo $vars['url']; ?>pg/search/groups/?tag=<?php echo urlencode($vars['tag']); ?>"> + <?php + echo elgg_echo("group:search:finishblurb"); + ?></a> +</div> +<?php +} diff --git a/views/default/group/search/startblurb.php b/views/default/group/search/startblurb.php index f3acfaf5a..19138a360 100644 --- a/views/default/group/search/startblurb.php +++ b/views/default/group/search/startblurb.php @@ -1,16 +1,16 @@ -<?php
-/**
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- * @deprecated 1.7
- */
-elgg_deprecated_notice('view groups/search/startblurb was deprecated.', 1.7);
-?>
-
-<div class="contentWrapper">
- <?php
- echo sprintf(elgg_echo("group:search:startblurb"),$vars['tag']);
- ?>
-</div>
+<?php +/** + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @link http://elgg.org/ + * @deprecated 1.7 + */ +elgg_deprecated_notice('view groups/search/startblurb was deprecated.', 1.7); +?> + +<div class="contentWrapper"> + <?php + echo sprintf(elgg_echo("group:search:startblurb"),$vars['tag']); + ?> +</div> diff --git a/views/default/input/access.php b/views/default/input/access.php index 27f818a67..e93b47cd1 100644 --- a/views/default/input/access.php +++ b/views/default/input/access.php @@ -16,7 +16,7 @@ * */ -$class = "input-access"; +$class = "input_access"; if (isset($vars['class'])) { $class = $vars['class']; } diff --git a/views/default/input/checkboxes.php b/views/default/input/checkboxes.php index 7d03db257..60674cb3c 100644 --- a/views/default/input/checkboxes.php +++ b/views/default/input/checkboxes.php @@ -17,7 +17,7 @@ $class = $vars['class']; if (!$class) { - $class = "input-checkboxes"; + $class = "input_checkboxes"; } foreach($vars['options'] as $label => $option) { diff --git a/views/default/input/email.php b/views/default/input/email.php index bd2892e97..62a4ec993 100644 --- a/views/default/input/email.php +++ b/views/default/input/email.php @@ -18,7 +18,7 @@ $class = $vars['class']; if (!$class) { - $class = "input-text"; + $class = "input_text"; } ?> diff --git a/views/default/input/file.php b/views/default/input/file.php index e943210c2..bd27df525 100644 --- a/views/default/input/file.php +++ b/views/default/input/file.php @@ -21,7 +21,7 @@ if (!empty($vars['value'])) { echo elgg_echo('fileexists') . "<br />"; } -$class = "input-file"; +$class = "input_file"; if (isset($vars['class'])) { $class = $vars['class']; } diff --git a/views/default/input/longtext.php b/views/default/input/longtext.php index 9ae42a01a..328eb8f78 100644 --- a/views/default/input/longtext.php +++ b/views/default/input/longtext.php @@ -16,7 +16,7 @@ * @uses $vars['disabled'] Is the input field disabled? */ -$class = "input-textarea"; +$class = "input_textarea"; if (isset($vars['class'])) { $class = $vars['class']; } diff --git a/views/default/input/password.php b/views/default/input/password.php index 90ee984d4..ad9f45c16 100644 --- a/views/default/input/password.php +++ b/views/default/input/password.php @@ -16,7 +16,7 @@ $class = $vars['class']; if (!$class) { - $class = "input-password"; + $class = "input_password"; } ?> diff --git a/views/default/input/plaintext.php b/views/default/input/plaintext.php index e177f8b3f..22171a7a7 100644 --- a/views/default/input/plaintext.php +++ b/views/default/input/plaintext.php @@ -16,7 +16,7 @@ $class = $vars['class']; if (!$class) { - $class = "input-textarea"; + $class = "input_textarea"; } ?> diff --git a/views/default/input/pulldown.php b/views/default/input/pulldown.php index 03143d677..59c8a7adc 100644 --- a/views/default/input/pulldown.php +++ b/views/default/input/pulldown.php @@ -18,7 +18,7 @@ $class = $vars['class']; if (!$class) { - $class = "input-pulldown"; + $class = "input_pulldown"; } ?> diff --git a/views/default/input/radio.php b/views/default/input/radio.php index c6163b141..8304d0737 100644 --- a/views/default/input/radio.php +++ b/views/default/input/radio.php @@ -17,7 +17,7 @@ $class = $vars['class']; if (!$class) { - $class = "input-radio"; + $class = "input_radio"; } foreach($vars['options'] as $label => $option) { diff --git a/views/default/input/tags.php b/views/default/input/tags.php index 874a33ce9..3592edb10 100644 --- a/views/default/input/tags.php +++ b/views/default/input/tags.php @@ -19,7 +19,7 @@ */ -$class = "input-tags"; +$class = "input_tags"; if (isset($vars['class'])) { $class = $vars['class']; } diff --git a/views/default/input/text.php b/views/default/input/text.php index e4d39e0ba..aa6e571b6 100644 --- a/views/default/input/text.php +++ b/views/default/input/text.php @@ -21,7 +21,7 @@ if (isset($vars['class'])) { $class = $vars['class']; } else { - $class = "input-text"; + $class = "input_text"; } $disabled = false; diff --git a/views/default/input/url.php b/views/default/input/url.php index 6bf19d319..571754c77 100644 --- a/views/default/input/url.php +++ b/views/default/input/url.php @@ -16,7 +16,7 @@ $class = $vars['class']; if (!$class) { - $class = "input-url"; + $class = "input_url"; } ?> diff --git a/views/default/js/initialise_elgg.php b/views/default/js/initialise_elgg.php index 76937fe18..50aa8f5fd 100644 --- a/views/default/js/initialise_elgg.php +++ b/views/default/js/initialise_elgg.php @@ -1,9 +1,11 @@ $(document).ready(function () { - // COLLAPSABLE WIDGETS (on Dashboard & Profile pages) + // COLLAPSABLE WIDGETS (on Dashboard? & Profile pages) // toggle widget box contents $('a.toggle_box_contents').bind('click', toggleContent); +/* // replaced with elgg_slide_toggle + @todo - PH update new admin area and widget canvas with the new toggle function // toggle widget box edit panel $('a.toggle_box_edit_panel').click(function () { $(this.parentNode.parentNode).children(".collapsable_box_editpanel").slideToggle("fast"); @@ -16,20 +18,23 @@ $(document).ready(function () { return false; }); - // toggle plugin's settings nad more info on admin tools admin + // toggle plugin's settings and more info on admin tools admin $('a.pluginsettings_link').click(function () { $(this.parentNode.parentNode).children(".pluginsettings").slideToggle("fast"); return false; }); + $('a.manifest_details').click(function () { $(this.parentNode.parentNode).children(".manifest_file").slideToggle("fast"); return false; }); - // reusable generic hidden panel + + $('a.collapsibleboxlink').click(function () { $(this.parentNode.parentNode).children(".collapsible_box").slideToggle("fast"); return false; }); +*/ // WIDGET GALLERY EDIT PANEL // Sortable widgets @@ -42,6 +47,7 @@ $(document).ready(function () { forcePlaceholderSize: true, placeholder: 'ui-state-highlight', cursor: 'move', + revert: true, opacity: 0.9, appendTo: 'body', connectWith: els, @@ -81,6 +87,24 @@ $(document).ready(function () { }); /* end document ready function */ +// display & hide elgg system messages +function elgg_system_message() { + $("#elgg_system_message").animate({opacity: 0.9}, 1000); + $("#elgg_system_message").animate({opacity: 0.9}, 5000); + $("#elgg_system_message").fadeOut('slow'); + + $("#elgg_system_message").click(function () { + $("#elgg_system_message").stop(); + $("#elgg_system_message").fadeOut('slow'); + return false; + }); +} + +// reusable slide in/out toggle function +function elgg_slide_toggle(activateLink,parentElement,toggleElement) { + $(activateLink).closest(parentElement).find(toggleElement).animate({"height": "toggle"}, { duration: 400 }); + return false; +} // List active widgets for each page column function outputWidgetList(forElement) { @@ -219,8 +243,8 @@ jQuery.cookie = function(name, value, options) { } }; -// ELGG TOOLBAR MENU -$.fn.elgg_topbardropdownmenu = function(options) { +// ELGG DROP DOWN MENU +$.fn.elgg_dropdownmenu = function(options) { options = $.extend({speed: 350}, options || {}); diff --git a/views/default/js/upload_js.php b/views/default/js/upload_js.php index cdd011729..83530d67a 100644 --- a/views/default/js/upload_js.php +++ b/views/default/js/upload_js.php @@ -45,7 +45,7 @@ function file_addtoform() { var o,el; o = document.getElementById('option_container'); title_label = "<?php echo elgg_echo("title"); ?>"; - bit = file_generate_bit(title_label,'title_','input-text','text',0); + bit = file_generate_bit(title_label,'title_','input_text','text',0); o.appendChild(bit); file_label = "<?php echo elgg_echo("file:file"); ?>"; bit = file_generate_bit(file_label,'upload_','input-file','file',30); diff --git a/views/default/messages/errors/error.php b/views/default/messages/errors/error.php index 26a24c807..3175521d4 100644 --- a/views/default/messages/errors/error.php +++ b/views/default/messages/errors/error.php @@ -10,8 +10,4 @@ * * @uses $vars['object'] An error message (string) */ -?> - -<p> - <?php echo elgg_view('output/longtext', array('value' => $vars['object'])); ?> -</p>
\ No newline at end of file +echo elgg_view('output/longtext', array('value' => $vars['object'])); diff --git a/views/default/messages/errors/list.php b/views/default/messages/errors/list.php index 846e22a80..5e4b2ff31 100644 --- a/views/default/messages/errors/list.php +++ b/views/default/messages/errors/list.php @@ -14,37 +14,13 @@ if (!empty($vars['object']) && is_array($vars['object'])) { ?> -<!-- used to fade out the system messages after 3 seconds --> -<script> -$(document).ready(function () { - $('.messages_error').animate({opacity: 1.0}, 1000); - $('.messages_error').animate({opacity: 1.0}, 5000); - $('.messages_error').fadeOut('slow'); - - $('span.closeMessages a').click(function () { - $(".messages_error").stop(); - $('.messages_error').fadeOut('slow'); - return false; - }); - - $('div.messages_error').click(function () { - $(".messages_error").stop(); - $('.messages_error').fadeOut('slow'); - return false; - }); - -}); -</script> - - <div class="messages_error"> - <span class="closeMessages"><a href="#"><?php echo elgg_echo('systemmessages:dismiss'); ?></a></span> - +<div id="elgg_system_message" class="hidden radius8 error"> +<script type="text/javascript">$(document).ready(function(){ elgg_system_message() });</script> <?php foreach($vars['object'] as $error) { echo elgg_view('messages/errors/error',array('object' => $error)); } ?> - - </div> +</div> <?php }
\ No newline at end of file diff --git a/views/default/messages/messages/list.php b/views/default/messages/messages/list.php index 67da01657..36b55a20e 100644 --- a/views/default/messages/messages/list.php +++ b/views/default/messages/messages/list.php @@ -14,37 +14,14 @@ if (!empty($vars['object']) && is_array($vars['object'])) { ?> -<!-- used to fade out the system messages after 3 seconds --> -<script type="text/javascript"> -$(document).ready(function () { - $('.messages').animate({opacity: 1.0}, 1000); - $('.messages').animate({opacity: 1.0}, 5000); - $('.messages').fadeOut('slow'); - - $('span.closeMessages a').click(function () { - $(".messages").stop(); - $('.messages').fadeOut('slow'); - return false; - }); - - $('div.messages').click(function () { - $(".messages").stop(); - $('.messages').fadeOut('slow'); - return false; - }); -}); -</script> - - <div class="messages"> - <span class="closeMessages"><a href="#"><?php echo elgg_echo('systemmessages:dismiss'); ?></a></span> +<div id="elgg_system_message" class="hidden radius8"> +<script type="text/javascript">$(document).ready(function(){ elgg_system_message() });</script> <?php foreach($vars['object'] as $message) { echo elgg_view('messages/messages/message',array('object' => $message)); } ?> - - </div> - +</div> <?php } diff --git a/views/default/messages/messages/message.php b/views/default/messages/messages/message.php index 717fd5e57..58777a3cc 100644 --- a/views/default/messages/messages/message.php +++ b/views/default/messages/messages/message.php @@ -10,8 +10,5 @@ * * @uses $vars['object'] A system message (string) */ -?> -<p> - <?php echo elgg_view('output/longtext', array('value' => $vars['object'])); ?> -</p>
\ No newline at end of file +echo elgg_view('output/longtext', array('value' => $vars['object'])); diff --git a/views/default/navigation/main_nav.php b/views/default/navigation/main_nav.php new file mode 100755 index 000000000..42796ef9a --- /dev/null +++ b/views/default/navigation/main_nav.php @@ -0,0 +1,65 @@ +<?php +/** + * Main navigation bar + **/ + +echo "<div id='elgg_main_nav' class='clearfloat'>"; +echo "<ul class='navigation'>"; +//if(get_context() == 'home') +// $selected = "class=selected"; +//else +// $selected = ""; +//echo "<li {$selected}><a href=\"{$vars['url']}\" id='home'><span>Home</span></a></li>"; +if(is_plugin_enabled('riverdashboard')){ + if(get_context() == 'riverdashboard') + $selected = 'class="selected"'; + else + $selected = ""; + echo "<li {$selected}><a href=\"{$vars['url']}mod/riverdashboard/\" id='activity'><span>Activity</span></a></li>"; +} +if(is_plugin_enabled('thewire') && isloggedin()){ + if(get_context() == 'thewire') + $selected = 'class="selected"'; + else + $selected = ""; + echo "<li {$selected}><a href=\"{$vars['url']}mod/thewire/all.php\" id='thewire'><span>" . elgg_echo('thewire') . "</span></a></li>"; +} +if(is_plugin_enabled('blog')){ + if(get_context() == 'blog') + $selected = 'class="selected"'; + else + $selected = ""; + echo "<li {$selected}><a href=\"{$vars['url']}mod/blog/all.php\" id='blogs'><span>Blogs</span></a></li>"; +} +if(is_plugin_enabled('pages')){ + if(get_context() == 'pages') + $selected = 'class="selected"'; + else + $selected = ""; + echo "<li {$selected}><a href=\"{$vars['url']}mod/pages/all.php\" id='pages'><span>Pages</span></a></li>"; +} +if(is_plugin_enabled('file')){ + if(get_context() == 'file') + $selected = 'class="selected"'; + else + $selected = ""; + echo "<li {$selected}><a href=\"{$vars['url']}mod/file/all.php\" id='files'><span>Files</span></a></li>"; +} +if(is_plugin_enabled('bookmarks')){ + if(get_context() == 'bookmarks') + $selected = 'class="selected"'; + else + $selected = ""; + echo "<li {$selected}><a href=\"{$vars['url']}mod/bookmarks/all.php\" id='bookmarks'><span>Bookmarks</span></a></li>"; +} +if(is_plugin_enabled('groups')){ + if(get_context() == 'groups') + $selected = 'class="selected"'; + else + $selected = ""; + echo "<li {$selected}><a href=\"{$vars['url']}pg/groups/all/\" id='groups'><span>". elgg_echo('groups') . "</span></a></li>"; +} +echo "</ul>"; +echo "</div>"; + +?>
\ No newline at end of file diff --git a/views/default/navigation/pagination.php b/views/default/navigation/pagination.php index 11dfd0e86..9dde51eea 100644 --- a/views/default/navigation/pagination.php +++ b/views/default/navigation/pagination.php @@ -38,12 +38,14 @@ if (isset($vars['nonefound'])) { $totalpages = ceil($count / $limit); $currentpage = ceil($offset / $limit) + 1; +//$baseurl = elgg_http_remove_url_query_element($vars['baseurl'], $word); + //only display if there is content to paginate through or if we already have an offset if (($count > $limit || $offset > 0) && get_context() != 'widget') { ?> - <div class="pagination"> + <div class="pagination clearfloat"> <?php if ($offset > 0) { @@ -53,9 +55,9 @@ if (($count > $limit || $offset > 0) && get_context() != 'widget') { $prevoffset = 0; } - $prevurl = elgg_http_add_url_query_elements($vars['baseurl'], array($word => $prevoffset)); + $prevurl = elgg_http_add_url_query_elements($baseurl, array($word => $prevoffset)); - echo "<a href=\"{$prevurl}\" class=\"pagination_previous\">« ". elgg_echo("previous") ."</a> "; + echo "<a href=\"{$prevurl}\" class='pagination_previous'>« ". elgg_echo("previous") ."</a> "; } if ($offset > 0 || $offset < ($count - $limit)) { @@ -89,16 +91,16 @@ if (($count > $limit || $offset > 0) && get_context() != 'widget') { $prev = 0; foreach($pagesarray as $i) { if (($i - $prev) > 1) { - echo "<span class=\"pagination_more\">...</span>"; + echo "<span class='pagination_more'>...</span>"; } $curoffset = (($i - 1) * $limit); - $counturl = elgg_http_add_url_query_elements($vars['baseurl'], array($word => $curoffset)); + $counturl = elgg_http_add_url_query_elements($base_url, array($word => $curoffset)); if ($curoffset != $offset) { - echo " <a href=\"{$counturl}\" class=\"pagination_number\">{$i}</a> "; + echo " <a href=\"{$counturl}\" class='pagination_number'>{$i}</a> "; } else { - echo "<span class=\"pagination_currentpage\"> {$i} </span>"; + echo "<span class='pagination_currentpage'> {$i} </span>"; } $prev = $i; @@ -112,14 +114,13 @@ if (($count > $limit || $offset > 0) && get_context() != 'widget') { $nextoffset--; } - $nexturl = elgg_http_add_url_query_elements($vars['baseurl'], array($word => $nextoffset)); + $nexturl = elgg_http_add_url_query_elements($baseurl, array($word => $nextoffset)); - echo " <a href=\"{$nexturl}\" class=\"pagination_next\">" . elgg_echo("next") . " »</a>"; + echo " <a href=\"{$nexturl}\" class='pagination_next'>" . elgg_echo("next") . " »</a>"; } ?> - <div class="clearfloat"></div> </div> <?php } // end of pagination check if statement
\ No newline at end of file diff --git a/views/default/navigation/topbar_tools.php b/views/default/navigation/topbar_tools.php index 897a827d6..0e0eec097 100644 --- a/views/default/navigation/topbar_tools.php +++ b/views/default/navigation/topbar_tools.php @@ -12,8 +12,6 @@ $menu = get_register('menu'); -//var_export($menu); - if (is_array($menu) && sizeof($menu) > 0) { $alphamenu = array(); foreach($menu as $item) { @@ -23,8 +21,8 @@ if (is_array($menu) && sizeof($menu) > 0) { ?> -<ul class="topbardropdownmenu"> - <li class="drop"><a href="#" class="menuitemtools"><?php echo(elgg_echo('tools')); ?></a> +<ul class="tools_menu"> + <li class="menu"><a href="#" class="tools"><?php echo(elgg_echo('tools')); ?></a> <ul> <?php foreach($alphamenu as $item) { @@ -37,7 +35,7 @@ if (is_array($menu) && sizeof($menu) > 0) { <script type="text/javascript"> $(function() { - $('ul.topbardropdownmenu').elgg_topbardropdownmenu(); + $('ul.tools_menu').elgg_dropdownmenu(); }); </script> diff --git a/views/default/notifications/settings/usersettings.php b/views/default/notifications/settings/usersettings.php index cba5cdef0..ea11ade8f 100644 --- a/views/default/notifications/settings/usersettings.php +++ b/views/default/notifications/settings/usersettings.php @@ -12,6 +12,7 @@ global $NOTIFICATION_HANDLERS; $notification_settings = get_user_notification_settings(page_owner()); ?> +<div class="user_settings notifications"> <h3><?php echo elgg_echo('notifications:usersettings'); ?></h3> <p><?php echo elgg_echo('notifications:methods'); ?> @@ -40,4 +41,5 @@ $notification_settings = get_user_notification_settings(page_owner()); <?php } ?> -</table>
\ No newline at end of file +</table> +</div>
\ No newline at end of file diff --git a/views/default/output/confirmlink.php b/views/default/output/confirmlink.php index 3370320ed..9377426ad 100644 --- a/views/default/output/confirmlink.php +++ b/views/default/output/confirmlink.php @@ -20,7 +20,7 @@ if (!$confirm) { } // always generate missing action tokens -$link = elgg_add_action_tokens_to_url($vars['href']); +$link = elgg_validate_action_url($vars['href']); if (isset($vars['class']) && $vars['class']) { $class = 'class="' . $vars['class'] . '"'; diff --git a/views/default/output/rss_view.php b/views/default/output/rss_view.php new file mode 100755 index 000000000..0dd1002b4 --- /dev/null +++ b/views/default/output/rss_view.php @@ -0,0 +1,8 @@ +<?php + /** + * View to display the RSS link + **/ +?> +<div class="sidebar_container"> +<p><a href=""><img src="<?php echo $vars['url']; ?>_graphics/icon_rss.gif" alt="RSS icon" /></a> RSS feed for the wire</p> +</div>
\ No newline at end of file diff --git a/views/default/output/tags.php b/views/default/output/tags.php index b93536797..1afc89d88 100644 --- a/views/default/output/tags.php +++ b/views/default/output/tags.php @@ -29,17 +29,6 @@ if (empty($vars['tags']) && !empty($vars['value'])) { $vars['tags'] = $vars['value']; } -$tag_names_str = ''; -if (isset($vars['tag_names'])) { - if (is_array($vars['tag_names'])) { - foreach ($vars['tag_names'] as $tag_name) { - $tag_names_str .= "&tag_names[]=$tag_name"; - } - } else { - $tag_names_str = "&tag_names={$vars['tag_names']}"; - } -} - if (!empty($vars['tags'])) { $tagstr = ""; if (!is_array($vars['tags'])) { @@ -56,7 +45,7 @@ if (!empty($vars['tags'])) { $type = ""; } if (is_string($tag)) { - $tagstr .= "<a rel=\"tag\" href=\"{$vars['url']}pg/search/?q=".urlencode($tag) . "&search_type=tags{$type}{$subtype}{$object}{$tag_names_str}\">" . htmlentities($tag, ENT_QUOTES, 'UTF-8') . "</a>"; + $tagstr .= "<a rel=\"tag\" href=\"{$vars['url']}pg/search/?q=".urlencode($tag) . "&search_type=tags{$type}{$subtype}{$object}\">" . htmlentities($tag, ENT_QUOTES, 'UTF-8') . "</a>"; } } echo $tagstr; diff --git a/views/default/output/url.php b/views/default/output/url.php index 7319f6971..b77ffbf00 100644 --- a/views/default/output/url.php +++ b/views/default/output/url.php @@ -17,15 +17,11 @@ * */ -if (isset($vars['value'])) { - $vars['href'] = $vars['value']; -} - $url = trim($vars['href']); if (!empty($url)) { if (array_key_exists('is_action', $vars) && $vars['is_action']) { - $url = elgg_add_action_tokens_to_url($url); + $url = elgg_validate_action_url($url); } if (array_key_exists('target', $vars) && $vars['target']) { @@ -41,7 +37,7 @@ if (!empty($url)) { } if (array_key_exists('js', $vars) && $vars['js']) { - $js = "{$vars['js']}"; + $js = "{$vars['target']}"; } else { $js = ''; } @@ -53,4 +49,4 @@ if (!empty($url)) { } echo "<a href=\"{$url}\" $target $class $js>$text</a>"; -} +}
\ No newline at end of file diff --git a/views/default/page_elements/breadcrumbs.php b/views/default/page_elements/breadcrumbs.php new file mode 100755 index 000000000..165a6c7dd --- /dev/null +++ b/views/default/page_elements/breadcrumbs.php @@ -0,0 +1,26 @@ +<?php
+
+/**
+ * Breadcrumbs
+**/
+// @todo spk to Brett re. making this simpler / scalable
+// grab variables from array
+$breadcrumb_root_url = $vars['breadcrumb_root_url'];
+$breadcrumb_root_text = $vars['breadcrumb_root_text'];
+$breadcrumb_level1_url = $vars['breadcrumb_level1_url'];
+$breadcrumb_level1_text = $vars['breadcrumb_level1_text'];
+$breadcrumb_level2_url = $vars['breadcrumb_level2_url'];
+$breadcrumb_level2_text = $vars['breadcrumb_level2_text'];
+$breadcrumb_currentpage = $vars['breadcrumb_currentpage'];
+?>
+<div id="breadcrumbs">
+ <a href="<?php echo $breadcrumb_root_url; ?>"><?php echo $breadcrumb_root_text; ?></a> >
+ <?php
+ if (isset($vars['breadcrumb_level1_url']) && $vars['breadcrumb_level1_url']) { ?>
+ <a href="<?php echo $breadcrumb_level1_url; ?>"><?php echo $breadcrumb_level1_text; ?></a> >
+ <?php }
+ if (isset($vars['breadcrumb_level2_url']) && $vars['breadcrumb_level2_url']) { ?>
+ <a href="<?php echo $breadcrumb_level2_url; ?>"><?php echo $breadcrumb_level2_text; ?></a> >
+ <?php }
+ echo $breadcrumb_currentpage; ?>
+</div>
\ No newline at end of file diff --git a/views/default/page_elements/content_header.php b/views/default/page_elements/content_header.php new file mode 100755 index 000000000..9d7bea08a --- /dev/null +++ b/views/default/page_elements/content_header.php @@ -0,0 +1,71 @@ +<?php +/** + * Page Content header + holds the filter menu and any content action buttons + used on bookmarks, blog, file, pages, + **/ + +global $CONFIG; + +// set variables +$page_owner = page_owner_entity(); +$filter_context = $vars['context']; // so we know if the user is looking at their own, everyone's or all friends +$type = $vars['type']; // get the object type +$mine_selected = ''; +$all_selected = ''; +$friend_selected = ''; +$action_buttons = ''; +$title = ''; +/* $dash_selected = ''; */ + +if(!($page_owner instanceof ElggGroup)){ + if($filter_context == 'mine') { + $mine_selected = "SELECTED"; + } + if($filter_context == 'everyone') { + $all_selected = "SELECTED"; + } + if($filter_context == 'friends') { + $friend_selected = "SELECTED"; + } + if($filter_context == 'action') { + // if this is an action page, we'll not be displaying the filter + } +/* + if($filter_context == 'dashboard') + $dash_selected = "SELECTED"; +*/ +} + +// must be logged in to see the filter menu and any action buttons +if(isloggedin()) { + // if we're not on an action page (add bookmark, create page, upload a file etc) + if ($filter_context != 'action') { + $location_filter = "<select onchange=\"window.open(this.options[this.selectedIndex].value,'_top')\" name=\"file_filter\" class='styled' >"; + $location_filter .= "<option {$mine_selected} class='select_option' value=\"{$vars['url']}pg/{$type}/{$_SESSION['user']->username}\" >" . elgg_echo($type . ':yours') . "</option>"; + $location_filter .= "<option {$all_selected} class='select_option' value=\"{$vars['url']}mod/{$type}/all.php\">" . elgg_echo($type . ':all') . "</option>"; + $location_filter .= "<option {$friend_selected} class='select_option' value=\"{$vars['url']}pg/{$type}/{$_SESSION['user']->username}/friends/\">". elgg_echo($type . ':friends') . "</option>"; + $location_filter .= "</select>"; + $location_filter = "<div class='content_header_filter'>".$location_filter."</div>"; + + // action buttons + if(get_context() != 'bookmarks'){ + $url = $CONFIG->wwwroot . "pg/{$type}/". $page_owner->username . "/new/"; + } else { + $url = $CONFIG->wwwroot . "pg/{$type}/". $page_owner->username . "/add"; + } + $action_buttons = "<a href=\"{$url}\" class='action_button'>" . elgg_echo($type . ':new') . "</a>"; + $action_buttons = "<div class='content_header_options'>".$action_buttons."</div>"; + + } else { + // if we're on an action page - we'll just have a simple page title, and no filter menu + $title = "<div class='content_header_title'>".elgg_view_title($title = elgg_echo($type . ':add'))."</div>"; + } +} +?> +<!-- construct the content area header --> +<div id="content_header" class="clearfloat"> + <?php echo $title; ?> + <?php echo $location_filter; ?> + <?php echo $action_buttons; ?> +</div> diff --git a/views/default/page_elements/content_header_member.php b/views/default/page_elements/content_header_member.php new file mode 100755 index 000000000..0a75bb7f5 --- /dev/null +++ b/views/default/page_elements/content_header_member.php @@ -0,0 +1,25 @@ +<?php +/** + * Page Content header when viewing another members entities + holds the filter menu and any content action buttons + used on bookmarks, blog, file, pages, + **/ +$type = $vars['type'];//get the object type +$user = page_owner_entity(); +$user_name = elgg_view_title($user->name . "'s " . elgg_echo($type)); +?> +<div id="content_header" class="clearfloat"> + <div class="content_header_title"> + <?php echo $user_name; ?> + </div> +<!-- + <div class="content_header_options"> + <?php // if we're on bookmarks + if((get_context() == 'bookmarks') && ($user instanceof ElggGroup)) { + $upload_link = "<a href=\"{$vars['url']}pg/{$type}/{$user->username}/add\" class='action_button'>" . elgg_echo($type . ':new') . "</a>"; + echo $upload_link; + } + ?> + </div> +--> +</div>
\ No newline at end of file diff --git a/views/default/page_elements/contentwrapper.php b/views/default/page_elements/contentwrapper.php deleted file mode 100644 index 81b7b5c7c..000000000 --- a/views/default/page_elements/contentwrapper.php +++ /dev/null @@ -1,23 +0,0 @@ -<?php -/** - * - * @package Elgg - * @subpackage Core - * @author Curverider Ltd - * @link http://elgg.org/ - * - * @uses $vars['value'] The URL to display - * - */ -?> -<div class="contentWrapper<?php - - if (isset($vars['subclass'])) { - echo ' ' . $vars['subclass']; - } - -?>"> -<?php - echo $vars['body']; -?> -</div>
\ No newline at end of file diff --git a/views/default/page_elements/elgg_content.php b/views/default/page_elements/elgg_content.php new file mode 100755 index 000000000..35e67232c --- /dev/null +++ b/views/default/page_elements/elgg_content.php @@ -0,0 +1,9 @@ +<?php +/** + * Elgg content wrapper + * This file holds the main content + **/ + +$content = isset($vars['body']) ? $vars['body'] : ''; + +echo $content; diff --git a/views/default/page_elements/elgg_footer.php b/views/default/page_elements/elgg_footer.php new file mode 100755 index 000000000..4113b84c7 --- /dev/null +++ b/views/default/page_elements/elgg_footer.php @@ -0,0 +1,30 @@ +<?php +/** + * Elgg footer + * The standard HTML footer that displays across the site + * + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @link http://elgg.org/ + * + */ + +?> +<div id="elgg_footer"> + <div id="elgg_footer_contents"> + <?php + if(is_plugin_enabled('reportedcontent') && isloggedin()){ + ?> + <div id="report_this"> + <a href="javascript:location.href='<?php echo $vars['url']; ?>mod/reportedcontent/add.php?address='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)">Report this</a> + </div> + <?php + } + ?> + <?php echo elgg_view('footer/links'); ?> + <a href="http://www.elgg.org" target="_blank" class="powered_by_elgg_badge"> + <img src="<?php echo $vars['url']; ?>_graphics/powered_by_elgg_badge_drk_bckgnd.gif" border="0" alt="Powered by Elgg" /> + </a> + </div> +</div> diff --git a/views/default/page_elements/elgg_header.php b/views/default/page_elements/elgg_header.php new file mode 100644 index 000000000..565368607 --- /dev/null +++ b/views/default/page_elements/elgg_header.php @@ -0,0 +1,25 @@ +<?php +/** + * Elgg header contents + * This file holds the header output that a user will see + **/ + +?> +<div id="elgg_header"> + <div id="elgg_header_contents"> + <!-- display site name --> + <h1><a href="<?php echo $vars['url']; ?>"><?php echo $vars['config']->sitename; ?></a></h1> + <?php + // insert a view which can be extended + echo elgg_view('header/extend'); + ?> + + <div id="elgg_search"> + <form id="searchform" action="<?php echo $vars['url']; ?>pg/search/" method="get"> + <input type="text" size="21" name="tag" value="<?php echo elgg_echo('search'); ?>" onblur="if (this.value=='') { this.value='<?php echo elgg_echo('search'); ?>' }" onfocus="if (this.value=='<?php echo elgg_echo('search'); ?>') { this.value='' };" class="search_input" /> + <input type="submit" value="<?php echo elgg_echo('search:go'); ?>" class="search_submit_button" /> + </form> + </div> + + </div> +</div>
\ No newline at end of file diff --git a/views/default/page_elements/elgg_topbar.php b/views/default/page_elements/elgg_topbar.php index 7734e61de..c57020e79 100644 --- a/views/default/page_elements/elgg_topbar.php +++ b/views/default/page_elements/elgg_topbar.php @@ -2,12 +2,6 @@ /** * Elgg top toolbar * The standard elgg top toolbar - * - * @package Elgg - * @subpackage Core - * @author Curverider Ltd - * @link http://elgg.org/ - * */ ?> @@ -15,65 +9,51 @@ if (isloggedin()) { ?> -<div id="elgg_topbar"> +<div id="elgg_topbar" class="clearfloat"> +<div id="elgg_topbar_contents"> + <a href="http://www.elgg.org" target="_blank"><img class="site_logo" src="<?php echo $vars['url']; ?>_graphics/elgg_toolbar_logo.gif" alt="Elgg logo" /></a> + <a href="<?php echo $_SESSION['user']->getURL(); ?>"><img class="user_mini_avatar" src="<?php echo $_SESSION['user']->getIcon('topbar'); ?>" alt="User avatar" /></a> -<div id="elgg_topbar_container_left"> - <div class="toolbarimages"> - <a href="http://www.elgg.org" target="_blank"><img src="<?php echo $vars['url']; ?>_graphics/elgg_toolbar_logo.gif" alt="toolbar_logo graphic" /></a> + <?php + // elgg tools menu + echo elgg_view("navigation/topbar_tools"); - <a href="<?php echo $_SESSION['user']->getURL(); ?>"><img class="user_mini_avatar" src="<?php echo $_SESSION['user']->getIcon('topbar'); ?>" alt="User avatar" /></a> - - </div> - <div class="toolbarlinks"> - <a href="<?php echo $vars['url']; ?>pg/dashboard/" class="pagelinks"><?php echo elgg_echo('dashboard'); ?></a> - </div> - <?php - - echo elgg_view("navigation/topbar_tools"); - - ?> - - <div class="toolbarlinks2"> - <?php - //allow people to extend this top menu + // enable elgg topbar extending echo elgg_view('elgg_topbar/extend', $vars); - ?> - - <a href="<?php echo $vars['url']; ?>pg/settings/" class="usersettings"><?php echo elgg_echo('settings'); ?></a> - - <?php - - // The administration link is for admin or site admin users only - if ($vars['user']->admin || $vars['user']->siteadmin) { - - ?> - - <a href="<?php echo $vars['url']; ?>pg/admin/" class="usersettings"><?php echo elgg_echo("admin"); ?></a> - - <?php - - } - - ?> + ?> + + <div class="log_out"> + <?php echo elgg_view('output/url', array('href' => "{$vars['url']}action/logout", 'text' => elgg_echo('logout'), 'is_action' => TRUE)); ?> </div> + <?php + if(is_plugin_enabled('shared_access')){ + ?> + <a href="<?php echo $vars['url']; ?>pg/shared_access/home" class="shared_access"><?php echo elgg_echo('shared_access:shared_access'); ?></a> + <?php + } + ?> + <a href="<?php echo $vars['url']; ?>pg/settings/" class="settings"><?php echo elgg_echo('settings'); ?></a> + <?php + if(is_plugin_enabled('help')){ + ?> + <a href="<?php echo $vars['url']; ?>mod/help/index.php" class="help">Help</a> + <?php + } + ?> + <?php + // The administration link is for admin or site admin users only + if ($vars['user']->admin || $vars['user']->siteadmin) { + ?> + <a href="<?php echo $vars['url']; ?>pg/admin/" class="admin"><?php echo elgg_echo("admin"); ?></a> + + <?php + } + ?> </div> - -<div id="elgg_topbar_container_right"> - <small> - <?php echo elgg_view('output/url', array('href' => "{$vars['url']}action/logout", 'text' => elgg_echo('logout'), 'is_action' => TRUE)); ?> - </small> -</div> - -<div id="elgg_topbar_container_search"> -<?php echo elgg_view('page_elements/searchbox'); ?> </div> - -</div><!-- /#elgg_topbar --> - -<div class="clearfloat"></div> - <?php - } + } +?>
\ No newline at end of file diff --git a/views/default/page_elements/footer.php b/views/default/page_elements/footer.php deleted file mode 100644 index 31c62a76e..000000000 --- a/views/default/page_elements/footer.php +++ /dev/null @@ -1,62 +0,0 @@ -<?php -/** - * Elgg footer - * The standard HTML footer that displays across the site - * - * @package Elgg - * @subpackage Core - * @author Curverider Ltd - * @link http://elgg.org/ - * - */ - -// get the tools menu -//$menu = get_register('menu'); - -?> - -<div class="clearfloat"></div> - -<div id="layout_footer"> -<table width="958" height="79" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td width="210" height="50"> - - </td> - - <td width="748" height="50" align="right"> - <p class="footer_toolbar_links"> - <?php - echo elgg_view('footer/links'); - ?> - </p> - </td> - </tr> - - <tr> - <td width="210" height="28"> - <a href="http://www.elgg.org" target="_blank"> - <img src="<?php echo $vars['url']; ?>_graphics/powered_by_elgg_badge_drk_bckgnd.gif" border="0" /> - </a> - </td> - - <td width="748" height="28" align="right"> - <p class="footer_legal_links"><small> - Powered by Elgg, the leading open source social networking platform - </small> - </p> - </td> - </tr> -</table> -</div><!-- /#layout_footer --> - -<div class="clearfloat"></div> - -</div><!-- /#page_wrapper --> -</div><!-- /#page_container --> -<!-- insert an analytics view to be extended --> -<?php - echo elgg_view('footer/analytics'); -?> -</body> -</html>
\ No newline at end of file diff --git a/views/default/page_elements/header_contents.php b/views/default/page_elements/header_contents.php deleted file mode 100644 index ac47d8962..000000000 --- a/views/default/page_elements/header_contents.php +++ /dev/null @@ -1,22 +0,0 @@ -<?php -/** - * Elgg header contents - * This file holds the header output that a user will see - * - * @package Elgg - * @subpackage Core - * @author Curverider Ltd - * @link http://elgg.org/ - **/ - -?> - -<div id="page_container"> -<div id="page_wrapper"> - -<div id="layout_header"> -<div id="wrapper_header"> - <!-- display the page title --> - <h1><a href="<?php echo $vars['url']; ?>"><?php echo $vars['config']->sitename; ?></a></h1> -</div><!-- /#wrapper_header --> -</div><!-- /#layout_header -->
\ No newline at end of file diff --git a/views/default/page_elements/header.php b/views/default/page_elements/html_begin.php index 6cbb2fcb9..6836c5ee4 100644 --- a/views/default/page_elements/header.php +++ b/views/default/page_elements/html_begin.php @@ -1,13 +1,7 @@ <?php /** - * Elgg pageshell + * Start html output. * The standard HTML header that displays across the site - * - * @package Elgg - * @subpackage Core - * @author Curverider Ltd - * @link http://elgg.org/ - * * @uses $vars['config'] The site configuration settings, imported * @uses $vars['title'] The page title * @uses $vars['body'] The main content of the page @@ -26,20 +20,14 @@ global $autofeed; if (isset($autofeed) && $autofeed == true) { $url = $url2 = full_url(); if (substr_count($url,'?')) { - $url .= "&view=rss"; + $url .= "&view=rss"; } else { $url .= "?view=rss"; } - if (substr_count($url2,'?')) { - $url2 .= "&view=odd"; - } else { - $url2 .= "?view=opendd"; - } $feedref = <<<END <link rel="alternate" type="application/rss+xml" title="RSS" href="{$url}" /> - <link rel="alternate" type="application/odd+xml" title="OpenDD" href="{$url2}" /> - + END; } else { $feedref = ""; @@ -51,18 +39,31 @@ header('Content-type: text/html; charset=utf-8'); $version = get_version(); $release = get_version(true); ?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta name="ElggRelease" content="<?php echo $release; ?>" /> <meta name="ElggVersion" content="<?php echo $version; ?>" /> <title><?php echo $title; ?></title> + <link REL="SHORTCUT ICON" HREF="<?php echo $vars['url']; ?>_graphics/favicon.ico"> - <script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-1.3.2.min.js"></script> - <script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-ui-1.7.2.custom.min.js"></script> + <script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-1.4.min.js"></script> + <script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-ui-1.7.2.min.js"></script> <script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery.form.js"></script> + <script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/custom-form-elements.js"></script> <script type="text/javascript" src="<?php echo $vars['url']; ?>_css/js.php?lastcache=<?php echo $vars['config']->lastcache; ?>&js=initialise_elgg&viewtype=<?php echo $vars['view']; ?>"></script> + + <?php + echo $feedref; + echo elgg_view('metatags',$vars); + ?> + <script type="text/javascript"> + jQuery(document).ready(function($) { + }); + </script> + <?php global $pickerinuse; if (isset($pickerinuse) && $pickerinuse == true) { @@ -76,14 +77,13 @@ $release = get_version(true); <!-- include the default css file --> <link rel="stylesheet" href="<?php echo $vars['url']; ?>_css/css.css?lastcache=<?php echo $vars['config']->lastcache; ?>&viewtype=<?php echo $vars['view']; ?>" type="text/css" /> - <?php - echo $feedref; - echo elgg_view('metatags',$vars); - ?> - <script type="text/javascript"> - jQuery(document).ready(function($) { - }); - </script> + <!--[if IE 6]> + <link rel="stylesheet" type="text/css" href="<?php echo $vars['url']; ?>mod/elgg_layout/css_ie6.php" /> + <![endif]--> + + <!--[if gt IE 6]> + <link rel="stylesheet" type="text/css" href="<?php echo $vars['url']; ?>mod/elgg_layout/css_ie.php" /> + <![endif]--> </head> <body> diff --git a/views/default/page_elements/html_end.php b/views/default/page_elements/html_end.php new file mode 100644 index 000000000..0862934cf --- /dev/null +++ b/views/default/page_elements/html_end.php @@ -0,0 +1,11 @@ +<?php +/** + * Start html output. + * The standard HTML header that displays across the site + * @uses $vars['config'] The site configuration settings, imported + * @uses $vars['title'] The page title + * @uses $vars['body'] The main content of the page + */ +?> +</body> +</html> diff --git a/views/default/page_elements/owner_block.php b/views/default/page_elements/owner_block.php index 1a3440135..eb18a733e 100644 --- a/views/default/page_elements/owner_block.php +++ b/views/default/page_elements/owner_block.php @@ -12,24 +12,25 @@ $contents = ""; -// Is there a page owner? -$owner = page_owner_entity(); -if ($owner instanceof ElggEntity) { - $icon = elgg_view("profile/icon",array('entity' => $owner, 'size' => 'tiny')); - if ($owner instanceof ElggUser || $owner instanceof ElggGroup) { - $info = '<a href="' . $owner->getURL() . '">' . $owner->name . '</a>'; +if(is_plugin_enabled('profile')) { + // Is there a page owner? + $owner = page_owner_entity(); + if ($owner instanceof ElggEntity) { + $icon = elgg_view("profile/icon",array('entity' => $owner, 'size' => 'tiny')); + if ($owner instanceof ElggUser || $owner instanceof ElggGroup) { + $info = '<a href="' . $owner->getURL() . '">' . $owner->name . '</a>'; + } + $display = "<div id='owner_block_icon'>" . $icon . "</div>"; + $display .= "<div id='owner_block_content'>" . $info . "</div><div class='clearfloat ownerblockline'></div>"; + + if ($owner->briefdescription) { + $desc = $owner->briefdescription; + $display .= "<div id='owner_block_desc'>" . $desc . "</div>"; + } + + $contents .= "<div id='owner_block'>".$display."</div><div id='owner_block_bottom'></div>"; } - $display = "<div id=\"owner_block_icon\">" . $icon . "</div>"; - $display .= "<div id=\"owner_block_content\">" . $info . "</div><div class=\"clearfloat ownerblockline\"></div>"; - - if ($owner->briefdescription) { - $desc = $owner->briefdescription; - $display .= "<div id=\"owner_block_desc\">" . $desc . "</div>"; - } - - $contents .= $display; } - // Are there feeds to display? global $autofeed; @@ -43,7 +44,7 @@ if (isset($autofeed) && $autofeed == true) { $label = elgg_echo('feed:rss'); $contents .= <<<END -<div id="owner_block_rss_feed"><a href="{$url}" rel="nofollow">{$label}</a></div> +<div id="rss_link"><a href="{$url}" rel="nofollow">{$label}</a></div> END; } @@ -55,13 +56,11 @@ $contents .= elgg_view('owner_block/extend'); if (isset($vars['content'])) $contents .= $vars['content']; -// Initialise the submenu (plugins can add to the submenu) +// Initialise the current tool/page submenu (plugins can add to the submenu) $submenu = get_submenu(); if (!empty($submenu)) - $contents .= "<div id=\"owner_block_submenu\">" . $submenu . "</div>"; + $contents .= "<div class='submenu page_navigation'>" . $submenu . "</div>"; if (!empty($contents)) { - echo "<div id=\"owner_block\">"; echo $contents; - echo "</div><div id=\"owner_block_bottom\"></div>"; }
\ No newline at end of file diff --git a/views/default/page_elements/spotlight.php b/views/default/page_elements/spotlight.php deleted file mode 100644 index 0c7e49c0f..000000000 --- a/views/default/page_elements/spotlight.php +++ /dev/null @@ -1,57 +0,0 @@ -<?php -/** - * Elgg spotlight - * The spotlight area that displays across the site - * - * @package Elgg - * @subpackage Core - * @author Curverider Ltd - * @link http://elgg.org/ - * - */ -?> - -<div id="layout_spotlight"> -<div id="wrapper_spotlight"> - -<div class="collapsable_box no_space_after"> - <div class="collapsable_box_header"> -<?php - - $closed = false; - if ($_SESSION['user'] instanceof ElggUser) { - if ($_SESSION['user']->spotlightclosed) { - - $closed = true; - - } - } - if ($closed) { -?> - <a href="javascript:void(0);" class="toggle_box_contents" onClick="$.post('<?php echo elgg_add_action_tokens_to_url("{$vars['url']}action/user/spotlight?closed=false"); ?>')">+</a> -<?php - } else { -?> - <a href="javascript:void(0);" class="toggle_box_contents" onClick="$.post('<?php echo elgg_add_action_tokens_to_url("{$vars['url']}action/user/spotlight?closed=true"); ?>')">-</a> -<?php - - } - -?> - <h1><?php echo elgg_echo("spotlight"); ?></h1> - </div> - <div class="collapsable_box_content" <?php if ($closed) echo "style=\"display:none\"" ?>> -<?php - - $context = get_context(); - if (!empty($context) && elgg_view_exists("spotlight/{$context}")) { - echo elgg_view("spotlight/{$context}"); - } else { - echo elgg_view("spotlight/default"); - } -?> - </div><!-- /.collapsable_box_content --> -</div><!-- /.collapsable_box --> - -</div><!-- /#wrapper_spotlight --> -</div><!-- /#layout_spotlight --> diff --git a/views/default/page_elements/title.php b/views/default/page_elements/title.php index 5123c14a7..99bc0fc6d 100644 --- a/views/default/page_elements/title.php +++ b/views/default/page_elements/title.php @@ -1,12 +1,6 @@ <?php /** * Elgg title element - * - * @package Elgg - * @subpackage Core - * @author Curverider Ltd - * @link http://elgg.org/ - * * @uses $vars['title'] The page title */ @@ -23,7 +17,7 @@ if (($_SESSION['guid']) && ($page_owner && $page_owner_user->guid != $_SESSION[' if($page_owner_user instanceOf ElggGroup) { $display = "<div id=\"content_area_group_title\">" . $info . "</div>"; } else { - $display = "<div id=\"content_area_user_title\">" . $info . "</div>"; + $display = $info; } if (!empty($submenu) && $vars['submenu'] == true) { // plugins can extend this to add menu options @@ -34,7 +28,7 @@ if (($_SESSION['guid']) && ($page_owner && $page_owner_user->guid != $_SESSION[' if($page_owner_user instanceOf ElggGroup) { $display = "<div id=\"content_area_group_title\">" . $info . "</div>"; } else { - $display = "<div id=\"content_area_user_title\">" . $info . "</div>"; + $display = $info; } if (!empty($submenu) && $vars['submenu'] == true) { // plugins can extend this to add menu options diff --git a/views/default/pageshells/pageshell.php b/views/default/page_shells/default.php index 61396dfbc..61396dfbc 100644 --- a/views/default/pageshells/pageshell.php +++ b/views/default/page_shells/default.php diff --git a/views/default/river/item/list.php b/views/default/river/item/list.php index 8fcc84bea..e1155cd28 100644 --- a/views/default/river/item/list.php +++ b/views/default/river/item/list.php @@ -47,7 +47,7 @@ } if (!empty($nav)) { - echo '<div class="river_pagination"><p>'.$nav.'</p><div class="clearfloat"></div></div>'; + echo '<div class="river_pagination"><p>'.$nav.'</p></div>'; } } ?> diff --git a/views/default/river/item/wrapper.php b/views/default/river/item/wrapper.php index 27de4affd..0080cf48b 100644 --- a/views/default/river/item/wrapper.php +++ b/views/default/river/item/wrapper.php @@ -57,7 +57,6 @@ if($avatar_icon == "icon"){ ?>) </span> </p> - <div class="clearfloat"></div> </div> <?php } diff --git a/views/default/settings/system.php b/views/default/settings/system.php index c8301051f..bcc5206f4 100644 --- a/views/default/settings/system.php +++ b/views/default/settings/system.php @@ -32,20 +32,20 @@ foreach(array('sitename','sitedescription', 'siteemail', 'wwwroot','path','datar $languages = get_installed_translations(); $form_body .= "<p>" . elgg_echo('installation:language') . elgg_view("input/pulldown", array('internalname' => 'language', 'value' => $vars['config']->language, 'options_values' => $languages)) . "</p>"; -$form_body .= "<p class=\"admin_debug\">" . elgg_echo('admin:site:access:warning') . "<br />"; +$form_body .= "<p>" . elgg_echo('admin:site:access:warning') . "<br />"; $form_body .= elgg_echo('installation:sitepermissions') . elgg_view('input/access', array('internalname' => 'default_access','value' => $vars['config']->default_access)) . "</p>"; -$form_body .= "<p class=\"admin_debug\">" . elgg_echo('installation:allow_user_default_access:description') . "<br />" .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') : "") )) . "</p>"; -$form_body .= "<p class=\"admin_debug\">" . elgg_echo('installation:simplecache:description') . "<br />" .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') : "") )) . "</p>"; -$form_body .= "<p class=\"admin_debug\">" . elgg_echo('installation:viewpathcache:description') . "<br />" .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') : "") )) . "</p>"; +$form_body .= "<p>" . elgg_echo('installation:allow_user_default_access:description') . "<br />" .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') : "") )) . "</p>"; +$form_body .= "<p>" . elgg_echo('installation:simplecache:description') . "<br />" .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') : "") )) . "</p>"; +$form_body .= "<p>" . elgg_echo('installation:viewpathcache:description') . "<br />" .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') : "") )) . "</p>"; $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 .= "<p class=\"admin_debug\">" . elgg_echo('installation:debug'); +$form_body .= "<p>" . elgg_echo('installation:debug'); $form_body .= elgg_view('input/pulldown', array('options_values' => $debug_options, 'internalname' => 'debug', 'value' => $vars['config']->debug)); $form_body .= '</p>'; -$form_body .= "<p class=\"admin_debug\">" . elgg_echo('installation:httpslogin') . "<br />" .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') : "") )) . "</p>"; +$form_body .= "<p>" . elgg_echo('installation:httpslogin') . "<br />" .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') : "") )) . "</p>"; -$form_body .= "<p class=\"admin_debug\">" . elgg_echo('installation:disableapi') . "<br />"; +$form_body .= "<p>" . elgg_echo('installation:disableapi') . "<br />"; $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')); @@ -53,8 +53,17 @@ if ((isset($CONFIG->disable_api)) && ($CONFIG->disable_api == true)) { $form_body .= elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:disableapi:label')), 'internalname' => 'api', 'value' => $on )); $form_body .= "</p>"; -$form_body .= elgg_view('input/hidden', array('internalname' => 'settings', 'value' => 'go')); +$form_body .= "<p>" . elgg_echo('installation:usage') . "<br />"; +$on = elgg_echo('installation:usage:label'); -$form_body .= elgg_view('input/submit', array('value' => elgg_echo("save"))); +if (isset($CONFIG->ping_home)) { + $on = ($vars['config']->ping_home!='disabled' ? elgg_echo('installation:usage:label') : ""); +} +$form_body .= elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:usage:label')), 'internalname' => 'usage', 'value' => $on )); +$form_body .= "</p>"; + +$form_body .= elgg_view('input/hidden', array('internalname' => 'settings', 'value' => 'go')); +$form_body .= "<div class='divider'></div>".elgg_view('input/submit', array('value' => elgg_echo("save"))); +$form_body = "<div class='admin_settings site_admin'>".$form_body."</div>"; echo elgg_view('input/form', array('action' => $action, 'body' => $form_body));
\ No newline at end of file diff --git a/views/default/spotlight/default.php b/views/default/spotlight/default.php index 38dd73c8d..cd52700da 100644 --- a/views/default/spotlight/default.php +++ b/views/default/spotlight/default.php @@ -32,5 +32,4 @@ <a href="http://community.elgg.org/">Elgg community</a>. </p> </div><!-- /spotlight LHS content --> - <div class="clearfloat"></div> </div>
\ No newline at end of file diff --git a/views/default/user/search/finishblurb.php b/views/default/user/search/finishblurb.php index a8c14f357..8371ee4b5 100644 --- a/views/default/user/search/finishblurb.php +++ b/views/default/user/search/finishblurb.php @@ -1,20 +1,20 @@ -<?php
-/**
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- * @deprecated 1.7
- */
-
-elgg_deprecated_notice('view user/search/finishblurb was deprecated.', 1.7);
-
-if ($vars['count'] > $vars['threshold']) {
-
-?>
-<div class="contentWrapper"><a href="<?php echo $vars['url']; ?>pg/search/users/?tag=<?php echo urlencode($vars['tag']); ?>"><?php
- echo elgg_echo("user:search:finishblurb");
- ?></a></div>
-<?php
-
-}
+<?php +/** + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @link http://elgg.org/ + * @deprecated 1.7 + */ + +elgg_deprecated_notice('view user/search/finishblurb was deprecated.', 1.7); + +if ($vars['count'] > $vars['threshold']) { + +?> +<div class="contentWrapper"><a href="<?php echo $vars['url']; ?>pg/search/users/?tag=<?php echo urlencode($vars['tag']); ?>"><?php + echo elgg_echo("user:search:finishblurb"); + ?></a></div> +<?php + +} diff --git a/views/default/user/search/startblurb.php b/views/default/user/search/startblurb.php index e069ec460..5ddb5ddc0 100644 --- a/views/default/user/search/startblurb.php +++ b/views/default/user/search/startblurb.php @@ -1,19 +1,19 @@ -<?php
-/**
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @deprecated 1.7
- * @link http://elgg.org/
- */
-
-elgg_deprecated_notice('view user/search/startblurb was deprecated.', 1.7);
-
-?>
-<div class="contentWrapper">
- <?php
-
- echo sprintf(elgg_echo("user:search:startblurb"),$vars['tag']);
-
- ?>
-</div>
+<?php +/** + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @deprecated 1.7 + * @link http://elgg.org/ + */ + +elgg_deprecated_notice('view user/search/startblurb was deprecated.', 1.7); + +?> +<div class="contentWrapper"> + <?php + + echo sprintf(elgg_echo("user:search:startblurb"),$vars['tag']); + + ?> +</div> diff --git a/views/default/user/settings/default_access.php b/views/default/user/settings/default_access.php index 3a6e6842c..791f3932c 100644 --- a/views/default/user/settings/default_access.php +++ b/views/default/user/settings/default_access.php @@ -15,6 +15,7 @@ if ($vars['config']->allow_user_default_access) { $default_access = $vars['config']->default_access; } ?> +<div class="user_settings access"> <h3><?php echo elgg_echo('default_access:settings'); ?></h3> <p> <?php echo elgg_echo('default_access:label'); ?>: @@ -24,7 +25,7 @@ if ($vars['config']->allow_user_default_access) { ?> </p> - +</div> <?php } }
\ No newline at end of file diff --git a/views/default/user/settings/email.php b/views/default/user/settings/email.php index 699f72583..7b6ea9f00 100644 --- a/views/default/user/settings/email.php +++ b/views/default/user/settings/email.php @@ -12,6 +12,7 @@ $user = page_owner_entity(); if ($user) { ?> +<div class="user_settings email"> <h3><?php echo elgg_echo('email:settings'); ?></h3> <p> <?php echo elgg_echo('email:address:label'); ?>: @@ -21,6 +22,6 @@ if ($user) { ?> </p> - +</div> <?php }
\ No newline at end of file diff --git a/views/default/user/settings/language.php b/views/default/user/settings/language.php index a7a66e5c2..36964a638 100644 --- a/views/default/user/settings/language.php +++ b/views/default/user/settings/language.php @@ -13,6 +13,7 @@ $user = page_owner_entity(); if ($user) { ?> +<div class="user_settings language"> <h3><?php echo elgg_echo('user:set:language'); ?></h3> <p> @@ -28,6 +29,6 @@ if ($user) { ?> </p> - +</div> <?php }
\ No newline at end of file diff --git a/views/default/user/settings/name.php b/views/default/user/settings/name.php index 2cbfd0bb6..d1d61482a 100644 --- a/views/default/user/settings/name.php +++ b/views/default/user/settings/name.php @@ -1,28 +1,17 @@ <?php - /** - * Provide a way of setting your full name. - * - * @package Elgg - * @subpackage Core +/** + * Provide a way of setting your full name. + * + * @package Elgg + * @subpackage Core - * @author Curverider Ltd + * @author Curverider Ltd - * @link http://elgg.org/ - */ + * @link http://elgg.org/ + */ - $user = page_owner_entity(); +$user = page_owner_entity(); -if ($user) { -?> - <h3><?php echo elgg_echo('user:set:name'); ?></h3> - <p> - <?php echo elgg_echo('user:name:label'); ?>: - <?php - - echo elgg_view('input/text', array('internalname' => 'name', 'value' => $user->name)); - echo elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $user->guid)); - ?> - </p> - -<?php -}
\ No newline at end of file +// all hidden, but necessary for properly updating user details +echo elgg_view('input/hidden', array('internalname' => 'name', 'value' => $user->name)); +echo elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $user->guid)); diff --git a/views/default/user/settings/password.php b/views/default/user/settings/password.php index 5cefe3821..68db18136 100644 --- a/views/default/user/settings/password.php +++ b/views/default/user/settings/password.php @@ -12,6 +12,7 @@ $user = page_owner_entity(); if ($user) { ?> +<div class="user_settings password"> <h3><?php echo elgg_echo('user:set:password'); ?></h3> <p> <?php echo elgg_echo('user:password:label'); ?>: @@ -22,6 +23,6 @@ if ($user) { echo elgg_view('input/password',array('internalname' => 'password2')); ?> </p> - +</div> <?php }
\ No newline at end of file diff --git a/views/default/usersettings/form.php b/views/default/usersettings/form.php index 2d4a7cb80..ffd9b9af0 100644 --- a/views/default/usersettings/form.php +++ b/views/default/usersettings/form.php @@ -6,7 +6,7 @@ * @link http://elgg.org/ */ -$form_body = "<div class=\"contentWrapper user_settings\">" . elgg_view("usersettings/user") . " "; -$form_body .= "<p>" . elgg_view('input/submit', array('value' => elgg_echo('save'))) . "</p></div>"; +$form_body = elgg_view("usersettings/user"); +$form_body .= "<div class='divider'></div>".elgg_view('input/submit', array('value' => elgg_echo('save'))); echo elgg_view('input/form', array('action' => "{$vars['url']}action/usersettings/save", 'body' => $form_body));
\ No newline at end of file diff --git a/views/default/usersettings/main.php b/views/default/usersettings/main.php index 6d96076f8..32d6c2c51 100644 --- a/views/default/usersettings/main.php +++ b/views/default/usersettings/main.php @@ -10,4 +10,4 @@ */ // Description of what's going on -echo "<p>" . elgg_view('output/longtext', array('value' => elgg_echo("usersettings:description"))) . "</p>"; +echo elgg_view('output/longtext', array('value' => elgg_echo("usersettings:description"))); diff --git a/views/default/usersettings/main_opt/plugins.php b/views/default/usersettings/main_opt/plugins.php index 210096e92..2b6793386 100644 --- a/views/default/usersettings/main_opt/plugins.php +++ b/views/default/usersettings/main_opt/plugins.php @@ -10,7 +10,7 @@ global $CONFIG; ?> -<div class="admin-menu-option"> +<div class="menu_admin_option"> <h2><?php echo elgg_echo('usersettings:plugins'); ?> </h2> <p><?php echo elgg_echo('usersettings:plugins:opt:description'); ?><br /> <a href="<?php echo $CONFIG->wwwroot . "pg/settings/plugins/"; ?>"><?php echo elgg_echo('usersettings:plugins:opt:linktext'); ?></a></p> diff --git a/views/default/usersettings/main_opt/statistics.php b/views/default/usersettings/main_opt/statistics.php index ca9d2d2bb..bbb4fc64d 100644 --- a/views/default/usersettings/main_opt/statistics.php +++ b/views/default/usersettings/main_opt/statistics.php @@ -8,7 +8,7 @@ * @link http://elgg.org/ */ ?> -<div class="admin-menu-option"> +<div class="menu_admin_option"> <h2><?php echo elgg_echo('usersettings:statistics'); ?> </h2> <p><?php echo elgg_echo('usersettings:statistics:opt:description'); ?><br /> <a href="<?php echo $CONFIG->wwwroot . "pg/settings/statistics/"; ?>"><?php echo elgg_echo('usersettings:statistics:opt:linktext'); ?></a></p> diff --git a/views/default/usersettings/main_opt/user.php b/views/default/usersettings/main_opt/user.php index 92b09cae0..369fc7bd3 100644 --- a/views/default/usersettings/main_opt/user.php +++ b/views/default/usersettings/main_opt/user.php @@ -8,7 +8,7 @@ * @link http://elgg.org/ */ ?> -<div class="admin-menu-option"> +<div class="menu_admin_option"> <h2><?php echo elgg_echo('usersettings:user'); ?> </h2> <p><?php echo elgg_echo('usersettings:user:opt:description'); ?><br /> <a href="<?php echo $CONFIG->wwwroot . "pg/settings/user/"; ?>"><?php echo elgg_echo('usersettings:user:opt:linktext'); ?></a></p> diff --git a/views/default/usersettings/plugins.php b/views/default/usersettings/plugins.php index 95a856850..8c873a9de 100644 --- a/views/default/usersettings/plugins.php +++ b/views/default/usersettings/plugins.php @@ -9,7 +9,7 @@ */ // Description of what's going on -echo "<div class=\"contentWrapper\">" . elgg_view('output/longtext', array('value' => elgg_echo("usersettings:plugins:description"))) . "</div>"; +echo elgg_view('output/longtext', array('value' => elgg_echo("usersettings:plugins:description"))); $limit = get_input('limit', 10); $offset = get_input('offset', 0); diff --git a/views/default/usersettings/plugins_opt/plugin.php b/views/default/usersettings/plugins_opt/plugin.php index c27212887..d32e44283 100644 --- a/views/default/usersettings/plugins_opt/plugin.php +++ b/views/default/usersettings/plugins_opt/plugin.php @@ -25,12 +25,12 @@ if ($user_guid) { if (elgg_view("usersettings/{$plugin}/edit")) { ?> -<div class="contentWrapper"> - <h3 class="settings"><?php echo elgg_echo($plugin); ?></h3> - +<div class="user_settings"> + <h3><?php echo elgg_echo($plugin); ?></h3> + <div id="<?php echo $plugin; ?>_settings"> <?php echo elgg_view("object/plugin", array('plugin' => $plugin, 'entity' => find_plugin_usersettings($plugin, $user_guid), 'prefix' => 'user')) ?> </div> -</div> +</div> <?php }
\ No newline at end of file diff --git a/views/default/usersettings/statistics_opt/numentities.php b/views/default/usersettings/statistics_opt/numentities.php index cf1d8598b..1c4b127ec 100644 --- a/views/default/usersettings/statistics_opt/numentities.php +++ b/views/default/usersettings/statistics_opt/numentities.php @@ -13,9 +13,9 @@ $entity_stats = get_entity_statistics($_SESSION['user']->guid); if ($entity_stats) { ?> -<div class="usersettings_statistics"> +<div class="user_settings statistics"> <h3><?php echo elgg_echo('usersettings:statistics:label:numentities'); ?></h3> - <table> + <table class="styled"> <?php foreach ($entity_stats as $k => $entry) { foreach ($entry as $a => $b) { diff --git a/views/default/usersettings/statistics_opt/online.php b/views/default/usersettings/statistics_opt/online.php index 2ea9bef28..817b18cde 100644 --- a/views/default/usersettings/statistics_opt/online.php +++ b/views/default/usersettings/statistics_opt/online.php @@ -18,10 +18,10 @@ if ($log) { } ?> -<div class="usersettings_statistics"> +<div class="user_settings details"> <h3><?php echo elgg_echo('usersettings:statistics:yourdetails'); ?></h3> - <table> + <table class="styled"> <tr class="odd"><td class="column_one"><?php echo elgg_echo('usersettings:statistics:label:name'); ?></td><td><?php echo $user->name; ?></td></tr> <tr class="even"><td class="column_one"><?php echo elgg_echo('usersettings:statistics:label:email'); ?></td><td><?php echo $user->email; ?></td></tr> <tr class="odd"><td class="column_one"><?php echo elgg_echo('usersettings:statistics:label:membersince'); ?></td><td><?php echo date("r",$user->time_created); ?></td></tr> |