aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
Diffstat (limited to 'views')
-rw-r--r--views/default/admin/appearance/profile_fields.php4
-rw-r--r--views/default/admin/plugins.php24
-rw-r--r--views/default/annotation/default.php25
-rw-r--r--views/default/annotation/generic_comment.php18
-rw-r--r--views/default/core/avatar/upload.php2
-rw-r--r--views/default/core/friends/collection.php2
-rw-r--r--views/default/css/admin.php369
-rw-r--r--views/default/css/elements/components.php4
-rw-r--r--views/default/css/elements/core.php4
-rw-r--r--views/default/css/elements/forms.php12
-rw-r--r--views/default/css/elements/icons.php182
-rw-r--r--views/default/css/elements/navigation.php51
-rw-r--r--views/default/css/ie.php76
-rw-r--r--views/default/css/ie6.php8
-rw-r--r--views/default/css/ie7.php53
-rw-r--r--views/default/css/lightbox.php371
-rw-r--r--views/default/forms/account/settings.php2
-rw-r--r--views/default/forms/admin/plugins/change_state.php4
-rw-r--r--views/default/forms/admin/plugins/filter.php2
-rw-r--r--views/default/forms/admin/plugins/sort.php2
-rw-r--r--views/default/forms/admin/site/update_advanced.php16
-rw-r--r--views/default/forms/avatar/crop.php18
-rw-r--r--views/default/forms/login.php24
-rw-r--r--views/default/forms/plugins/settings/save.php2
-rw-r--r--views/default/forms/plugins/usersettings/save.php9
-rw-r--r--views/default/forms/profile/fields/add.php8
-rw-r--r--views/default/forms/profile/fields/reset.php2
-rw-r--r--views/default/forms/register.php2
-rw-r--r--views/default/forms/useradd.php11
-rw-r--r--views/default/forms/usersettings/save.php8
-rw-r--r--views/default/icon/default.php5
-rw-r--r--views/default/icon/user/default.php4
-rw-r--r--views/default/input/checkboxes.php1
-rw-r--r--views/default/input/date.php1
-rw-r--r--views/default/input/dropdown.php2
-rw-r--r--views/default/input/friendspicker.php2
-rw-r--r--views/default/input/radio.php1
-rw-r--r--views/default/input/userpicker.php8
-rw-r--r--views/default/js/admin.php1
-rw-r--r--views/default/js/elgg.php6
-rw-r--r--views/default/navigation/menu/default.php2
-rw-r--r--views/default/navigation/menu/site.php4
-rw-r--r--views/default/object/plugin/advanced.php10
-rw-r--r--views/default/object/plugin/elements/dependencies.php2
-rw-r--r--views/default/object/plugin/invalid.php2
-rw-r--r--views/default/object/plugin/simple.php2
-rw-r--r--views/default/output/confirmlink.php16
-rw-r--r--views/default/page/admin.php2
-rw-r--r--views/default/page/elements/head.php8
-rw-r--r--views/default/page/elements/shortcut_icon.php6
-rw-r--r--views/default/river/user/default/profileupdate.php19
-rw-r--r--views/installation/page/default.php2
52 files changed, 941 insertions, 480 deletions
diff --git a/views/default/admin/appearance/profile_fields.php b/views/default/admin/appearance/profile_fields.php
index 7077687cc..8371ce83c 100644
--- a/views/default/admin/appearance/profile_fields.php
+++ b/views/default/admin/appearance/profile_fields.php
@@ -10,9 +10,7 @@ $reset = elgg_view_form('profile/fields/reset', array(), array());
$body = <<<__HTML
$add
$list
-<div class="default_profile_reset">
- $reset
-</div>
+$reset
__HTML;
echo $body;
diff --git a/views/default/admin/plugins.php b/views/default/admin/plugins.php
index 1aa899fcc..451936335 100644
--- a/views/default/admin/plugins.php
+++ b/views/default/admin/plugins.php
@@ -20,6 +20,11 @@ $categories = array();
foreach ($installed_plugins as $id => $plugin) {
if (!$plugin->isValid()) {
+ if ($plugin->isActive()) {
+ // force disable and warn
+ register_error(elgg_echo('ElggPlugin:InvalidAndDeactivated', array($plugin->getId())));
+ $plugin->deactivate();
+ }
continue;
}
@@ -40,6 +45,11 @@ foreach ($installed_plugins as $id => $plugin) {
unset($installed_plugins[$id]);
}
break;
+ case 'nonbundled':
+ if (in_array('bundled', $plugin_categories)) {
+ unset($installed_plugins[$id]);
+ }
+ break;
default:
if (!in_array($show_category, $plugin_categories)) {
unset($installed_plugins[$id]);
@@ -50,7 +60,13 @@ foreach ($installed_plugins as $id => $plugin) {
if (isset($plugin_categories)) {
foreach ($plugin_categories as $category) {
if (!array_key_exists($category, $categories)) {
- $categories[$category] = elgg_echo("admin:plugins:category:$category");
+ // if localization string not defined, fall back to original category string
+ $cat_raw_string = "admin:plugins:category:$category";
+ $cat_display_string = elgg_echo($cat_raw_string);
+ if ($cat_display_string == $cat_raw_string) {
+ $cat_display_string = ucwords($category);
+ }
+ $categories[$category] = $cat_display_string;
}
}
}
@@ -91,10 +107,16 @@ switch ($sort) {
asort($categories);
+// we want bundled/nonbundled pulled to be at the top of the list
+unset($categories['bundled']);
+unset($categories['nonbundled']);
+
$common_categories = array(
'all' => elgg_echo('admin:plugins:category:all'),
'active' => elgg_echo('admin:plugins:category:active'),
'inactive' => elgg_echo('admin:plugins:category:inactive'),
+ 'bundled' => elgg_echo('admin:plugins:category:bundled'),
+ 'nonbundled' => elgg_echo('admin:plugins:category:nonbundled'),
);
$categories = array_merge($common_categories, $categories);
diff --git a/views/default/annotation/default.php b/views/default/annotation/default.php
index a21fdee51..0e626ad9a 100644
--- a/views/default/annotation/default.php
+++ b/views/default/annotation/default.php
@@ -2,9 +2,9 @@
/**
* Elgg default annotation view
*
+ * @note To add or remove from the annotation menu, register handlers for the menu:annotation hook.
+ *
* @uses $vars['annotation']
- * @uses $vars['delete_action'] A custom action for the delete button.
- * The annotation ID is passed as 'annotation_id'.
*/
$annotation = $vars['annotation'];
@@ -16,28 +16,19 @@ if (!$owner) {
$icon = elgg_view_entity_icon($owner, 'tiny');
$owner_link = "<a href=\"{$owner->getURL()}\">$owner->name</a>";
-$delete_action = elgg_extract('delete_action', $vars, '');
+$menu = elgg_view_menu('annotation', array(
+ 'annotation' => $annotation,
+ 'sort_by' => 'priority',
+ 'class' => 'elgg-menu-hz right',
+));
$text = elgg_view("output/longtext", array("value" => $annotation->value));
$friendlytime = elgg_view_friendly_time($annotation->time_created);
-$delete_button = '';
-if ($delete_action && $annotation->canEdit()) {
- $url = elgg_http_add_url_query_elements($delete_action, array(
- 'annotation_id' => $annotation->id,
- ));
- $delete_button = elgg_view("output/confirmlink", array(
- 'href' => $url,
- 'text' => "<span class=\"elgg-icon elgg-icon-delete right\"></span>",
- 'confirm' => elgg_echo('deleteconfirm'),
- 'text_encode' => false,
- ));
-}
-
$body = <<<HTML
<div class="mbn">
- $delete_button
+ $menu
$owner_link
<span class="elgg-subtext">
$friendlytime
diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php
index 69520d102..a4fbf904e 100644
--- a/views/default/annotation/generic_comment.php
+++ b/views/default/annotation/generic_comment.php
@@ -29,23 +29,17 @@ $entity_title = $entity->title ? $entity->title : elgg_echo('untitled');
$entity_link = "<a href=\"{$entity->getURL()}\">$entity_title</a>";
if ($full_view) {
-
- $delete_button = '';
- if ($comment->canEdit()) {
- $url = "action/comments/delete?annotation_id=$comment->id";
- $delete_button = elgg_view("output/confirmlink", array(
- 'href' => $url,
- 'text' => "<span class=\"elgg-icon elgg-icon-delete right\"></span>",
- 'confirm' => elgg_echo('deleteconfirm'),
- 'text_encode' => false,
- ));
- }
+ $menu = elgg_view_menu('annotation', array(
+ 'annotation' => $comment,
+ 'sort_by' => 'priority',
+ 'class' => 'elgg-menu-hz right',
+ ));
$comment_text = elgg_view("output/longtext", array("value" => $comment->value));
$body = <<<HTML
<div class="mbn">
- $delete_button
+ $menu
$commenter_link
<span class="elgg-subtext">
$friendlytime
diff --git a/views/default/core/avatar/upload.php b/views/default/core/avatar/upload.php
index 6887eab5c..11902cf4a 100644
--- a/views/default/core/avatar/upload.php
+++ b/views/default/core/avatar/upload.php
@@ -5,7 +5,7 @@
* @uses $vars['entity']
*/
-$user_avatar = $vars['entity']->getIcon('medium');
+$user_avatar = $vars['entity']->getIconUrl('medium');
$current_label = elgg_echo('avatar:current');
diff --git a/views/default/core/friends/collection.php b/views/default/core/friends/collection.php
index dac98bc5d..b7913da5f 100644
--- a/views/default/core/friends/collection.php
+++ b/views/default/core/friends/collection.php
@@ -25,7 +25,7 @@ if ($coll->owner_guid == elgg_get_logged_in_user_guid()) {
'href' => 'action/friends/collections/delete?collection=' . $coll->id,
'class' => 'delete_collection',
'text' => elgg_view_icon('delete'),
- 'text_encode' => false,
+ 'encode_text' => false,
));
echo "</div>";
}
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index 8993ec66d..90d151bc6 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -38,26 +38,26 @@ html, body {
margin-bottom: 1px;
}
img {
- border-width:0;
- border-color:transparent;
+ border-width: 0;
+ border-color: transparent;
}
:focus {
- outline:0 none;
+ outline: 0 none;
}
ol, ul {
list-style: none;
}
em, i {
- font-style:italic;
+ font-style: italic;
}
ins {
- text-decoration:none;
+ text-decoration: none;
}
del {
text-decoration:line-through;
}
strong, b {
- font-weight:bold;
+ font-weight: bold;
}
table {
border-collapse: collapse;
@@ -79,7 +79,6 @@ blockquote, q {
/* ***************************************
BASICS
*************************************** */
-
body {
background-color: #eee;
font-size: 80%;
@@ -116,15 +115,8 @@ p {
margin-bottom: 15px;
}
-.elgg-output dt { font-weight: bold }
-.elgg-output dd { margin: 0 0 1em 2em }
-
-table.mceLayout {
- width:100% !important;
-}
-
.clearfloat {
- clear:both;
+ clear: both;
}
/* Clearfix! */
@@ -150,10 +142,10 @@ table.mceLayout {
content: " x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x ";
}
.hidden {
- display:none;
+ display: none;
}
.centered {
- margin:0 auto;
+ margin: 0 auto;
}
.center {
text-align: center;
@@ -164,6 +156,9 @@ table.mceLayout {
.float-alt {
float: right;
}
+.elgg-toggle {
+ cursor: pointer;
+}
/* ***************************************
PAGE WRAPPER
@@ -211,7 +206,7 @@ table.mceLayout {
.elgg-menu-user li {
display: inline;
}
-.elgg-menu-user li:after{
+.elgg-menu-user li:after {
content: "|";
display: inline-block;
font-weight: normal;
@@ -222,6 +217,9 @@ table.mceLayout {
content: "";
}
+/* ***************************************
+ MESSAGES
+*************************************** */
.elgg-page-messages {
padding: 20px 0 0;
width: 500px;
@@ -248,13 +246,35 @@ table.mceLayout {
border-color: #c6d880;
}
+.elgg-admin-notices {
+ padding-bottom: 15px;
+}
+.elgg-admin-notices p {
+ background-color: #BDE5F8;
+ color: black;
+ border: 1px solid blue;
+ font-weight: bold;
+ padding: 3px 0px 3px 10px;
+
+ -webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45);
+ -moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45);
+ box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45);
+
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ border-radius: 4px;
+}
+.elgg-admin-notices a {
+ float: right;
+}
+
/* ***************************************
BODY
*************************************** */
.elgg-page-body {
padding: 20px 0;
}
-.elgg-main {
+.elgg-main {
background-color: #fff;
border: 1px solid #ccc;
padding: 20px;
@@ -384,31 +404,19 @@ table.mceLayout {
float: right;
margin-left: 5px;
}
-
.elgg-item {
margin: 3px;
}
-.elgg-menu-metadata {
- float: right;
- margin-left: 15px;
- font-size: 90%;
-}
-.elgg-menu-metadata > li {
- float: left;
- margin-left: 15px;
-}
-.elgg-menu-metadata, .elgg-menu-metadata a {
- color: #aaa;
-}
.elgg-simple-list li {
margin-bottom: 5px;
}
+
/* ***************************************
FORMS AND INPUT
*************************************** */
label {
font-weight: bold;
- color:#333333;
+ color: #333333;
font-size: 110%;
}
fieldset > div {
@@ -421,7 +429,7 @@ input {
font: 120% Arial, Helvetica, sans-serif;
padding: 5px;
border: 1px solid #ccc;
- color:#666;
+ color: #666;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
@@ -432,50 +440,67 @@ input {
.elgg-input-tags,
.elgg-input-url,
.elgg-input-plaintext {
- width:98%;
+ width: 98%;
}
textarea {
height: 100px;
}
-input[type="submit"], .elgg-button-submit, .elgg-button-action, .elgg-button-cancel {
+.elgg-input-thin {
+ width: 400px;
+}
+
+.elgg-button {
font-size: 14px;
font-weight: bold;
- color: white;
text-decoration: none;
- background-color: #333;
- border-color: #333;
-
+
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
- display: inline-block;
width: auto;
padding: 2px 4px;
- margin: 10px 5px 10px 0;
cursor: pointer;
outline: none;
}
-input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover {
+a.elgg-button {
+ padding: 3px 6px;
+}
+
+.elgg-button + .elgg-button {
+ margin-left: 5px;
+}
+
+.elgg-button-submit,
+.elgg-button-action {
+ color: white;
+ border: 1px solid #333;
+ background-color: #333;
+ text-shadow: 1px 1px 0px black;
+}
+.elgg-button-submit:hover,
+.elgg-button-action:hover {
color: white;
background-color: #000;
text-decoration: none;
}
-.elgg-button-submit, .elgg-button-action, .elgg-button-cancel {
- padding: 4px 8px;
+.elgg-button-submit.elgg-state-disabled,
+.elgg-button-action.elgg-state-disabled {
+ color: #999;
+ cursor: default;
}
+
.elgg-button-cancel {
color: #333;
background-color: #999;
+ border: 1px solid #999;
}
.elgg-button-cancel:hover {
color: #222;
background-color: #666;
text-decoration: none;
}
-.elgg-button-action.elgg-state-disabled {
- background-color: #aaa;
-}
+
/* **************************************
DATE PICKER
*************************************** */
@@ -546,6 +571,7 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
color: #333;
background: #ddd;
}
+
/* ***************************************
PAGINATION
*************************************** */
@@ -571,14 +597,13 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
color: white;
text-decoration: none;
}
-
-.elgg-pagination .elgg-state-disabled {
+.elgg-pagination .elgg-state-disabled span {
color: #CCC;
border-color: #CCC;
}
-.elgg-pagination .elgg-state-selected {
- color: #555;
- border-color: #555;
+.elgg-pagination .elgg-state-selected span {
+ color: #000;
+ border-color: #ccc;
}
/* ***************************************
@@ -636,7 +661,6 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
-moz-border-radius: 5px;
border-radius: 5px;
}
-
.elgg-admin-sidebar-menu a:hover {
text-decoration: none;
background: black;
@@ -646,12 +670,10 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
.elgg-admin-sidebar-menu li.elgg-state-selected > a {
background-color: #BBB;
}
-
.elgg-admin-sidebar-menu .elgg-menu-closed:before {
content: "\25B8";
padding-right: 4px;
}
-
.elgg-admin-sidebar-menu .elgg-menu-opened:before {
content: "\25BE";
padding-right: 4px;
@@ -676,7 +698,6 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
.elgg-menu-title {
float: right;
}
-
.elgg-menu-title > li {
display: inline-block;
margin-left: 4px;
@@ -685,12 +706,13 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
/* ***************************************
FOOTER MENU
*************************************** */
-.elgg-menu-footer {color:gray}
-
+.elgg-menu-footer {
+ color: gray;
+}
.elgg-menu-footer li {
float: left;
}
-.elgg-menu-footer li:after{
+.elgg-menu-footer li:after {
content: "\007C";
display: inline-block;
padding: 0 4px 0 4px;
@@ -744,14 +766,40 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
}
/* ***************************************
+ ENTITY MENU
+*************************************** */
+<?php // height depends on line height/font size ?>
+.elgg-menu-entity, elgg-menu-annotation {
+ float: right;
+ margin-left: 15px;
+ font-size: 90%;
+ color: #666;
+ line-height: 16px;
+ height: 16px;
+}
+.elgg-menu-entity > li, .elgg-menu-annotation > li {
+ margin-left: 15px;
+}
+.elgg-menu-entity > li > a, .elgg-menu-annotation > li > a {
+ color: #aaa;
+}
+<?php // need to override .elgg-menu-hz ?>
+.elgg-menu-entity > li > a, .elgg-menu-annotation > li > a {
+ display: block;
+}
+.elgg-menu-entity > li > span, .elgg-menu-annotation > li > span {
+ vertical-align: baseline;
+}
+
+/* ***************************************
MORE MENUS
*************************************** */
/* Horizontal menus w/ separator support */
.elgg-menu-hz > li,
.elgg-menu-hz > li:after,
.elgg-menu-hz > li > a {
- display:inline-block;
- vertical-align:middle;
+ display: inline-block;
+ vertical-align: middle;
}
/* Allow inline image blocks in horizontal menus */
.elgg-menu-hz .elgg-body:after {
@@ -766,6 +814,19 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
.elgg-menu-longtext {
float: right;
}
+.elgg-menu-metadata {
+ list-style-type: none;
+ float: right;
+ margin-left: 15px;
+ font-size: 90%;
+}
+.elgg-menu-metadata > li {
+ float: left;
+ margin-left: 15px;
+}
+.elgg-menu-metadata, .elgg-menu-metadata a {
+ color: #aaa;
+}
/* ***************************************
WIDGETS
@@ -926,23 +987,8 @@ a.elgg-widget-collapsed:before {
width: 83.33%;
}
-
-.elgg-subtext {
- color: #666;
- font-size: 85%;
- line-height: 1.2em;
- font-style: italic;
- margin-bottom: 5px;
-}
-
-.elgg-longtext-control {
- margin-left: 14px;
- font-size: 80%;
- cursor: pointer;
-}
-
/* ***************************************
- Spacing (from OOCSS)
+ SPACING (from OOCSS)
*************************************** */
.pan{padding:0}
.pas{padding:5px}
@@ -1049,6 +1095,7 @@ a.elgg-widget-collapsed:before {
*************************************** */
.elgg-avatar {
position: relative;
+ display: inline-block;
}
.elgg-avatar > a > img {
display: block;
@@ -1156,94 +1203,32 @@ a.elgg-widget-collapsed:before {
height: 200px;
}
-
-.elgg-menu-metadata {
- list-style-type: none;
- float: right;
- margin-left: 15px;
- font-size: 90%;
-}
-.elgg-menu-metadata > li {
- float: left;
- margin-left: 15px;
-}
-
-.right {float:right}
-.elgg-toggle {cursor:pointer}
-
-<?php //@todo elgg-drag-handle instead? ?>
-.elgg-state-draggable .elgg-head {
- cursor: move;
-}
-
/* ***************************************
- ADMIN MISC
-*************************************** */
-
-.elgg-instructs {
- max-width: 600px;
-}
-
-.manifest_file {
- background-color:#eee;
-
- -webkit-border-radius: 8px;
- -moz-border-radius: 8px;
- border-radius: 8px;
-
- padding:5px 10px;
- margin:4px 0;
-}
-
-
-.plugin_controls {
- padding: 3px 3px 3px 0;
- font-weight: bold;
- float: left;
- width: 150px;
-}
-form.admin_plugins_simpleview .elgg-button-submit {
- margin-right:20px;
-}
-.plugin_info {
- margin: 3px;
- padding-left: 150px;
- display: block;
-}
-.plugin_metadata {
- display:block;
- color:#999;
-}
-.plugin_name input[type="checkbox"] {
- margin-right: 10px;
-}
-ul.admin_plugins {
- margin-bottom: 0;
- padding-left: 0;
- list-style: none;
-}
+ PLUGINS
+**************************************** */
.elgg-plugin {
- border:1px solid #999;
- margin:0 0 5px;
- padding:0 7px 4px 10px;
+ border: 1px solid #999;
+ margin: 0 0 5px;
+ padding: 0 7px 4px 10px;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
}
-
+.elgg-plugin.elgg-state-draggable > .elgg-image-block .elgg-head {
+ cursor: move;
+}
.elgg-plugin p {
- margin:0;
- padding:0;
+ margin: 0;
}
.elgg-plugin h3 {
- color:black;
+ color: black;
padding-bottom: 10px;
}
-.plugin_settings {
+.elgg-plugin-settings {
font-weight: normal;
+ font-size: 0.9em;
}
-
.elgg-plugin-screenshot {
display: inline;
}
@@ -1263,64 +1248,43 @@ ul.admin_plugins {
border-radius: 8px;
}
.elgg-plugin-screenshot-lightbox h2 {
- color:black;
+ color: black;
}
-
.elgg-plugin.elgg-state-active {
background: white;
}
.elgg-plugin.elgg-state-inactive {
background: #dedede;
}
-
-.elgg-state-error {
+.elgg-plugin .elgg-state-error {
background: #fbe3e4;
color: #8a1f11;
border-color: #fbc2c4;
font-weight: bold;
}
-.elgg-state-warning {
+.elgg-plugin .elgg-state-warning {
background: #fbedb5;
color: #000000;
border-color: #fbe58b;
font-weight: bold;
}
+.elgg-plugin-more {
+ background-color: #eee;
-.admin_notices {
- padding-bottom: 15px;
-}
-.admin_notices p {
- background-color:#BDE5F8;
- color: black;
- border: 1px solid blue;
- font-weight: bold;
- padding: 3px 0px 3px 10px;
-
- -webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45);
- -moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45);
- box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45);
-
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- border-radius: 4px;
-}
-
-.admin_notices a {
- float: right;
-}
+ -webkit-border-radius: 8px;
+ -moz-border-radius: 8px;
+ border-radius: 8px;
-.add-user form {
- width:300px;
+ padding: 5px 10px;
+ margin: 4px 0;
}
/****************************************
- Markdown Text
+ MARKDOWN
****************************************/
-
.elgg-markdown {
margin: 15px;
}
-
.elgg-markdown h1,
.elgg-markdown h2,
.elgg-markdown h3,
@@ -1330,17 +1294,46 @@ ul.admin_plugins {
margin: 1em 0 1em -15px;
color: #333;
}
-
.elgg-markdown ol {
list-style: decimal;
padding-left: 2em;
}
-
.elgg-markdown ul {
list-style: disc;
padding-left: 2em;
}
-
.elgg-markdown p {
margin: 15px 0;
-} \ No newline at end of file
+}
+
+/* ***************************************
+ MISC
+*************************************** */
+.elgg-content-thin {
+ max-width: 600px;
+}
+
+.elgg-subtext {
+ color: #666;
+ font-size: 85%;
+ line-height: 1.2em;
+ font-style: italic;
+ margin-bottom: 5px;
+}
+
+.elgg-longtext-control {
+ margin-left: 14px;
+ font-size: 80%;
+ cursor: pointer;
+}
+
+table.mceLayout {
+ width:100% !important;
+}
+
+.elgg-output dt {
+ font-weight: bold;
+}
+.elgg-output dd {
+ margin: 0 0 1em 2em;
+}
diff --git a/views/default/css/elements/components.php b/views/default/css/elements/components.php
index 4a09ca74e..f675ab7cb 100644
--- a/views/default/css/elements/components.php
+++ b/views/default/css/elements/components.php
@@ -146,10 +146,10 @@
/* ***************************************
River
*************************************** */
-.elgg-river {
+.elgg-list-river {
border-top: 1px solid #CCC;
}
-.elgg-river > li {
+.elgg-list-river > li {
border-bottom: 1px solid #CCC;
}
.elgg-river-item {
diff --git a/views/default/css/elements/core.php b/views/default/css/elements/core.php
index af4a1882a..627cae55c 100644
--- a/views/default/css/elements/core.php
+++ b/views/default/css/elements/core.php
@@ -98,8 +98,4 @@
position: relative;
display: inline-block;
-
- /* Inline-block: IE 6, 7 */
- zoom: 1;
- *display: inline;
}
diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php
index 1fced0196..83ec2f602 100644
--- a/views/default/css/elements/forms.php
+++ b/views/default/css/elements/forms.php
@@ -252,19 +252,29 @@ input[type="radio"] {
DATE PICKER
**************************************** */
.ui-datepicker {
+ display: none;
+
margin-top: 3px;
+ width: 208px;
background-color: white;
border: 1px solid #0054A7;
-webkit-border-radius: 6px;
-moz-border-radius: 6px;
border-radius: 6px;
+ overflow: hidden;
+
-webkit-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
-moz-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
- overflow: hidden;
+}
+.ui-datepicker-inline {
+ -webkit-box-shadow: none;
+ -moz-box-shadow: none;
+ box-shadow: none;
}
.ui-datepicker-header {
+ position: relative;
background: #4690D6;
color: white;
padding: 2px 0;
diff --git a/views/default/css/elements/icons.php b/views/default/css/elements/icons.php
index 1bc056072..f7c789e33 100644
--- a/views/default/css/elements/icons.php
+++ b/views/default/css/elements/icons.php
@@ -27,215 +27,254 @@
.elgg-icon-arrow-two-head {
background-position: 0 -36px;
}
-.elgg-icon-calendar {
+.elgg-icon-attention:hover {
background-position: 0 -54px;
}
-.elgg-icon-checkmark:hover {
+.elgg-icon-attention {
background-position: 0 -72px;
}
-.elgg-icon-checkmark {
+.elgg-icon-calendar {
background-position: 0 -90px;
}
-.elgg-icon-clip:hover {
+.elgg-icon-cell-phone {
background-position: 0 -108px;
}
-.elgg-icon-clip {
+.elgg-icon-checkmark:hover {
background-position: 0 -126px;
}
-.elgg-icon-cursor-drag-arrow {
+.elgg-icon-checkmark {
background-position: 0 -144px;
}
-.elgg-icon-delete-alt:hover {
+.elgg-icon-clip:hover {
background-position: 0 -162px;
}
-.elgg-icon-delete-alt {
+.elgg-icon-clip {
background-position: 0 -180px;
}
-.elgg-icon-delete:hover {
+.elgg-icon-cursor-drag-arrow {
background-position: 0 -198px;
}
-.elgg-icon-delete {
+.elgg-icon-delete-alt:hover {
background-position: 0 -216px;
}
-.elgg-icon-download:hover {
+.elgg-icon-delete-alt {
background-position: 0 -234px;
}
-.elgg-icon-download {
+.elgg-icon-delete:hover {
background-position: 0 -252px;
}
-.elgg-icon-facebook {
+.elgg-icon-delete {
background-position: 0 -270px;
}
-.elgg-icon-home:hover {
+.elgg-icon-download:hover {
background-position: 0 -288px;
}
-.elgg-icon-home {
+.elgg-icon-download {
background-position: 0 -306px;
}
-.elgg-icon-hover-menu:hover {
+.elgg-icon-eye {
background-position: 0 -324px;
}
-.elgg-icon-hover-menu {
+.elgg-icon-facebook {
background-position: 0 -342px;
}
-.elgg-icon-link:hover {
+.elgg-icon-grid:hover {
background-position: 0 -360px;
}
-.elgg-icon-link {
+.elgg-icon-grid {
background-position: 0 -378px;
}
-.elgg-icon-mail-alt:hover {
+.elgg-icon-home:hover {
background-position: 0 -396px;
}
-.elgg-icon-mail-alt {
+.elgg-icon-home {
background-position: 0 -414px;
}
-.elgg-icon-mail:hover {
+.elgg-icon-hover-menu:hover {
background-position: 0 -432px;
}
-.elgg-icon-mail {
+.elgg-icon-hover-menu {
background-position: 0 -450px;
}
-.elgg-icon-print-alt {
+.elgg-icon-info:hover {
background-position: 0 -468px;
}
-.elgg-icon-print {
+.elgg-icon-info {
background-position: 0 -486px;
}
-.elgg-icon-push-pin-alt {
+.elgg-icon-link:hover {
background-position: 0 -504px;
}
-.elgg-icon-push-pin {
+.elgg-icon-link {
background-position: 0 -522px;
}
-.elgg-icon-redo {
+.elgg-icon-list {
background-position: 0 -540px;
}
-.elgg-icon-refresh:hover {
+.elgg-icon-lock-closed {
background-position: 0 -558px;
}
-.elgg-icon-refresh {
+.elgg-icon-lock-open {
background-position: 0 -576px;
}
-.elgg-icon-round-arrow-left {
+.elgg-icon-mail-alt:hover {
background-position: 0 -594px;
}
-.elgg-icon-round-arrow-right {
+.elgg-icon-mail-alt {
background-position: 0 -612px;
}
-.elgg-icon-round-checkmark {
+.elgg-icon-mail:hover {
background-position: 0 -630px;
}
-.elgg-icon-round-minus {
+.elgg-icon-mail {
background-position: 0 -648px;
}
-.elgg-icon-round-plus {
+.elgg-icon-photo {
background-position: 0 -666px;
}
-.elgg-icon-rss {
+.elgg-icon-print-alt {
background-position: 0 -684px;
}
-.elgg-icon-search-focus {
+.elgg-icon-print {
background-position: 0 -702px;
}
-.elgg-icon-search {
+.elgg-icon-push-pin-alt {
background-position: 0 -720px;
}
-.elgg-icon-settings-alt:hover {
+.elgg-icon-push-pin {
background-position: 0 -738px;
}
-.elgg-icon-settings-alt {
+.elgg-icon-redo {
background-position: 0 -756px;
}
-.elgg-icon-settings {
+.elgg-icon-refresh:hover {
background-position: 0 -774px;
}
-.elgg-icon-share:hover {
+.elgg-icon-refresh {
background-position: 0 -792px;
}
-.elgg-icon-share {
+.elgg-icon-round-arrow-left {
background-position: 0 -810px;
}
-.elgg-icon-shop-cart:hover {
+.elgg-icon-round-arrow-right {
background-position: 0 -828px;
}
-.elgg-icon-shop-cart {
+.elgg-icon-round-checkmark {
background-position: 0 -846px;
}
-.elgg-icon-speech-bubble-alt:hover {
+.elgg-icon-round-minus {
background-position: 0 -864px;
}
-.elgg-icon-speech-bubble-alt {
+.elgg-icon-round-plus {
background-position: 0 -882px;
}
-.elgg-icon-speech-bubble:hover {
+.elgg-icon-rss {
background-position: 0 -900px;
}
-.elgg-icon-speech-bubble {
+.elgg-icon-search-focus {
background-position: 0 -918px;
}
-.elgg-icon-star-alt {
+.elgg-icon-search {
background-position: 0 -936px;
}
-.elgg-icon-star-empty:hover {
+.elgg-icon-settings-alt:hover {
background-position: 0 -954px;
}
-.elgg-icon-star-empty {
+.elgg-icon-settings-alt {
background-position: 0 -972px;
}
-.elgg-icon-star:hover {
+.elgg-icon-settings {
background-position: 0 -990px;
}
-.elgg-icon-star {
+.elgg-icon-share:hover {
background-position: 0 -1008px;
}
-.elgg-icon-tag:hover {
+.elgg-icon-share {
background-position: 0 -1026px;
}
-.elgg-icon-tag {
+.elgg-icon-shop-cart:hover {
background-position: 0 -1044px;
}
-.elgg-icon-thumbs-down-alt:hover {
+.elgg-icon-shop-cart {
background-position: 0 -1062px;
}
-.elgg-icon-thumbs-down:hover,
-.elgg-icon-thumbs-down-alt {
+.elgg-icon-speech-bubble-alt:hover {
background-position: 0 -1080px;
}
-.elgg-icon-thumbs-down {
+.elgg-icon-speech-bubble-alt {
background-position: 0 -1098px;
}
-.elgg-icon-thumbs-up-alt:hover {
+.elgg-icon-speech-bubble:hover {
background-position: 0 -1116px;
}
-.elgg-icon-thumbs-up:hover,
-.elgg-icon-thumbs-up-alt {
+.elgg-icon-speech-bubble {
background-position: 0 -1134px;
}
-.elgg-icon-thumbs-up {
+.elgg-icon-star-alt {
background-position: 0 -1152px;
}
-.elgg-icon-trash {
+.elgg-icon-star-empty:hover {
background-position: 0 -1170px;
}
-.elgg-icon-twitter {
+.elgg-icon-star-empty {
background-position: 0 -1188px;
}
-.elgg-icon-undo {
+.elgg-icon-star:hover {
background-position: 0 -1206px;
}
-.elgg-icon-user {
+.elgg-icon-star {
background-position: 0 -1224px;
}
-.elgg-icon-user:hover {
+.elgg-icon-tag:hover {
background-position: 0 -1242px;
}
-.elgg-icon-users:hover {
+.elgg-icon-tag {
background-position: 0 -1260px;
}
-.elgg-icon-users {
+.elgg-icon-thumbs-down-alt:hover {
background-position: 0 -1278px;
}
+.elgg-icon-thumbs-down:hover,
+.elgg-icon-thumbs-down-alt {
+ background-position: 0 -1296px;
+}
+.elgg-icon-thumbs-down {
+ background-position: 0 -1314px;
+}
+.elgg-icon-thumbs-up-alt:hover {
+ background-position: 0 -1332px;
+}
+.elgg-icon-thumbs-up:hover,
+.elgg-icon-thumbs-up-alt {
+ background-position: 0 -1350px;
+}
+.elgg-icon-thumbs-up {
+ background-position: 0 -1368px;
+}
+.elgg-icon-trash {
+ background-position: 0 -1386px;
+}
+.elgg-icon-twitter {
+ background-position: 0 -1404px;
+}
+.elgg-icon-undo {
+ background-position: 0 -1422px;
+}
+.elgg-icon-user:hover {
+ background-position: 0 -1440px;
+}
+.elgg-icon-user {
+ background-position: 0 -1458px;
+}
+.elgg-icon-users:hover {
+ background-position: 0 -1476px;
+}
+.elgg-icon-users {
+ background-position: 0 -1494px;
+}
+.elgg-icon-video {
+ background-position: 0 -1512px;
+}
.elgg-avatar > .elgg-icon-hover-menu {
@@ -258,6 +297,7 @@
*************************************** */
.elgg-avatar {
position: relative;
+ display: inline-block;
}
.elgg-avatar > a > img {
display: block;
diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index 64b7c47b4..bee1312ec 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -98,7 +98,7 @@
.elgg-breadcrumbs > li {
display: inline-block;
}
-.elgg-breadcrumbs > li:after{
+.elgg-breadcrumbs > li:after {
content: "\003E";
padding: 0 4px;
font-weight: normal;
@@ -178,7 +178,6 @@
text-decoration: none;
}
-
.elgg-menu-site-default {
position: absolute;
bottom: 0;
@@ -191,62 +190,68 @@
margin-right: 1px;
}
-.elgg-menu-site-default > li > a {color: white}
+.elgg-menu-site-default > li > a {
+ color: white;
+}
+
+.elgg-menu-site > li > ul {
+ display: none;
+ background-color: white;
+}
+.elgg-menu-site > li:hover > ul {
+ display: block;
+}
.elgg-menu-site-default > .elgg-state-selected > a,
.elgg-menu-site-default > li:hover > a {
background: white;
color: #555;
-
+
-webkit-box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
-moz-box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
-
+
-webkit-border-radius: 4px 4px 0 0;
-moz-border-radius: 4px 4px 0 0;
border-radius: 4px 4px 0 0;
}
.elgg-menu-site-more {
- display: none;
position: relative;
left: -1px;
width: 100%;
- z-index: 1;
min-width: 150px;
border: 1px solid #999;
border-top: 0;
-
+
-webkit-border-radius: 0 0 4px 4px;
-moz-border-radius: 0 0 4px 4px;
border-radius: 0 0 4px 4px;
-
+
-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.25);
-moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.25);
box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.25);
}
-li:hover > .elgg-menu-site-more {
- display: block;
-}
-
.elgg-menu-site-more > li > a {
- background: white;
+ background-color: white;
color: #555;
-
+
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
-
+
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
}
+
.elgg-menu-site-more > li > a:hover {
background: #4690D6;
color: white;
}
+
.elgg-menu-site-more > li:last-child > a,
.elgg-menu-site-more > li:last-child > a:hover {
-webkit-border-radius: 0 0 4px 4px;
@@ -407,7 +412,7 @@ li:hover > .elgg-menu-site-more {
.elgg-menu-footer > li,
.elgg-menu-footer > li > a {
display: inline-block;
- color:#999;
+ color: #999;
}
.elgg-menu-footer > li:after {
@@ -424,10 +429,10 @@ li:hover > .elgg-menu-site-more {
}
/* ***************************************
- ENTITY
+ ENTITY AND ANNOTATION
*************************************** */
<?php // height depends on line height/font size ?>
-.elgg-menu-entity {
+.elgg-menu-entity, elgg-menu-annotation {
float: right;
margin-left: 15px;
font-size: 90%;
@@ -435,17 +440,17 @@ li:hover > .elgg-menu-site-more {
line-height: 16px;
height: 16px;
}
-.elgg-menu-entity > li {
+.elgg-menu-entity > li, .elgg-menu-annotation > li {
margin-left: 15px;
}
-.elgg-menu-entity > li > a {
+.elgg-menu-entity > li > a, .elgg-menu-annotation > li > a {
color: #aaa;
}
<?php // need to override .elgg-menu-hz ?>
-.elgg-menu-entity > li > a {
+.elgg-menu-entity > li > a, .elgg-menu-annotation > li > a {
display: block;
}
-.elgg-menu-entity > li > span {
+.elgg-menu-entity > li > span, .elgg-menu-annotation > li > span {
vertical-align: baseline;
}
diff --git a/views/default/css/ie.php b/views/default/css/ie.php
index 6760d3886..4bddd4d55 100644
--- a/views/default/css/ie.php
+++ b/views/default/css/ie.php
@@ -1,74 +1,8 @@
/**
- * elgg_layout css for Internet Explorer > ie6
- * @uses $vars['wwwroot'] The site URL
-*/
-* {zoom: 1;} /* trigger hasLayout in IE */
+ * CSS for IE8 and above
+ */
-/* tools drop-down menu */
-#elgg-header {z-index:1;}
-.navigation li a:hover ul {display:block; position:absolute; top:21px; left:0;}
-.navigation li a:hover ul li a {display:block;}
-.navigation li.navigation-more ul li a {width:150px;background-color: #dedede;}
-
-.clearfix { display: block; }
-.hidden.clearfix { display: none; }
-#elgg-page-contents {overflow: hidden;} /* remove horizontal scroll on riverdash */
-#breadcrumbs {top:-2px; margin-bottom: 5px;}
-
-/* entity list views */
-.entity-metadata {max-width: 300px;}
-.entity-edit {float:right;}
-.access_level {float:left;}
-.elgg-image-block .entity-metadata {
- min-width:400px;
- text-align: right;
-}
-
-/* profile */
-.elgg-tabs.profile .profile_name {margin-left: -260px;}
-#profile_content .river_comment_form.hidden .input-text { width:510px; }
-
-/* notifications */
-.friends-picker-navigation {margin:0;padding:0;}
-.friends-picker-container h3 {margin:0;padding:0;line-height: 1em;}
-
-/* private messages */
-#elgg-topbar-contents a.privatemessages.new span {
- display:block;
- padding:1px;
- position:relative;
- text-align:center;
- float:left;
- top:-1px;
- right:auto;
-}
-#elgg-topbar-contents a.privatemessages.new {padding:0 0 0 20px;}
-#elgg-topbar-contents a.privatemessages:hover {background-position:left 2px;}
-#elgg-topbar-contents a.privatemessages.new:hover {background-position: left 2px;}
-
-/* riverdashboard mod rules */
-#riverdashboard_updates {clear:both;}
-#riverdashboard_updates a.update_link {margin:0 0 9px 0;}
-.riverdashboard_filtermenu {margin:10px 0 0 0;}
-.river_comment_form.hidden .input-text {
- width:530px;
- float:left;
-}
-.river_link_divider {
- width:10px;
- text-align: center;
-}
-
-/* shared access */
-.shared_access_collection h2.shared_access_name {margin-top:-15px;}
-
-/* dropdown login */
-*:first-child+html #login-dropdown #signin-button {
- line-height:10px;
-}
-*:first-child+html #login-dropdown #signin-button a.signin span {
- background-position:-150px -54px;
+/* ie8 does not like shrink wrapping this div with inline-block */
+.elgg-avatar {
+ display: block;
}
-*:first-child+html #login-dropdown #signin-button a.signin.menu-open span {
- background-position:-150px -74px;
-} \ No newline at end of file
diff --git a/views/default/css/ie6.php b/views/default/css/ie6.php
index f8ed208f6..cf49d33f2 100644
--- a/views/default/css/ie6.php
+++ b/views/default/css/ie6.php
@@ -1,15 +1,11 @@
/**
- * elgg_layout css for Internet Explorer6
- * @uses $vars['wwwroot'] The site URL
-*/
+ * CSS for IE6
+ */
* {zoom: 1;} /* trigger hasLayout in IE */
/* main nav drop-down */
#elgg-header {z-index:1;}
-.navigation li a:hover ul {display:block; position:absolute; top:21px; left:0;}
-.navigation li a:hover ul li a {display:block;}
-.navigation li.navigation-more ul li a {width:150px;background-color: #dedede;}
/* @todo check this one */
.elgg-button-delete a { background-position-y: 2px; }
diff --git a/views/default/css/ie7.php b/views/default/css/ie7.php
new file mode 100644
index 000000000..56047b954
--- /dev/null
+++ b/views/default/css/ie7.php
@@ -0,0 +1,53 @@
+/**
+ * CSS for IE7
+ */
+
+/* trigger hasLayout in IE */
+* {
+ zoom: 1;
+}
+
+/* site menu drop-down z-index fix for IE7 */
+.elgg-page-header {
+ z-index: 1;
+}
+
+/* inline-block fixes */
+.elgg-gallery > li,
+.elgg-button,
+.elgg-icon,
+.elgg-menu-hz > li,
+.elgg-menu-hz > li:after,
+.elgg-menu-hz > li > a,
+.elgg-menu-hz > li > span,
+.elgg-breadcrumbs > li,
+.elgg-menu-footer > li > a,
+.elgg-menu-footer li {
+ display: inline;
+}
+
+/* IE7 does not support :after */
+.elgg-breadcrumbs > li > a {
+ display: inline;
+ padding-right: 4px;
+ margin-right: 4px;
+ border-right: 1px solid #bababa;
+}
+.elgg-menu-footer li,
+.elgg-menu-user li {
+ padding-left: 4px;
+ padding-right: 4px;
+}
+
+/* longtext menu would not display horizontally without this */
+.elgg-menu-longtext {
+ width: 100%;
+}
+.elgg-menu-longtext li {
+ width: 100px;
+ float: right;
+}
+
+.elgg-avatar {
+ display: inline;
+} \ No newline at end of file
diff --git a/views/default/css/lightbox.php b/views/default/css/lightbox.php
new file mode 100644
index 000000000..7d5917cc3
--- /dev/null
+++ b/views/default/css/lightbox.php
@@ -0,0 +1,371 @@
+<?php
+/**
+ * Fancybox lightbox CSS.
+ *
+ * Used as a view because we need to pass a full URL to AlphaImageLoader.
+ *
+ * @package Elgg.Core
+ * @subpackage UI
+ */
+
+$jquery_path = elgg_get_site_url() . 'vendors/jquery/';
+?>
+
+/*
+ * FancyBox - jQuery Plugin
+ * Simple and fancy lightbox alternative
+ *
+ * Examples and documentation at: http://fancybox.net
+ *
+ * Copyright (c) 2008 - 2010 Janis Skarnelis
+ * That said, it is hardly a one-person project. Many people have submitted bugs, code, and offered their advice freely. Their support is greatly appreciated.
+ *
+ * Version: 1.3.4 (11/11/2010)
+ * Requires: jQuery v1.3+
+ *
+ * Dual licensed under the MIT and GPL licenses:
+ * http://www.opensource.org/licenses/mit-license.php
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+#fancybox-loading {
+ position: fixed;
+ top: 50%;
+ left: 50%;
+ width: 40px;
+ height: 40px;
+ margin-top: -20px;
+ margin-left: -20px;
+ cursor: pointer;
+ overflow: hidden;
+ z-index: 1104;
+ display: none;
+}
+
+#fancybox-loading div {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 40px;
+ height: 480px;
+ background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox.png');
+}
+
+#fancybox-overlay {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ z-index: 1100;
+ display: none;
+}
+
+#fancybox-tmp {
+ padding: 0;
+ margin: 0;
+ border: 0;
+ overflow: auto;
+ display: none;
+}
+
+#fancybox-wrap {
+ position: absolute;
+ top: 0;
+ left: 0;
+ padding: 20px;
+ z-index: 1101;
+ outline: none;
+ display: none;
+}
+
+#fancybox-outer {
+ position: relative;
+ width: 100%;
+ height: 100%;
+ background: #fff;
+}
+
+#fancybox-content {
+ width: 0;
+ height: 0;
+ padding: 0;
+ outline: none;
+ position: relative;
+ overflow: hidden;
+ z-index: 1102;
+ border: 0px solid #fff;
+}
+
+#fancybox-hide-sel-frame {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background: transparent;
+ z-index: 1101;
+}
+
+#fancybox-close {
+ position: absolute;
+ top: -15px;
+ right: -15px;
+ width: 30px;
+ height: 30px;
+ background: transparent url('<?php echo $jquery_path; ?>fancybox/fancybox.png') -40px 0px;
+ cursor: pointer;
+ z-index: 1103;
+ display: none;
+}
+
+#fancybox-error {
+ color: #444;
+ font: normal 12px/20px Arial;
+ padding: 14px;
+ margin: 0;
+}
+
+#fancybox-img {
+ width: 100%;
+ height: 100%;
+ padding: 0;
+ margin: 0;
+ border: none;
+ outline: none;
+ line-height: 0;
+ vertical-align: top;
+}
+
+#fancybox-frame {
+ width: 100%;
+ height: 100%;
+ border: none;
+ display: block;
+}
+
+#fancybox-left, #fancybox-right {
+ position: absolute;
+ bottom: 0px;
+ height: 100%;
+ width: 35%;
+ cursor: pointer;
+ outline: none;
+ background: transparent url('<?php echo $jquery_path; ?>fancybox/blank.gif');
+ z-index: 1102;
+ display: none;
+}
+
+#fancybox-left {
+ left: 0px;
+}
+
+#fancybox-right {
+ right: 0px;
+}
+
+#fancybox-left-ico, #fancybox-right-ico {
+ position: absolute;
+ top: 50%;
+ left: -9999px;
+ width: 30px;
+ height: 30px;
+ margin-top: -15px;
+ cursor: pointer;
+ z-index: 1102;
+ display: block;
+}
+
+#fancybox-left-ico {
+ background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox.png');
+ background-position: -40px -30px;
+}
+
+#fancybox-right-ico {
+ background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox.png');
+ background-position: -40px -60px;
+}
+
+#fancybox-left:hover, #fancybox-right:hover {
+ visibility: visible; /* IE6 */
+}
+
+#fancybox-left:hover span {
+ left: 20px;
+}
+
+#fancybox-right:hover span {
+ left: auto;
+ right: 20px;
+}
+
+.fancybox-bg {
+ position: absolute;
+ padding: 0;
+ margin: 0;
+ border: 0;
+ width: 20px;
+ height: 20px;
+ z-index: 1001;
+}
+
+#fancybox-bg-n {
+ top: -20px;
+ left: 0;
+ width: 100%;
+ background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox-x.png');
+}
+
+#fancybox-bg-ne {
+ top: -20px;
+ right: -20px;
+ background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox.png');
+ background-position: -40px -162px;
+}
+
+#fancybox-bg-e {
+ top: 0;
+ right: -20px;
+ height: 100%;
+ background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox-y.png');
+ background-position: -20px 0px;
+}
+
+#fancybox-bg-se {
+ bottom: -20px;
+ right: -20px;
+ background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox.png');
+ background-position: -40px -182px;
+}
+
+#fancybox-bg-s {
+ bottom: -20px;
+ left: 0;
+ width: 100%;
+ background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox-x.png');
+ background-position: 0px -20px;
+}
+
+#fancybox-bg-sw {
+ bottom: -20px;
+ left: -20px;
+ background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox.png');
+ background-position: -40px -142px;
+}
+
+#fancybox-bg-w {
+ top: 0;
+ left: -20px;
+ height: 100%;
+ background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox-y.png');
+}
+
+#fancybox-bg-nw {
+ top: -20px;
+ left: -20px;
+ background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox.png');
+ background-position: -40px -122px;
+}
+
+#fancybox-title {
+ font-family: Helvetica;
+ font-size: 12px;
+ z-index: 1102;
+}
+
+.fancybox-title-inside {
+ padding-bottom: 10px;
+ text-align: center;
+ color: #333;
+ background: #fff;
+ position: relative;
+}
+
+.fancybox-title-outside {
+ padding-top: 10px;
+ color: #fff;
+}
+
+.fancybox-title-over {
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ color: #FFF;
+ text-align: left;
+}
+
+#fancybox-title-over {
+ padding: 10px;
+ background-image: url('<?php echo $jquery_path; ?>fancybox/fancy_title_over.png');
+ display: block;
+}
+
+.fancybox-title-float {
+ position: absolute;
+ left: 0;
+ bottom: -20px;
+ height: 32px;
+}
+
+#fancybox-title-float-wrap {
+ border: none;
+ border-collapse: collapse;
+ width: auto;
+}
+
+#fancybox-title-float-wrap td {
+ border: none;
+ white-space: nowrap;
+}
+
+#fancybox-title-float-left {
+ padding: 0 0 0 15px;
+ background: url('<?php echo $jquery_path; ?>fancybox/fancybox.png') -40px -90px no-repeat;
+}
+
+#fancybox-title-float-main {
+ color: #FFF;
+ line-height: 29px;
+ font-weight: bold;
+ padding: 0 0 3px 0;
+ background: url('<?php echo $jquery_path; ?>fancybox/fancybox-x.png') 0px -40px;
+}
+
+#fancybox-title-float-right {
+ padding: 0 0 0 15px;
+ background: url('<?php echo $jquery_path; ?>fancybox/fancybox.png') -55px -90px no-repeat;
+}
+
+/* IE6 */
+
+.fancybox-ie6 #fancybox-close { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_close.png', sizingMethod='scale'); }
+
+.fancybox-ie6 #fancybox-left-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_nav_left.png', sizingMethod='scale'); }
+.fancybox-ie6 #fancybox-right-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_nav_right.png', sizingMethod='scale'); }
+
+.fancybox-ie6 #fancybox-title-over { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_title_over.png', sizingMethod='scale'); zoom: 1; }
+.fancybox-ie6 #fancybox-title-float-left { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_title_left.png', sizingMethod='scale'); }
+.fancybox-ie6 #fancybox-title-float-main { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_title_main.png', sizingMethod='scale'); }
+.fancybox-ie6 #fancybox-title-float-right { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_title_right.png', sizingMethod='scale'); }
+
+.fancybox-ie6 #fancybox-bg-w, .fancybox-ie6 #fancybox-bg-e, .fancybox-ie6 #fancybox-left, .fancybox-ie6 #fancybox-right, #fancybox-hide-sel-frame {
+ height: expression(this.parentNode.clientHeight + "px");
+}
+
+#fancybox-loading.fancybox-ie6 {
+ position: absolute; margin-top: 0;
+ top: expression( (-20 + (document.documentElement.clientHeight ? document.documentElement.clientHeight/2 : document.body.clientHeight/2 ) + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop )) + 'px');
+}
+
+#fancybox-loading.fancybox-ie6 div { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_loading.png', sizingMethod='scale'); }
+
+/* IE6, IE7, IE8 */
+.fancybox-ie .fancybox-bg { background: transparent !important; }
+
+.fancybox-ie #fancybox-bg-n { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_shadow_n.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-ne { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_shadow_ne.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-e { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_shadow_e.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-se { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_shadow_se.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-s { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_shadow_s.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-sw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_shadow_sw.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-w { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_shadow_w.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-nw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_shadow_nw.png', sizingMethod='scale'); } \ No newline at end of file
diff --git a/views/default/forms/account/settings.php b/views/default/forms/account/settings.php
index 824b2280b..3967207ce 100644
--- a/views/default/forms/account/settings.php
+++ b/views/default/forms/account/settings.php
@@ -5,4 +5,6 @@
* This form is extended by Elgg with the views in core/settings/account.
* Plugins can additionally extend it and then register for the
* 'usersettings:save', 'user' plugin hook.
+ *
+ * This view is included by "forms/usersettings/save"
*/
diff --git a/views/default/forms/admin/plugins/change_state.php b/views/default/forms/admin/plugins/change_state.php
index ba5d873e7..730c8ff32 100644
--- a/views/default/forms/admin/plugins/change_state.php
+++ b/views/default/forms/admin/plugins/change_state.php
@@ -9,6 +9,7 @@
$guids = elgg_extract('guids', $vars, array());
$guids = implode(',', $guids);
+echo '<div>';
echo elgg_view('input/hidden', array(
'name' => 'guids',
'value' => $guids,
@@ -16,5 +17,6 @@ echo elgg_view('input/hidden', array(
echo elgg_view('input/submit', array(
'value' => elgg_echo("admin:plugins:{$vars['action']}_all"),
- 'class' => 'elgg-button elgg-button-action'
+ 'class' => 'elgg-button elgg-button-action mrm'
));
+echo '</div>';
diff --git a/views/default/forms/admin/plugins/filter.php b/views/default/forms/admin/plugins/filter.php
index d00906e6a..fd1b618bc 100644
--- a/views/default/forms/admin/plugins/filter.php
+++ b/views/default/forms/admin/plugins/filter.php
@@ -7,6 +7,7 @@
* @uses $vvars['sort']
*/
+echo '<div>';
echo elgg_view('input/dropdown', array(
'name' => 'category',
'options_values' => $vars['category_options'],
@@ -22,3 +23,4 @@ echo elgg_view('input/submit', array(
'value' => elgg_echo('filter'),
'class' => 'elgg-button elgg-button-action',
));
+echo '</div>';
diff --git a/views/default/forms/admin/plugins/sort.php b/views/default/forms/admin/plugins/sort.php
index 284e085e6..7f2246bad 100644
--- a/views/default/forms/admin/plugins/sort.php
+++ b/views/default/forms/admin/plugins/sort.php
@@ -7,6 +7,7 @@
* @uses $vars['category']
*/
+echo '<div class="mtm">';
echo elgg_view('input/dropdown', array(
'name' => 'sort',
'options_values' => $vars['sort_options'],
@@ -22,3 +23,4 @@ echo elgg_view('input/submit', array(
'value' => elgg_echo('sort'),
'class' => 'elgg-button elgg-button-action'
));
+echo '</div>';
diff --git a/views/default/forms/admin/site/update_advanced.php b/views/default/forms/admin/site/update_advanced.php
index fa253967c..e12764092 100644
--- a/views/default/forms/admin/site/update_advanced.php
+++ b/views/default/forms/admin/site/update_advanced.php
@@ -17,26 +17,26 @@ foreach (array('wwwroot', 'path', 'dataroot') as $field) {
}
$form_body .= "<div>" . elgg_echo('admin:site:access:warning') . "<br />";
-$form_body .= elgg_echo('installation:sitepermissions');
+$form_body .= "<label>" . elgg_echo('installation:sitepermissions') . "</label>";
$form_body .= elgg_view('input/access', array(
'name' => 'default_access',
'value' => elgg_get_config('default_access'),
)) . "</div>";
$form_body .= "<div>" . elgg_echo('installation:allow_user_default_access:description') . "<br />";
$form_body .= elgg_view("input/checkboxes", array(
- 'options' => array(elgg_echo('installation:allow_user_default_access:label')),
+ 'options' => array(elgg_echo('installation:allow_user_default_access:label') => elgg_echo('installation:allow_user_default_access:label')),
'name' => 'allow_user_default_access',
'value' => (elgg_get_config('allow_user_default_access') ? elgg_echo('installation:allow_user_default_access:label') : ""),
)) . "</div>";
$form_body .= "<div>" . elgg_echo('installation:simplecache:description') . "<br />";
$form_body .= elgg_view("input/checkboxes", array(
- 'options' => array(elgg_echo('installation:simplecache:label')),
+ 'options' => array(elgg_echo('installation:simplecache:label') => elgg_echo('installation:simplecache:label')),
'name' => 'simplecache_enabled',
'value' => (elgg_get_config('simplecache_enabled') ? elgg_echo('installation:simplecache:label') : ""),
)) . "</div>";
$form_body .= "<div>" . elgg_echo('installation:viewpathcache:description') . "<br />";
$form_body .= elgg_view("input/checkboxes", array(
- 'options' => array(elgg_echo('installation:viewpathcache:label')),
+ 'options' => array(elgg_echo('installation:viewpathcache:label') => elgg_echo('installation:viewpathcache:label')),
'name' => 'viewpath_cache_enabled',
'value' => (elgg_get_config('viewpath_cache_enabled') ? elgg_echo('installation:viewpathcache:label') : ""),
)) . "</div>";
@@ -52,7 +52,7 @@ $form_body .= '</div>';
// control new user registration
$options = array(
- 'options' => array(elgg_echo('installation:registration:label')),
+ 'options' => array(elgg_echo('installation:registration:label') => elgg_echo('installation:registration:label')),
'name' => 'allow_registration',
'value' => elgg_get_config('allow_registration') ? elgg_echo('installation:registration:label') : '',
);
@@ -62,7 +62,7 @@ $form_body .= '<br />' .elgg_view('input/checkboxes', $options) . '</div>';
// control walled garden
$walled_garden = elgg_get_config(walled_garden);
$options = array(
- 'options' => array(elgg_echo('installation:walled_garden:label')),
+ 'options' => array(elgg_echo('installation:walled_garden:label') => elgg_echo('installation:walled_garden:label')),
'name' => 'walled_garden',
'value' => $walled_garden ? elgg_echo('installation:walled_garden:label') : '',
);
@@ -71,7 +71,7 @@ $form_body .= '<br />' . elgg_view('input/checkboxes', $options) . '</div>';
$form_body .= "<div>" . elgg_echo('installation:httpslogin') . "<br />";
$form_body .= elgg_view("input/checkboxes", array(
- 'options' => array(elgg_echo('installation:httpslogin:label')),
+ 'options' => array(elgg_echo('installation:httpslogin:label') => elgg_echo('installation:httpslogin:label')),
'name' => 'https_login',
'value' => (elgg_get_config('https_login') ? elgg_echo('installation:httpslogin:label') : "")
)) . "</div>";
@@ -83,7 +83,7 @@ if ($disable_api) {
$on = (disable_api ? "" : elgg_echo('installation:disableapi:label'));
}
$form_body .= elgg_view("input/checkboxes", array(
- 'options' => array(elgg_echo('installation:disableapi:label')),
+ 'options' => array(elgg_echo('installation:disableapi:label') => elgg_echo('installation:disableapi:label')),
'name' => 'api',
'value' => $on,
));
diff --git a/views/default/forms/avatar/crop.php b/views/default/forms/avatar/crop.php
index dc5e3d77f..1f39ff73c 100644
--- a/views/default/forms/avatar/crop.php
+++ b/views/default/forms/avatar/crop.php
@@ -5,7 +5,10 @@
* @uses $vars['entity']
*/
-$master_image = $vars['entity']->getIcon('master');
+elgg_load_js('jquery.imgareaselect');
+elgg_load_css('jquery.imgareaselect');
+
+$master_image = $vars['entity']->getIconUrl('master');
?>
<div class="clearfix">
@@ -25,8 +28,6 @@ echo elgg_view('input/submit', array('value' => elgg_echo('avatar:create')));
?>
</div>
<!-- grab the required js for icon cropping -->
-<script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery.imgareaselect-0.9.8/scripts/jquery.imgareaselect.min.js"></script>
-<link rel="stylesheet" type="text/css" href="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery.imgareaselect-0.9.8/css/imgareaselect-deprecated.css" media="screen" />
<?php //@todo JS 1.8: no ?>
<script type="text/javascript">
@@ -61,9 +62,12 @@ echo elgg_view('input/submit', array('value' => elgg_echo('avatar:create')));
$('<div id="user-avatar-preview"><img src="<?php echo $master_image; ?>" /></div>').insertAfter($('#user-avatar'));
$('<div id="user-avatar-preview-title"><label><?php echo elgg_echo('avatar:preview'); ?></label></div>').insertBefore($('#user-avatar-preview'));
- // this produces the coordinates
- $('#user-avatar').imgAreaSelect({ selectionOpacity: 0, onSelectEnd: selectChange });
- // show the preview
- $('#user-avatar').imgAreaSelect({ aspectRatio: '1:1', onSelectChange: preview });
+ // init the cropping
+ $('#user-avatar').imgAreaSelect({
+ selectionOpacity: 0,
+ aspectRatio: '1:1',
+ onSelectEnd: selectChange,
+ onSelectChange: preview
+ });
});
</script>
diff --git a/views/default/forms/login.php b/views/default/forms/login.php
index 5cfdcd4c6..91e9cda42 100644
--- a/views/default/forms/login.php
+++ b/views/default/forms/login.php
@@ -18,7 +18,7 @@
<?php echo elgg_view('login/extend'); ?>
-<div>
+<div class="elgg-foot">
<?php echo elgg_view('input/submit', array('value' => elgg_echo('login'))); ?>
<label class="right mtm">
@@ -31,15 +31,15 @@
echo elgg_view('input/hidden', array('name' => 'returntoreferer', 'value' => 'true'));
}
?>
-</div>
-<ul class="elgg-menu elgg-menu-footer">
-<?php
- if (elgg_get_config('allow_registration')) {
- echo '<li><a class="registration_link" href="' . elgg_get_site_url() . 'register">' . elgg_echo('register') . '</a></li>';
- }
-?>
- <li><a class="forgotten_password_link" href="<?php echo elgg_get_site_url(); ?>forgotpassword">
- <?php echo elgg_echo('user:password:lost'); ?>
- </a></li>
-</ul> \ No newline at end of file
+ <ul class="elgg-menu elgg-menu-footer mtm">
+ <?php
+ if (elgg_get_config('allow_registration')) {
+ echo '<li><a class="registration_link" href="' . elgg_get_site_url() . 'register">' . elgg_echo('register') . '</a></li>';
+ }
+ ?>
+ <li><a href="<?php echo elgg_get_site_url(); ?>forgotpassword">
+ <?php echo elgg_echo('user:password:lost'); ?>
+ </a></li>
+ </ul>
+</div>
diff --git a/views/default/forms/plugins/settings/save.php b/views/default/forms/plugins/settings/save.php
index c3d8f231f..dc7b2fef7 100644
--- a/views/default/forms/plugins/settings/save.php
+++ b/views/default/forms/plugins/settings/save.php
@@ -1,6 +1,6 @@
<?php
/**
- * Used to show plugin user settings.
+ * Used to show plugin settings for both users and admins.
*
* @package Elgg.Core
* @subpackage Plugins
diff --git a/views/default/forms/plugins/usersettings/save.php b/views/default/forms/plugins/usersettings/save.php
index bf243ae6b..ced88f818 100644
--- a/views/default/forms/plugins/usersettings/save.php
+++ b/views/default/forms/plugins/usersettings/save.php
@@ -1,4 +1,13 @@
<?php
+/**
+ * Plugin user settings
+ *
+ * Calls the plugin admin settings form body with type set to 'user'
+ *
+ * @package Elgg.Core
+ * @subpackage Plugins
+ */
+
$vars['type'] = 'user';
// Can't use elgg_view_form() because it overrides the $vars['action'] parameter
diff --git a/views/default/forms/profile/fields/add.php b/views/default/forms/profile/fields/add.php
index 7961037e6..c1d07d2ce 100644
--- a/views/default/forms/profile/fields/add.php
+++ b/views/default/forms/profile/fields/add.php
@@ -1,8 +1,6 @@
<?php
/**
- * Elgg profile index
- *
- * @package ElggProfile
+ * Add a new field to the set of custom profile fields
*/
$label_text = elgg_echo('profile:label');
@@ -20,9 +18,9 @@ $type_control = elgg_view('input/dropdown', array('name' => 'type', 'options_val
$submit_control = elgg_view('input/submit', array('name' => elgg_echo('add'), 'value' => elgg_echo('add')));
$formbody = <<< END
- <p>$label_text: $label_control
+ <div class="elgg-foot">$label_text: $label_control
$type_text: $type_control
- $submit_control</p>
+ $submit_control</div>
END;
echo autop(elgg_echo('profile:explainchangefields'));
diff --git a/views/default/forms/profile/fields/reset.php b/views/default/forms/profile/fields/reset.php
index 4e0f51dc6..c0bb1b7f4 100644
--- a/views/default/forms/profile/fields/reset.php
+++ b/views/default/forms/profile/fields/reset.php
@@ -3,8 +3,10 @@
* Reset profile fields form
*/
+echo '<div class="elgg-foot">';
$params = array(
'value' => elgg_echo('profile:resetdefault'),
'class' => 'elgg-button-cancel',
);
echo elgg_view('input/submit', $params);
+echo '</div>';
diff --git a/views/default/forms/register.php b/views/default/forms/register.php
index 4e0a521ab..6e18cd53d 100644
--- a/views/default/forms/register.php
+++ b/views/default/forms/register.php
@@ -70,9 +70,11 @@ echo elgg_view('register/extend');
// Add captcha hook
echo elgg_view('input/captcha');
+echo '<div class="elgg-foot">';
echo elgg_view('input/hidden', array('name' => 'friend_guid', 'value' => $vars['friend_guid']));
echo elgg_view('input/hidden', array('name' => 'invitecode', 'value' => $vars['invitecode']));
echo elgg_view('input/submit', array('name' => 'submit', 'value' => elgg_echo('register')));
+echo '</div>';
?>
<script type="text/javascript">
$(function() {
diff --git a/views/default/forms/useradd.php b/views/default/forms/useradd.php
index 66f8846e2..4f337e4e4 100644
--- a/views/default/forms/useradd.php
+++ b/views/default/forms/useradd.php
@@ -17,10 +17,6 @@ if (elgg_is_sticky_form('useradd')) {
}
}
-$admin_option = false;
-if ((elgg_get_logged_in_user_entity()->isAdmin()) && ($vars['show_admin'])) {
- $admin_option = true;
-}
?>
<div>
<label><?php echo elgg_echo('name');?></label><br />
@@ -67,18 +63,15 @@ if ((elgg_get_logged_in_user_entity()->isAdmin()) && ($vars['show_admin'])) {
));
?>
</div>
-
+<div>
<?php
-if ($admin_option) {
- echo "<div>";
echo elgg_view('input/checkboxes', array(
'name' => "admin",
'options' => array(elgg_echo('admin_option') => 1),
'value' => $admin,
));
- echo "</div>";
-}
?>
+</div>
<div class="elgg-foot">
<?php echo elgg_view('input/submit', array('value' => elgg_echo('register'))); ?>
diff --git a/views/default/forms/usersettings/save.php b/views/default/forms/usersettings/save.php
index ea53f2571..71323083f 100644
--- a/views/default/forms/usersettings/save.php
+++ b/views/default/forms/usersettings/save.php
@@ -1,5 +1,11 @@
<?php
-$form_body = elgg_view("forms/account/settings");
+/**
+ * User account settings.
+ *
+ * Plugins should extend "forms/account/settings" to add to the settings.
+ */
+
+$form_body = elgg_view("forms/account/settings", $vars);
$form_body .= '<div class="elgg-foot">';
$form_body .= elgg_view('input/submit', array('value' => elgg_echo('save')));
diff --git a/views/default/icon/default.php b/views/default/icon/default.php
index c5749ba04..3abd96b96 100644
--- a/views/default/icon/default.php
+++ b/views/default/icon/default.php
@@ -8,6 +8,7 @@
* @uses $vars['entity'] The entity the icon represents - uses getIconURL() method
* @uses $vars['size'] topbar, tiny, small, medium (default), large, master
* @uses $vars['href'] Optional override for link
+ * @uses $vars['img_class'] Optional CSS class added to img
*/
$entity = $vars['entity'];
@@ -18,6 +19,8 @@ if (!in_array($vars['size'], $sizes)) {
$vars['size'] = "medium";
}
+$class = elgg_extract('img_class', $vars, '');
+
if (isset($entity->name)) {
$title = $entity->name;
} else {
@@ -30,7 +33,7 @@ if (isset($vars['href'])) {
}
$img_src = $entity->getIconURL($vars['size']);
-$img = "<img src=\"$img_src\" alt=\"$title\" />";
+$img = "<img $class src=\"$img_src\" alt=\"$title\" />";
if ($url) {
echo elgg_view('output/url', array(
diff --git a/views/default/icon/user/default.php b/views/default/icon/user/default.php
index 6f5c6e2da..aca03521f 100644
--- a/views/default/icon/user/default.php
+++ b/views/default/icon/user/default.php
@@ -37,6 +37,10 @@ if (!$icontime) {
$js = elgg_extract('js', $vars, '');
$hover = elgg_extract('hover', $vars, true);
+if (isset($vars['override'])) {
+ elgg_deprecated_notice("Use 'hover' rather than 'override' with user avatars", 1.8, 5);
+ $hover = false;
+}
$spacer_url = elgg_get_site_url() . '_graphics/spacer.gif';
diff --git a/views/default/input/checkboxes.php b/views/default/input/checkboxes.php
index 985858b85..db4b06949 100644
--- a/views/default/input/checkboxes.php
+++ b/views/default/input/checkboxes.php
@@ -49,7 +49,6 @@ $id = '';
if (isset($vars['id'])) {
$id = "id=\"{$vars['id']}\"";
unset($vars['id']);
- unset($vars['internalid']);
}
if (is_array($vars['value'])) {
diff --git a/views/default/input/date.php b/views/default/input/date.php
index ceeb2105c..35a951a0b 100644
--- a/views/default/input/date.php
+++ b/views/default/input/date.php
@@ -44,7 +44,6 @@ if ($timestamp) {
$vars['class'] = "{$vars['class']} elgg-input-timestamp";
$vars['id'] = $vars['name'];
unset($vars['name']);
- unset($vars['internalname']);
}
// convert timestamps to text for display
diff --git a/views/default/input/dropdown.php b/views/default/input/dropdown.php
index 4673a9301..9f07874f1 100644
--- a/views/default/input/dropdown.php
+++ b/views/default/input/dropdown.php
@@ -11,7 +11,7 @@
* @uses $vars['value'] The current value, if any
* @uses $vars['options'] An array of strings representing the options for the dropdown field
* @uses $vars['options_values'] An associative array of "value" => "option"
- * where "value" is an internal name and "option" is
+ * where "value" is the name and "option" is
* the value displayed on the button. Replaces
* $vars['options'] when defined.
* @uses $vars['class'] Additional CSS class
diff --git a/views/default/input/friendspicker.php b/views/default/input/friendspicker.php
index 1a60e0d88..ecf468da3 100644
--- a/views/default/input/friendspicker.php
+++ b/views/default/input/friendspicker.php
@@ -187,7 +187,7 @@ if (!isset($vars['replacement'])) {
}
//echo "<p>" . $user->name . "</p>";
- $label = elgg_view_entity_icon($friend, 'tiny', array('override' => true));
+ $label = elgg_view_entity_icon($friend, 'tiny', array('hover' => false));
$options[$label] = $friend->getGUID();
if ($vars['highlight'] == 'all'
diff --git a/views/default/input/radio.php b/views/default/input/radio.php
index a8b278efd..ef860a773 100644
--- a/views/default/input/radio.php
+++ b/views/default/input/radio.php
@@ -32,7 +32,6 @@ $id = '';
if (isset($vars['id'])) {
$id = "id=\"{$vars['id']}\"";
unset($vars['id']);
- unset($vars['internalid']);
}
$class = "elgg-input-radios elgg-{$vars['align']}";
diff --git a/views/default/input/userpicker.php b/views/default/input/userpicker.php
index dcd65072a..b852d24fc 100644
--- a/views/default/input/userpicker.php
+++ b/views/default/input/userpicker.php
@@ -6,15 +6,15 @@
* @subpackage Core
*
* @uses $vars['value'] Array of user guids for already selected users or null
- * @uses $vars['name'] The name of the input field
*
+ * The name of the hidden fields is members[]
*
* Defaults to lazy load user lists in paginated alphabetical order. User needs
- * two type two characters before seeing the user popup list.
+ * to type two characters before seeing the user popup list.
*
* As users are checked they move down to a "users" box.
- * When this happens, a hidden input is created also.
- * {$internalnal}[] with the value the GUID.
+ * When this happens, a hidden input is created with the
+ * name of members[] and a value of the GUID.
*
* @warning: this is not stable
*/
diff --git a/views/default/js/admin.php b/views/default/js/admin.php
index 2f2f59287..253a73887 100644
--- a/views/default/js/admin.php
+++ b/views/default/js/admin.php
@@ -32,6 +32,7 @@ elgg.admin.init = function () {
});
// in-line editing for custom profile fields.
+ // @note this requires jquery.jeditable plugin
$(".elgg-state-editable").editable(elgg.admin.editProfileField, {
type: 'text',
onblur: 'submit',
diff --git a/views/default/js/elgg.php b/views/default/js/elgg.php
index 76388f80c..133e128a4 100644
--- a/views/default/js/elgg.php
+++ b/views/default/js/elgg.php
@@ -56,11 +56,13 @@ elgg.version = '<?php echo get_version(); ?>';
elgg.release = '<?php echo get_version(true); ?>';
elgg.config.wwwroot = '<?php echo elgg_get_site_url(); ?>';
elgg.security.interval = 5 * 60 * 1000; <?php //@todo make this configurable ?>
+elgg.config.domReady = false;
+elgg.config.languageReady = false;
//After the DOM is ready
$(function() {
- elgg.trigger_hook('init', 'system');
- elgg.trigger_hook('ready', 'system');
+ elgg.config.domReady = true;
+ elgg.initWhenReady();
});
<?php
diff --git a/views/default/navigation/menu/default.php b/views/default/navigation/menu/default.php
index 0dc6dd6b3..0fa391433 100644
--- a/views/default/navigation/menu/default.php
+++ b/views/default/navigation/menu/default.php
@@ -9,7 +9,7 @@
*/
// we want css classes to use dashes
-$vars['name'] = str_replace('_', '-', $vars['name']);
+$vars['name'] = preg_replace('/[^a-z0-9\-]/i', '-', $vars['name']);
$headers = elgg_extract('show_section_headers', $vars, false);
$class = "elgg-menu elgg-menu-{$vars['name']}";
diff --git a/views/default/navigation/menu/site.php b/views/default/navigation/menu/site.php
index 1409f54af..38b42bda9 100644
--- a/views/default/navigation/menu/site.php
+++ b/views/default/navigation/menu/site.php
@@ -11,11 +11,11 @@ foreach ($vars['menu']['default'] as $menu_item) {
echo elgg_view('navigation/menu/elements/item', array('item' => $menu_item));
}
-if (isset($vars['menu']['more'])) {
+if (isset($vars['menu']['more']) && !empty($vars['menu']['more'])) {
echo '<li class="elgg-more">';
$more = elgg_echo('more');
- echo "<a title=\"$more\">$more</a>";
+ echo "<a href=\"#\">$more</a>";
echo elgg_view('navigation/menu/elements/section', array(
'class' => 'elgg-menu elgg-menu-site elgg-menu-site-more',
diff --git a/views/default/object/plugin/advanced.php b/views/default/object/plugin/advanced.php
index 08da89c01..1fabaff04 100644
--- a/views/default/object/plugin/advanced.php
+++ b/views/default/object/plugin/advanced.php
@@ -197,7 +197,7 @@ if ($files) {
<?php echo $links; ?>
</ul>
<?php endif; ?>
- <div class="clearfloat right mtm">
+ <div class="clearfloat float-alt mtm">
<?php echo $action_button; ?>
</div>
</div>
@@ -207,7 +207,7 @@ $settings_view_old = 'settings/' . $plugin->getID() . '/edit';
$settings_view_new = 'plugins/' . $plugin->getID() . '/settings';
if (elgg_view_exists($settings_view_old) || elgg_view_exists($settings_view_new)) {
$link = elgg_get_site_url() . "admin/plugin_settings/" . $plugin->getID();
- $settings_link = "<a class='plugin_settings small link' href='$link'>[" . elgg_echo('settings') . "]</a>";
+ $settings_link = "<a class='elgg-plugin-settings' href='$link'>[" . elgg_echo('settings') . "]</a>";
}
?>
<div class="elgg-head">
@@ -233,8 +233,8 @@ if (elgg_view_exists($settings_view_old) || elgg_view_exists($settings_view_new)
}
?>
- <div class="plugin_description"><?php echo $description; ?></div>
- <p class="plugin_author"><?php echo $author . ' - ' . $website; ?></p>
+ <div><?php echo $description; ?></div>
+ <p><?php echo $author . ' - ' . $website; ?></p>
<?php echo $docs; ?>
<div class="pts">
@@ -248,7 +248,7 @@ if (elgg_view_exists($settings_view_old) || elgg_view_exists($settings_view_new)
</div>
</div>
</div>
- <div class="hidden manifest_file" id="elgg-plugin-manifest-<?php echo $plugin->getID(); ?>">
+ <div class="elgg-plugin-more hidden" id="elgg-plugin-manifest-<?php echo $plugin->getID(); ?>">
<?php
if ($screenshots_html) {
diff --git a/views/default/object/plugin/elements/dependencies.php b/views/default/object/plugin/elements/dependencies.php
index 5f4aa4392..8abd61692 100644
--- a/views/default/object/plugin/elements/dependencies.php
+++ b/views/default/object/plugin/elements/dependencies.php
@@ -13,7 +13,7 @@ $deps = $plugin->getPackage()->checkDependencies(true);
$columns = array('type', 'name', 'expected_value', 'local_value', 'comment');
-echo '<table class="elgg-plugins-dependencies styled"><tr>';
+echo '<table class="elgg-plugin-dependencies styled"><tr>';
foreach ($columns as $column) {
$column = elgg_echo("admin:plugins:dependencies:$column");
diff --git a/views/default/object/plugin/invalid.php b/views/default/object/plugin/invalid.php
index f29ee8d12..bb518cd53 100644
--- a/views/default/object/plugin/invalid.php
+++ b/views/default/object/plugin/invalid.php
@@ -34,7 +34,7 @@ $error = $plugin->getError();
?>
</div>
- <div class="hidden manifest_file" id="elgg-plugin-manifest-<?php echo $plugin->getID(); ?>">
+ <div class="hidden elgg-plugin-more" id="elgg-plugin-manifest-<?php echo $plugin->getID(); ?>">
<p><?php echo elgg_echo('admin:plugins:label:location') . ": " . $path; ?></p>
<p><?php echo $error; ?></p>
</div>
diff --git a/views/default/object/plugin/simple.php b/views/default/object/plugin/simple.php
index 5f5b08f10..f4cc944f4 100644
--- a/views/default/object/plugin/simple.php
+++ b/views/default/object/plugin/simple.php
@@ -57,7 +57,7 @@ foreach ($files as $file => $path) {
if (elgg_view_exists("settings/$plugin_id/edit")) {
$settings_href = elgg_get_site_url() . "admin/plugin_settings/$plugin_id";
- $plugin_footer .= "<li><a class='plugin_settings link' href='$settings_href'>" . elgg_echo('settings') . "</a></li>";
+ $plugin_footer .= "<li><a class='elgg-plugin-settings' href='$settings_href'>" . elgg_echo('settings') . "</a></li>";
}
$plugin_footer .= "</ul>";
diff --git a/views/default/output/confirmlink.php b/views/default/output/confirmlink.php
index 5059a656e..953c15f1b 100644
--- a/views/default/output/confirmlink.php
+++ b/views/default/output/confirmlink.php
@@ -6,16 +6,16 @@
* @package Elgg
* @subpackage Core
*
- * @uses $vars['text'] The text of the link
- * @uses $vars['href'] The address
- * @uses $vars['title'] The title text (defaults to confirm text)
- * @uses $vars['confirm'] The dialog text
- * @uses $vars['text_encode'] Encode special characters? (false)
+ * @uses $vars['text'] The text of the link
+ * @uses $vars['href'] The address
+ * @uses $vars['title'] The title text (defaults to confirm text)
+ * @uses $vars['confirm'] The dialog text
+ * @uses $vars['encode_text'] Run $vars['text'] through htmlspecialchars() (false)
*/
$vars['rel'] = elgg_extract('confirm', $vars, elgg_echo('question:areyousure'));
$vars['rel'] = addslashes($vars['rel']);
-$encode = elgg_extract('text_encode', $vars, false);
+$encode = elgg_extract('encode_text', $vars, false);
// always generate missing action tokens
$vars['href'] = elgg_add_action_tokens_to_url(elgg_normalize_url($vars['href']), true);
@@ -25,8 +25,8 @@ if ($encode) {
$text = htmlspecialchars($text, ENT_QUOTES, 'UTF-8', false);
}
-if (!isset($vars['title'])) {
- $vars['title'] = addslashes($confirm);
+if (!isset($vars['title']) && isset($vars['confirm'])) {
+ $vars['title'] = $vars['rel'];
}
if (isset($vars['class'])) {
diff --git a/views/default/page/admin.php b/views/default/page/admin.php
index 2b2ec9e4a..cd03541d5 100644
--- a/views/default/page/admin.php
+++ b/views/default/page/admin.php
@@ -22,7 +22,7 @@ if ($notices) {
$notices_html .= elgg_view_entity($notice);
}
- $notices_html = "<div class=\"admin_notices\">$notices_html</div>";
+ $notices_html = "<div class=\"elgg-admin-notices\">$notices_html</div>";
}
?>
diff --git a/views/default/page/elements/head.php b/views/default/page/elements/head.php
index 048edec40..e968e95ce 100644
--- a/views/default/page/elements/head.php
+++ b/views/default/page/elements/head.php
@@ -40,7 +40,7 @@ $release = get_version(true);
<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 elgg_get_site_url(); ?>_graphics/favicon.ico" />
+ <?php echo elgg_view('page/elements/shortcut_icon', $vars); ?>
<?php foreach ($css as $link) { ?>
<link rel="stylesheet" href="<?php echo $link; ?>" type="text/css" />
@@ -48,11 +48,15 @@ $release = get_version(true);
<?php
$ie_url = elgg_get_simplecache_url('css', 'ie');
+ $ie7_url = elgg_get_simplecache_url('css', 'ie7');
$ie6_url = elgg_get_simplecache_url('css', 'ie6');
?>
- <!--[if gt IE 6]>
+ <!--[if gt IE 7]>
<link rel="stylesheet" type="text/css" href="<?php echo $ie_url; ?>" />
<![endif]-->
+ <!--[if IE 7]>
+ <link rel="stylesheet" type="text/css" href="<?php echo $ie7_url; ?>" />
+ <![endif]-->
<!--[if IE 6]>
<link rel="stylesheet" type="text/css" href="<?php echo $ie6_url; ?>" />
<![endif]-->
diff --git a/views/default/page/elements/shortcut_icon.php b/views/default/page/elements/shortcut_icon.php
new file mode 100644
index 000000000..12fe9c1f8
--- /dev/null
+++ b/views/default/page/elements/shortcut_icon.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * Displays the default shortcut icon
+ */
+?>
+<link rel="SHORTCUT ICON" href="<?php echo elgg_get_site_url(); ?>_graphics/favicon.ico" /> \ No newline at end of file
diff --git a/views/default/river/user/default/profileupdate.php b/views/default/river/user/default/profileupdate.php
new file mode 100644
index 000000000..a344131d6
--- /dev/null
+++ b/views/default/river/user/default/profileupdate.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Update profile river view
+ */
+
+$subject = $vars['item']->getSubjectEntity();
+
+$subject_link = elgg_view('output/url', array(
+ 'href' => $subject->getURL(),
+ 'text' => $subject->name,
+ 'class' => 'elgg-river-subject',
+));
+
+$string = elgg_echo('river:update:user:profile', array($subject_link));
+
+echo elgg_view('river/item', array(
+ 'item' => $vars['item'],
+ 'summary' => $string,
+));
diff --git a/views/installation/page/default.php b/views/installation/page/default.php
index a41a5b688..10499ed27 100644
--- a/views/installation/page/default.php
+++ b/views/installation/page/default.php
@@ -29,7 +29,7 @@ header('Expires: Fri, 05 Feb 1982 00:00:00 -0500', TRUE);
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="SHORTCUT ICON" href="<?php echo elgg_get_site_url(); ?>_graphics/favicon.ico" />
<link rel="stylesheet" href="<?php echo elgg_get_site_url(); ?>install/css/install.css" type="text/css" />
- <script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery-1.5.min.js"></script>
+ <script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery-1.6.2.min.js"></script>
<script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>install/js/install.js"></script>
</head>
<body>