From a1abec1d617c9330d9c06bda2f462d213f013f53 Mon Sep 17 00:00:00 2001
From: brettp
Date: Fri, 16 Oct 2009 20:54:48 +0000
Subject: Finish up standardizing views/default/*
git-svn-id: http://code.elgg.org/elgg/trunk@3557 36083f99-b078-4883-b0ff-0f9b5a30f544
---
views/default/css.php | 350 ++++++++++-----------
views/default/settings/install.php | 31 +-
views/default/settings/system.php | 128 ++++----
views/default/settings/upgrading.php | 7 +-
views/default/site/default.php | 35 +--
views/default/spotlight/default.php | 31 +-
views/default/text/about.php | 23 +-
views/default/text/privacy_view.php | 22 +-
views/default/text/tos_view.php | 21 +-
views/default/upload/upload_form_content.php | 54 ++--
views/default/user/default.php | 37 +--
views/default/user/search/finishblurb.php | 18 +-
views/default/user/search/startblurb.php | 17 +-
views/default/user/settings/default_access.php | 52 +--
views/default/user/settings/email.php | 41 ++-
views/default/user/settings/language.php | 60 ++--
views/default/user/settings/name.php | 11 +-
views/default/user/settings/password.php | 45 ++-
views/default/usersettings/form.php | 13 +-
views/default/usersettings/main.php | 23 +-
views/default/usersettings/main_opt/plugins.php | 20 +-
views/default/usersettings/main_opt/statistics.php | 16 +-
views/default/usersettings/main_opt/user.php | 16 +-
views/default/usersettings/plugins.php | 52 ++-
views/default/usersettings/plugins_opt/plugin.php | 49 +--
views/default/usersettings/statistics.php | 16 +-
.../usersettings/statistics_opt/numentities.php | 86 +++--
.../default/usersettings/statistics_opt/online.php | 35 ++-
views/default/usersettings/user.php | 7 +-
views/default/welcome.php | 31 +-
views/default/welcome/logged_in.php | 40 +--
views/default/welcome/logged_out.php | 32 +-
views/default/widgets/editwrapper.php | 46 ++-
views/default/widgets/wrapper.php | 141 ++++-----
34 files changed, 786 insertions(+), 820 deletions(-)
diff --git a/views/default/css.php b/views/default/css.php
index 89cdaf68c..feca46216 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -1,18 +1,16 @@
/* ***************************************
@@ -63,11 +61,11 @@ q:before, q:after {
blockquote, q {
quotes: "" "";
}
-.clearfloat {
+.clearfloat {
clear:both;
- height:0;
- font-size: 1px;
- line-height: 0px;
+ height:0;
+ font-size: 1px;
+ line-height: 0px;
}
/* ***************************************
@@ -95,7 +93,7 @@ a {
outline: none;
}
a:visited {
-
+
}
a:hover {
color: #0054a7;
@@ -153,14 +151,14 @@ pre, code {
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;
@@ -176,7 +174,7 @@ blockquote {
line-height:1.3em;
background:#EBF5FF;
border:none !important;
- -webkit-border-radius: 5px;
+ -webkit-border-radius: 5px;
-moz-border-radius: 5px;
}
blockquote p {
@@ -184,7 +182,7 @@ blockquote p {
}
/* ***************************************
- PAGE LAYOUT - MAIN STRUCTURE
+ PAGE LAYOUT - MAIN STRUCTURE
*************************************** */
#page_container {
margin:0;
@@ -215,7 +213,7 @@ blockquote p {
margin:0 0 20px 0;
padding:20px;
min-height: 360px;
- -webkit-border-radius: 8px;
+ -webkit-border-radius: 8px;
-moz-border-radius: 8px;
background: white;
border-bottom:1px solid #cccccc;
@@ -230,7 +228,7 @@ blockquote p {
min-height: 360px;
background: #dedede;
padding:0 0 10px 0;
- -webkit-border-radius: 8px;
+ -webkit-border-radius: 8px;
-moz-border-radius: 8px;
}
@@ -242,7 +240,7 @@ blockquote p {
float:left;
background: #dedede;
padding:0px;
- -webkit-border-radius: 8px;
+ -webkit-border-radius: 8px;
-moz-border-radius: 8px;
border-bottom:1px solid #cccccc;
border-right:1px solid #cccccc;
@@ -255,7 +253,7 @@ blockquote p {
float:left;
background: #dedede;
padding:0 0 5px 0;
- -webkit-border-radius: 8px;
+ -webkit-border-radius: 8px;
-moz-border-radius: 8px;
}
@@ -267,7 +265,7 @@ blockquote p {
padding:0 0 5px 0;
width:718px;
background: #dedede;
- -webkit-border-radius: 8px;
+ -webkit-border-radius: 8px;
-moz-border-radius: 8px;
float:left;
}
@@ -282,7 +280,7 @@ blockquote p {
margin:0px 0 22px 0;
background: #dedede;
padding:4px 10px 10px 10px;
- -webkit-border-radius: 8px;
+ -webkit-border-radius: 8px;
-moz-border-radius: 8px;
border-bottom:1px solid #cccccc;
border-right:1px solid #cccccc;
@@ -296,10 +294,10 @@ blockquote p {
.contentWrapper {
background:white;
- -webkit-border-radius: 8px;
+ -webkit-border-radius: 8px;
-moz-border-radius: 8px;
- padding:10px;
- margin:0 10px 10px 10px;
+ padding:10px;
+ margin:0 10px 10px 10px;
}
span.contentIntro p {
margin:0 0 0 0;
@@ -350,7 +348,7 @@ span.contentIntro p {
#layout_spotlight {
margin:20px 0 20px 0;
padding:0;
- -webkit-border-radius: 8px;
+ -webkit-border-radius: 8px;
-moz-border-radius: 8px;
background: white;
border-bottom:1px solid #cccccc;
@@ -407,16 +405,16 @@ span.contentIntro p {
#layout_footer {
background: #b6b6b6;
height:80px;
- -webkit-border-radius: 8px;
+ -webkit-border-radius: 8px;
-moz-border-radius: 8px;
margin:0 0 20px 0;
}
#layout_footer table {
- margin:0 0 0 20px;
+margin:0 0 0 20px;
}
#layout_footer a, #layout_footer p {
- color:#333333;
- margin:0;
+color:#333333;
+margin:0;
}
#layout_footer .footer_toolbar_links {
text-align:right;
@@ -429,7 +427,7 @@ span.contentIntro p {
/* ***************************************
- HORIZONTAL ELGG TOPBAR
+HORIZONTAL ELGG TOPBAR
*************************************** */
#elgg_topbar {
background:#333333 url(_graphics/toptoolbar_background.gif) repeat-x top left;
@@ -512,9 +510,9 @@ span.contentIntro p {
color:white;
}
/* IE6 */
-* html #elgg_topbar_container_left a.privatemessages_new { background-position: left -18px; }
+* 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; }
+*+html #elgg_topbar_container_left a.privatemessages_new { background-position: left -18px; }
#elgg_topbar_container_left a.privatemessages_new:hover {
text-decoration: none;
@@ -547,7 +545,7 @@ span.contentIntro p {
height:20px;
}
/* IE6 fix */
-* html #elgg_topbar_container_right a {
+* html #elgg_topbar_container_right a {
width: 120px;
}
#elgg_topbar_container_right a:hover {
@@ -563,7 +561,7 @@ span.contentIntro p {
position:relative;
}
#searchform input.search_input {
- -webkit-border-radius: 4px;
+ -webkit-border-radius: 4px;
-moz-border-radius: 4px;
background-color:#FFFFFF;
border:1px solid #BBBBBB;
@@ -576,7 +574,7 @@ span.contentIntro p {
height:12px;
}
#searchform input.search_submit_button {
- -webkit-border-radius: 4px;
+ -webkit-border-radius: 4px;
-moz-border-radius: 4px;
color:#333333;
background: #cccccc;
@@ -611,7 +609,7 @@ ul.topbardropdownmenu, ul.topbardropdownmenu ul {
ul.topbardropdownmenu {
margin:0pt 20px 0pt 5px;
}
-ul.topbardropdownmenu li {
+ul.topbardropdownmenu li {
display: block;
list-style: none;
margin: 0;
@@ -636,10 +634,10 @@ ul.topbardropdownmenu ul {
/* IE6/7 fix */
ul.topbardropdownmenu ul a {
zoom: 1;
-}
+}
ul.topbardropdownmenu ul li {
float: none;
-}
+}
/* elgg toolbar menu style */
ul.topbardropdownmenu ul {
width: 150px;
@@ -687,33 +685,33 @@ ul.topbardropdownmenu ul a {
/* ***************************************
- SYSTEM MESSSAGES
+SYSTEM MESSSAGES
*************************************** */
.messages {
- background:#ccffcc;
- color:#000000;
- padding:3px 10px 3px 10px;
- z-index: 8000;
+ background:#ccffcc;
+ color:#000000;
+ padding:3px 10px 3px 10px;
+ z-index: 8000;
margin:0;
position:fixed;
top:30px;
width:969px;
- -webkit-border-radius: 4px;
+ -webkit-border-radius: 4px;
-moz-border-radius: 4px;
border:4px solid #00CC00;
cursor: pointer;
}
.messages_error {
- border:4px solid #D3322A;
- background:#F7DAD8;
- color:#000000;
- padding:3px 10px 3px 10px;
- z-index: 8000;
+ border:4px solid #D3322A;
+ background:#F7DAD8;
+ color:#000000;
+ padding:3px 10px 3px 10px;
+ z-index: 8000;
margin:0;
position:fixed;
top:30px;
width:969px;
- -webkit-border-radius: 4px;
+ -webkit-border-radius: 4px;
-moz-border-radius: 4px;
cursor: pointer;
}
@@ -733,7 +731,7 @@ ul.topbardropdownmenu ul a {
/* ***************************************
- COLLAPSABLE BOXES
+COLLAPSABLE BOXES
*************************************** */
.collapsable_box {
margin: 0 0 20px 0;
@@ -741,7 +739,7 @@ ul.topbardropdownmenu ul a {
}
/* IE6 fix */
-* html .collapsable_box {
+* html .collapsable_box {
height:10px;
}
.collapsable_box_header {
@@ -752,7 +750,7 @@ ul.topbardropdownmenu ul a {
border-right: 1px solid #cccccc;
border-bottom: 1px solid #cccccc;
-moz-border-radius-topleft:8px;
- -moz-border-radius-topright:8px;
+ -moz-border-radius-topright:8px;
-webkit-border-top-right-radius:8px;
-webkit-border-top-left-radius:8px;
background:#dedede;
@@ -837,7 +835,7 @@ input {
padding: 5px;
border: 1px solid #cccccc;
color:#666666;
- -webkit-border-radius: 5px;
+ -webkit-border-radius: 5px;
-moz-border-radius: 5px;
}
textarea {
@@ -845,7 +843,7 @@ textarea {
border: solid 1px #cccccc;
padding: 5px;
color:#666666;
- -webkit-border-radius: 5px;
+ -webkit-border-radius: 5px;
-moz-border-radius: 5px;
}
textarea:focus, input[type="text"]:focus {
@@ -859,7 +857,7 @@ textarea:focus, input[type="text"]:focus {
color: #ffffff;
background:#4690d6;
border: 1px solid #4690d6;
- -webkit-border-radius: 4px;
+ -webkit-border-radius: 4px;
-moz-border-radius: 4px;
width: auto;
height: 25px;
@@ -878,7 +876,7 @@ input[type="submit"] {
color: #ffffff;
background:#4690d6;
border: 1px solid #4690d6;
- -webkit-border-radius: 4px;
+ -webkit-border-radius: 4px;
-moz-border-radius: 4px;
width: auto;
height: 25px;
@@ -892,7 +890,7 @@ input[type="submit"] {
color: #999999;
background:#dddddd;
border: 1px solid #999999;
- -webkit-border-radius: 4px;
+ -webkit-border-radius: 4px;
-moz-border-radius: 4px;
width: auto;
height: 25px;
@@ -923,16 +921,16 @@ input[type="submit"] {
margin:0 0 10px 0;
padding:0 0 10px 0;
background: #dedede;
- -webkit-border-radius: 8px;
+ -webkit-border-radius: 8px;
-moz-border-radius: 8px;
width:240px;
- text-align:left;
+ text-align:left;
}
#login-box form {
margin:0 10px 0 10px;
padding:0 10px 4px 10px;
background: white;
- -webkit-border-radius: 8px;
+ -webkit-border-radius: 8px;
-moz-border-radius: 8px;
width:200px;
}
@@ -975,12 +973,12 @@ input[type="submit"] {
margin:0pt 0pt 5px;
}
#register-box {
- text-align:left;
- width:400px;
- padding:10px;
- background: #dedede;
- margin:0;
- -webkit-border-radius: 8px;
+ text-align:left;
+ width:400px;
+ padding:10px;
+ background: #dedede;
+ margin:0;
+ -webkit-border-radius: 8px;
-moz-border-radius: 8px;
}
#persistent_login label {
@@ -1015,7 +1013,7 @@ input[type="submit"] {
border-bottom:1px solid #cccccc;
border-right:1px solid #cccccc;
background: #e9e9e9;
- -webkit-border-radius: 8px;
+ -webkit-border-radius: 8px;
-moz-border-radius: 8px;
}
#profile_info_column_left {
@@ -1032,7 +1030,7 @@ input[type="submit"] {
width:578px;
margin:0 0 0 0;
background:#dedede;
- -webkit-border-radius: 4px;
+ -webkit-border-radius: 4px;
-moz-border-radius: 4px;
padding:4px;
}
@@ -1042,7 +1040,7 @@ input[type="submit"] {
border-bottom:1px solid #cccccc;
border-right:1px solid #cccccc;
background: #bbdaf7;
- -webkit-border-radius: 8px;
+ -webkit-border-radius: 8px;
-moz-border-radius: 8px;
}
#profile_menu_wrapper {
@@ -1064,8 +1062,8 @@ input[type="submit"] {
background:#4690d6;
text-decoration:none;
}
-p.user_menu_friends, p.user_menu_profile,
-p.user_menu_removefriend,
+p.user_menu_friends, p.user_menu_profile,
+p.user_menu_removefriend,
p.user_menu_friends_of {
margin:0;
}
@@ -1084,7 +1082,7 @@ p.user_menu_friends_of {
}
#profile_info_column_middle .profile_status {
background:#bbdaf7;
- -webkit-border-radius: 4px;
+ -webkit-border-radius: 4px;
-moz-border-radius: 4px;
padding:2px 4px 2px 4px;
line-height:1.2em;
@@ -1092,19 +1090,19 @@ p.user_menu_friends_of {
#profile_info_column_middle .profile_status span {
display:block;
font-size:90%;
- color:#666666;
+ color:#666666;
}
#profile_info_column_middle a.status_update {
- float:right;
+ float:right;
}
#profile_info_column_middle .odd {
background:#dedede;
- -webkit-border-radius: 4px;
+ -webkit-border-radius: 4px;
-moz-border-radius: 4px;
}
#profile_info_column_middle .even {
background:#dedede;
- -webkit-border-radius: 4px;
+ -webkit-border-radius: 4px;
-moz-border-radius: 4px;
}
#profile_info_column_right p {
@@ -1126,7 +1124,7 @@ p.user_menu_friends_of {
font-weight: bold;
color: #ffffff;
background:#4690d6;
- -webkit-border-radius: 4px;
+ -webkit-border-radius: 4px;
-moz-border-radius: 4px;
width: auto;
padding: 2px 6px 2px 6px;
@@ -1146,7 +1144,7 @@ p.user_menu_friends_of {
#river,
.river_item_list {
border-top:1px solid #dddddd;
-
+
overflow:hidden;
}
.river_item p {
@@ -1168,7 +1166,7 @@ p.user_menu_friends_of {
margin:0 5px 0 0;
}
/* IE6 fix */
-* html .river_item p {
+* html .river_item p {
padding:3px 0 3px 20px;
}
/* IE7 */
@@ -1215,7 +1213,7 @@ p.user_menu_friends_of {
background: url(_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px;
}
.river_object_widget_update {
- background: url(_graphics/river_icons/river_icon_plugin.gif) no-repeat left -1px;
+ background: url(_graphics/river_icons/river_icon_plugin.gif) no-repeat left -1px;
}
.river_object_blog_create {
background: url(_graphics/river_icons/river_icon_blog.gif) no-repeat left -1px;
@@ -1251,10 +1249,10 @@ p.user_menu_friends_of {
background: url(_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px;
}
.river_object_sitemessage_create {
- background: url(_graphics/river_icons/river_icon_blog.gif) no-repeat left -1px;
+ background: url(_graphics/river_icons/river_icon_blog.gif) no-repeat left -1px;
}
.river_user_messageboard {
- background: url(_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px;
+ background: url(_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px;
}
.river_object_page_create {
background: url(_graphics/river_icons/river_icon_pages.gif) no-repeat left -1px;
@@ -1276,11 +1274,11 @@ p.user_menu_friends_of {
}
/* ***************************************
- SEARCH LISTINGS
+ SEARCH LISTINGS
*************************************** */
.search_listing {
display: block;
- -webkit-border-radius: 8px;
+ -webkit-border-radius: 8px;
-moz-border-radius: 8px;
background:white;
margin:0 10px 5px 10px;
@@ -1322,7 +1320,7 @@ table.search_gallery {
}
.search_gallery_item {
background: white;
- -webkit-border-radius: 8px;
+ -webkit-border-radius: 8px;
-moz-border-radius: 8px;
width:170px;
}
@@ -1374,7 +1372,7 @@ table.search_gallery {
width:275px;
margin:0 10px 0 10px;
padding:8px 0 4px 8px;
- -webkit-border-radius: 8px;
+ -webkit-border-radius: 8px;
-moz-border-radius: 8px;
background:white;
}
@@ -1390,7 +1388,7 @@ table.search_gallery {
.plugin_details {
margin:0 10px 5px 10px;
padding:0 7px 4px 10px;
- -webkit-border-radius: 5px;
+ -webkit-border-radius: 5px;
-moz-border-radius: 5px;
}
.admin_plugin_reorder {
@@ -1409,11 +1407,11 @@ table.search_gallery {
}
.active {
border:1px solid #999999;
- background:white;
+ background:white;
}
.not-active {
- border:1px solid #999999;
- background:#dedede;
+ border:1px solid #999999;
+ background:#dedede;
}
.plugin_details p {
margin:0;
@@ -1425,7 +1423,7 @@ table.search_gallery {
}
.manifest_file {
background:#dedede;
- -webkit-border-radius: 8px;
+ -webkit-border-radius: 8px;
-moz-border-radius: 8px;
padding:5px 10px 5px 10px;
margin:4px 0 4px 0;
@@ -1444,39 +1442,39 @@ table.search_gallery {
.contentIntro .enableallplugins {
margin-left:10px;
}
-.contentIntro .enableallplugins,
+.contentIntro .enableallplugins,
.not-active .admin_plugin_enable_disable a {
font: 12px/100% Arial, Helvetica, sans-serif;
font-weight: bold;
color: #ffffff;
background:#4690d6;
border: 1px solid #4690d6;
- -webkit-border-radius: 4px;
+ -webkit-border-radius: 4px;
-moz-border-radius: 4px;
width: auto;
padding: 4px;
cursor: pointer;
}
-.contentIntro .enableallplugins:hover,
+.contentIntro .enableallplugins:hover,
.not-active .admin_plugin_enable_disable a:hover {
background: #0054a7;
border: 1px solid #0054a7;
text-decoration: none;
}
-.contentIntro .disableallplugins,
+.contentIntro .disableallplugins,
.active .admin_plugin_enable_disable a {
font: 12px/100% Arial, Helvetica, sans-serif;
font-weight: bold;
color: #ffffff;
background:#999999;
border: 1px solid #999999;
- -webkit-border-radius: 4px;
+ -webkit-border-radius: 4px;
-moz-border-radius: 4px;
width: auto;
padding: 4px;
cursor: pointer;
}
-.contentIntro .disableallplugins:hover,
+.contentIntro .disableallplugins:hover,
.active .admin_plugin_enable_disable a:hover {
background: #333333;
border: 1px solid #333333;
@@ -1485,7 +1483,7 @@ table.search_gallery {
.pluginsettings {
margin:15px 0 5px 0;
background:#bbdaf7;
- -webkit-border-radius: 8px;
+ -webkit-border-radius: 8px;
-moz-border-radius: 8px;
padding:10px;
display:none;
@@ -1513,10 +1511,10 @@ table.search_gallery {
}
.generic_comment {
background:white;
- -webkit-border-radius: 8px;
+ -webkit-border-radius: 8px;
-moz-border-radius: 8px;
- padding:10px;
- margin:0 10px 10px 10px;
+ padding:10px;
+ margin:0 10px 10px 10px;
}
.generic_comment_icon {
float:left;
@@ -1536,9 +1534,9 @@ table.search_gallery {
/* IE6 */
* html #generic_comment_tbl { width:676px !important;}
-
+
/* ***************************************
- PAGE-OWNER BLOCK
+PAGE-OWNER BLOCK
*************************************** */
#owner_block {
padding:10px;
@@ -1635,7 +1633,7 @@ table.search_gallery {
padding:4px 6px 4px 10px;
font-weight: bold;
line-height: 1.1em;
- -webkit-border-radius: 10px;
+ -webkit-border-radius: 10px;
-moz-border-radius: 10px;
}
#owner_block_submenu ul li a:hover {
@@ -1677,7 +1675,7 @@ table.search_gallery {
PAGINATION
*************************************** */
.pagination {
- -webkit-border-radius: 8px;
+ -webkit-border-radius: 8px;
-moz-border-radius: 8px;
background:white;
margin:5px 10px 5px 10px;
@@ -1695,7 +1693,7 @@ table.search_gallery {
margin:0 6px 0 0;
padding:0px 4px;
cursor: pointer;
- -webkit-border-radius: 4px;
+ -webkit-border-radius: 4px;
-moz-border-radius: 4px;
}
.pagination .pagination_number:hover {
@@ -1714,7 +1712,7 @@ table.search_gallery {
font-weight: normal;
margin:0 6px 0 0;
padding:0px 4px;
- -webkit-border-radius: 4px;
+ -webkit-border-radius: 4px;
-moz-border-radius: 4px;
}
.pagination .pagination_previous,
@@ -1729,7 +1727,7 @@ table.search_gallery {
margin:0 6px 0 0;
padding:0px 4px;
cursor: pointer;
- -webkit-border-radius: 4px;
+ -webkit-border-radius: 4px;
-moz-border-radius: 4px;
}
.pagination .pagination_previous:hover,
@@ -1750,14 +1748,14 @@ table.search_gallery {
margin:0 6px 0 0;
padding:0px 4px;
cursor: pointer;
- -webkit-border-radius: 4px;
+ -webkit-border-radius: 4px;
-moz-border-radius: 4px;
}
-
+
/* ***************************************
FRIENDS COLLECTIONS ACCORDIAN
-*************************************** */
+*************************************** */
ul#friends_collections_accordian {
margin: 0 0 0 0;
padding: 0;
@@ -1775,7 +1773,7 @@ ul#friends_collections_accordian {
margin:10px 0 10px 0;
font-size:1.2em;
cursor:pointer;
- -webkit-border-radius: 8px;
+ -webkit-border-radius: 8px;
-moz-border-radius: 8px;
}
#friends_collections_accordian li h2:hover {
@@ -1795,11 +1793,11 @@ ul#friends_collections_accordian {
color:#999999;
font-weight:normal;
}
-
-
+
+
/* ***************************************
FRIENDS PICKER SLIDER
-*************************************** */
+*************************************** */
.friendsPicker_container h3 {
font-size:4em !important;
text-align: left;
@@ -1821,19 +1819,19 @@ ul#friends_collections_accordian {
}
.friendsPicker {
position: relative;
- overflow: hidden;
+ overflow: hidden;
margin: 0;
padding:0;
width: 678px;
-
+
height: auto;
background: #dedede;
- -webkit-border-radius: 8px;
+ -webkit-border-radius: 8px;
-moz-border-radius: 8px;
}
.friendspicker_savebuttons {
background: white;
- -webkit-border-radius: 8px;
+ -webkit-border-radius: 8px;
-moz-border-radius: 8px;
margin:0 10px 10px 10px;
}
@@ -1879,7 +1877,7 @@ ul#friends_collections_accordian {
display: block;
padding: 0;
width:20px;
- -webkit-border-radius: 4px;
+ -webkit-border-radius: 4px;
-moz-border-radius: 4px;
}
.tabHasContent {
@@ -1941,7 +1939,7 @@ ul#friends_collections_accordian {
}
.friendsPickerNavigationR:hover {
background: url("_graphics/friends_picker_arrows.gif") no-repeat -60px -44px;
-}
+}
.friends_collections_controls a.delete_collection {
display:block;
cursor: pointer;
@@ -1960,18 +1958,18 @@ ul#friends_collections_accordian {
#collectionMembersTable {
background: #dedede;
- -webkit-border-radius: 8px;
+ -webkit-border-radius: 8px;
-moz-border-radius: 8px;
margin:10px 0 0 0;
padding:10px 10px 0 10px;
}
-
+
/* ***************************************
- WIDGET PICKER (PROFILE & DASHBOARD)
+WIDGET PICKER (PROFILE & DASHBOARD)
*************************************** */
/* 'edit page' button */
-a.toggle_customise_edit_panel {
+a.toggle_customise_edit_panel {
float:right;
clear:right;
color: #4690d6;
@@ -1981,10 +1979,10 @@ a.toggle_customise_edit_panel {
margin:0 0 20px 0;
width:280px;
text-align: left;
- -webkit-border-radius: 8px;
+ -webkit-border-radius: 8px;
-moz-border-radius: 8px;
}
-a.toggle_customise_edit_panel:hover {
+a.toggle_customise_edit_panel:hover {
color: #ffffff;
background: #0054a7;
border:1px solid #0054a7;
@@ -1995,7 +1993,7 @@ a.toggle_customise_edit_panel:hover {
margin: 0 0 20px 0;
padding:10px;
background: #dedede;
- -webkit-border-radius: 8px;
+ -webkit-border-radius: 8px;
-moz-border-radius: 8px;
}
@@ -2027,7 +2025,7 @@ a.toggle_customise_edit_panel:hover {
#widget_picker_gallery {
border-top:1px solid #cccccc;
background:white;
- width:210px;
+ width:210px;
height:340px;
padding:10px;
overflow:scroll;
@@ -2040,7 +2038,7 @@ a.toggle_customise_edit_panel:hover {
padding:10px;
margin:0 0 10px 0;
background:white;
- -webkit-border-radius: 8px;
+ -webkit-border-radius: 8px;
-moz-border-radius: 8px;
}
#customise_page_view h2 {
@@ -2095,16 +2093,16 @@ a.toggle_customise_edit_panel:hover {
min-height: 288px;
}
/* IE6 fix */
-* html #leftcolumn_widgets {
+* html #leftcolumn_widgets {
height: 190px;
}
-* html #middlecolumn_widgets {
+* html #middlecolumn_widgets {
height: 190px;
}
-* html #rightcolumn_widgets {
+* html #rightcolumn_widgets {
height: 190px;
}
-* html #rightcolumn_widgets.long {
+* html #rightcolumn_widgets.long {
height: 338px;
}
@@ -2176,7 +2174,7 @@ a.toggle_customise_edit_panel:hover {
width:200px;
}
/* IE6 fix */
-* html .placeholder {
+* html .placeholder {
margin: 0;
}
/* IE7 */
@@ -2184,7 +2182,7 @@ a.toggle_customise_edit_panel:hover {
margin: 0;
}
/* IE6 fix */
-* html .ui-sortable-helper h3 {
+* 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 {
@@ -2222,7 +2220,7 @@ a.toggle_customise_edit_panel:hover {
MISC.
*************************************** */
/* general page titles in main content area */
-#content_area_user_title h2 {
+#content_area_user_title h2 {
margin:0 0 0 8px;
padding:5px;
color:#0054A7;
@@ -2232,43 +2230,43 @@ a.toggle_customise_edit_panel:hover {
/* reusable generic collapsible box */
.collapsible_box {
background:#dedede;
- -webkit-border-radius: 8px;
+ -webkit-border-radius: 8px;
-moz-border-radius: 8px;
padding:5px 10px 5px 10px;
margin:4px 0 4px 0;
display:none;
-}
+}
a.collapsibleboxlink {
cursor:pointer;
}
-/* tag icon */
+/* tag icon */
.object_tag_string {
background: url(_graphics/icon_tag.gif) no-repeat left 2px;
padding:0 0 0 14px;
margin:0;
-}
+}
-/* profile picture upload n crop page */
+/* 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 {
}
@@ -2278,7 +2276,7 @@ a.collapsibleboxlink {
overflow: hidden;
width: 100px;
height: 100px;
-}
+}
/* ***************************************
@@ -2291,7 +2289,7 @@ a.collapsibleboxlink {
#add-box,
#search-box,
#logbrowser_search_area {
- -webkit-border-radius: 8px;
+ -webkit-border-radius: 8px;
-moz-border-radius: 8px;
background:white;
margin:0 10px 10px 10px;
@@ -2309,8 +2307,8 @@ a.collapsibleboxlink {
line-height:1em;
margin:0 0 10px 0;
padding:5px;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
}
h3.settings {
background:#e4e4e4;
@@ -2319,11 +2317,11 @@ h3.settings {
line-height:1em;
margin:10px 0 4px 0;
padding:5px;
- -webkit-border-radius: 4px;
+ -webkit-border-radius: 4px;
-moz-border-radius: 4px;
}
.admin_users_online .profile_status {
- -webkit-border-radius: 4px;
+ -webkit-border-radius: 4px;
-moz-border-radius: 4px;
background:#bbdaf7;
line-height:1.2em;
@@ -2382,7 +2380,7 @@ h3.settings {
margin:0 0 5px 0;
padding:5px;
border:2px solid #cccccc;
- -webkit-border-radius: 5px;
+ -webkit-border-radius: 5px;
-moz-border-radius: 5px;
}
@@ -2413,14 +2411,14 @@ div.ajax_loader {
width:auto;
height:100px;
margin:0 10px 0 10px;
- -webkit-border-radius: 8px;
+ -webkit-border-radius: 8px;
-moz-border-radius: 8px;
}
-/* reusable elgg horizontal tabbed navigation
- (used on friends collections, external pages, & riverdashboard mods)
+/* reusable elgg horizontal tabbed navigation
+(used on friends collections, external pages, & riverdashboard mods)
*/
#elgg_horizontal_tabbed_nav {
margin:0 0 5px 0;
@@ -2441,7 +2439,7 @@ div.ajax_loader {
background: #eeeeee;
margin: 0 0 0 10px;
-moz-border-radius-topleft:5px;
- -moz-border-radius-topright:5px;
+ -moz-border-radius-topright:5px;
-webkit-border-top-left-radius:5px;
-webkit-border-top-right-radius:5px;
}
@@ -2480,7 +2478,7 @@ div.ajax_loader {
.reportedcontent_content {
margin:0 0 5px 0;
padding:0 7px 4px 10px;
- -webkit-border-radius: 5px;
+ -webkit-border-radius: 5px;
-moz-border-radius: 5px;
}
.reportedcontent_content p.reportedcontent_detail,
@@ -2489,11 +2487,11 @@ div.ajax_loader {
}
.active_report {
border:1px solid #D3322A;
- background:#F7DAD8;
+ background:#F7DAD8;
}
.archived_report {
border:1px solid #666666;
- background:#dedede;
+ background:#dedede;
}
a.archive_report_button {
float:right;
@@ -2502,7 +2500,7 @@ a.archive_report_button {
color: #ffffff;
background:#4690d6;
border: 1px solid #4690d6;
- -webkit-border-radius: 4px;
+ -webkit-border-radius: 4px;
-moz-border-radius: 4px;
width: auto;
padding: 4px;
@@ -2521,7 +2519,7 @@ a.delete_report_button {
color: #ffffff;
background:#999999;
border: 1px solid #999999;
- -webkit-border-radius: 4px;
+ -webkit-border-radius: 4px;
-moz-border-radius: 4px;
width: auto;
padding: 4px;
@@ -2563,15 +2561,15 @@ a.delete_report_button:hover {
padding: 2px 5px;
cursor: default;
display: block;
- /*
- if width will be 100% horizontal scrollbar will apear
+ /*
+ 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
+ /*
+ it is very important, if line-height not setted or setted
in relative units scroll will be broken in firefox
*/
line-height: 16px;
@@ -2607,4 +2605,4 @@ a.delete_report_button:hover {
.livesearch_icon {
float: left;
padding-right: 1em;
-}
+}
diff --git a/views/default/settings/install.php b/views/default/settings/install.php
index 2bf632c6a..6fccfb06f 100644
--- a/views/default/settings/install.php
+++ b/views/default/settings/install.php
@@ -1,19 +1,14 @@
" . autop(elgg_echo("installation:settings:description")) . "
";
-
- echo elgg_view("settings/system",array("action" => "action/systemsettings/install"));
-
-?>
\ No newline at end of file
+/**
+ * Elgg system settings on initial installation
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ *
+ */
+
+echo "" . autop(elgg_echo("installation:settings:description")) . "
";
+
+echo elgg_view("settings/system",array("action" => "action/systemsettings/install"));
\ No newline at end of file
diff --git a/views/default/settings/system.php b/views/default/settings/system.php
index 521415edd..8df843276 100644
--- a/views/default/settings/system.php
+++ b/views/default/settings/system.php
@@ -1,72 +1,66 @@
";
+ $form_body .= elgg_echo('installation:' . $field) . " ";
+ $warning = elgg_echo('installation:warning:' . $field);
+ if ($warning != 'installation:warning:' . $field) echo "" . $warning . " ";
+ $value = $vars['config']->$field;
+ $form_body .= elgg_view("input/text",array('internalname' => $field, 'value' => $value));
+ $form_body .= "";
+}
- * @link http://elgg.org/
- *
- * @uses $vars['action'] If set, the place to forward the form to (usually action/systemsettings/save)
- */
+$languages = get_installed_translations();
+$form_body .= "" . elgg_echo('installation:language') . elgg_view("input/pulldown", array('internalname' => 'language', 'value' => $vars['config']->language, 'options_values' => $languages)) . "
";
- // Set action appropriately
- if (!isset($vars['action'])) {
- $action = $vars['url'] . "action/systemsettings/save";
- } else {
- $action = $vars['action'];
- }
-
- $form_body = "";
- foreach(array('sitename','sitedescription', 'siteemail', 'wwwroot','path','dataroot', 'view') as $field) {
- $form_body .= "";
- $form_body .= elgg_echo('installation:' . $field) . " ";
- $warning = elgg_echo('installation:warning:' . $field);
- if ($warning != 'installation:warning:' . $field) echo "" . $warning . " ";
- $value = $vars['config']->$field;
- $form_body .= elgg_view("input/text",array('internalname' => $field, 'value' => $value));
- $form_body .= "
";
- }
-
- $languages = get_installed_translations();
- $form_body .= "" . elgg_echo('installation:language') . elgg_view("input/pulldown", array('internalname' => 'language', 'value' => $vars['config']->language, 'options_values' => $languages)) . "
";
-
- $form_body .= "" . elgg_echo('admin:site:access:warning') . " ";
- $form_body .= elgg_echo('installation:sitepermissions') . elgg_view('input/access', array('internalname' => 'default_access','value' => $vars['config']->default_access)) . "
";
- $form_body .= "" . elgg_echo('installation:allow_user_default_access:description') . " " .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:allow_user_default_access:label')), 'internalname' => 'allow_user_default_access', 'value' => ($vars['config']->allow_user_default_access ? elgg_echo('installation:allow_user_default_access:label') : "") )) . "
";
- $form_body .= "" . elgg_echo('installation:simplecache:description') . " " .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:simplecache:label')), 'internalname' => 'simplecache_enabled', 'value' => ($vars['config']->simplecache_enabled ? elgg_echo('installation:simplecache:label') : "") )) . "
";
- $form_body .= "" . elgg_echo('installation:viewpathcache:description') . " " .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:viewpathcache:label')), 'internalname' => 'viewpath_cache_enabled', 'value' => (($vars['config']->viewpath_cache_enabled) ? elgg_echo('installation:viewpathcache:label') : "") )) . "
";
-
- $form_body .= "" . elgg_echo('installation:debug') . " " .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:debug:label')), 'internalname' => 'debug', 'value' => ($vars['config']->debug ? elgg_echo('installation:debug:label') : "") )) . "
";
-
- $form_body .= "" . elgg_echo('installation:httpslogin') . " " .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:httpslogin:label')), 'internalname' => 'https_login', 'value' => ($vars['config']->https_login ? elgg_echo('installation:httpslogin:label') : "") )) . "
";
-
-
- $form_body .= "" . elgg_echo('installation:disableapi') . " ";
- $on = elgg_echo('installation:disableapi:label');
- if ((isset($CONFIG->disable_api)) && ($CONFIG->disable_api == true))
- $on = ($vars['config']->disable_api ? "" : elgg_echo('installation:disableapi:label'));
- $form_body .= elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:disableapi:label')), 'internalname' => 'api', 'value' => $on ));
- $form_body .= "
";
-
- $form_body .= "" . elgg_echo('installation:usage') . " ";
- $on = elgg_echo('installation:usage:label');
-
- 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 .= "
";
-
-
-
- $form_body .= elgg_view('input/hidden', array('internalname' => 'settings', 'value' => 'go'));
-
- $form_body .= elgg_view('input/submit', array('value' => elgg_echo("save")));
-
- echo elgg_view('input/form', array('action' => $action, 'body' => $form_body));
-
-?>
+$form_body .= "" . elgg_echo('admin:site:access:warning') . " ";
+$form_body .= elgg_echo('installation:sitepermissions') . elgg_view('input/access', array('internalname' => 'default_access','value' => $vars['config']->default_access)) . "
";
+$form_body .= "" . elgg_echo('installation:allow_user_default_access:description') . " " .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:allow_user_default_access:label')), 'internalname' => 'allow_user_default_access', 'value' => ($vars['config']->allow_user_default_access ? elgg_echo('installation:allow_user_default_access:label') : "") )) . "
";
+$form_body .= "" . elgg_echo('installation:simplecache:description') . " " .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:simplecache:label')), 'internalname' => 'simplecache_enabled', 'value' => ($vars['config']->simplecache_enabled ? elgg_echo('installation:simplecache:label') : "") )) . "
";
+$form_body .= "" . elgg_echo('installation:viewpathcache:description') . " " .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:viewpathcache:label')), 'internalname' => 'viewpath_cache_enabled', 'value' => (($vars['config']->viewpath_cache_enabled) ? elgg_echo('installation:viewpathcache:label') : "") )) . "
";
+
+$form_body .= "" . elgg_echo('installation:debug') . " " .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:debug:label')), 'internalname' => 'debug', 'value' => ($vars['config']->debug ? elgg_echo('installation:debug:label') : "") )) . "
";
+
+$form_body .= "" . elgg_echo('installation:httpslogin') . " " .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:httpslogin:label')), 'internalname' => 'https_login', 'value' => ($vars['config']->https_login ? elgg_echo('installation:httpslogin:label') : "") )) . "
";
+
+$form_body .= "" . elgg_echo('installation:disableapi') . " ";
+$on = elgg_echo('installation:disableapi:label');
+if ((isset($CONFIG->disable_api)) && ($CONFIG->disable_api == true)) {
+ $on = ($vars['config']->disable_api ? "" : elgg_echo('installation:disableapi:label'));
+}
+$form_body .= elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:disableapi:label')), 'internalname' => 'api', 'value' => $on ));
+$form_body .= "
";
+
+$form_body .= "" . elgg_echo('installation:usage') . " ";
+$on = elgg_echo('installation:usage:label');
+
+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 .= "
";
+
+$form_body .= elgg_view('input/hidden', array('internalname' => 'settings', 'value' => 'go'));
+
+$form_body .= elgg_view('input/submit', array('value' => elgg_echo("save")));
+
+echo elgg_view('input/form', array('action' => $action, 'body' => $form_body));
\ No newline at end of file
diff --git a/views/default/settings/upgrading.php b/views/default/settings/upgrading.php
index e36d731a7..0cc4c6fdb 100644
--- a/views/default/settings/upgrading.php
+++ b/views/default/settings/upgrading.php
@@ -1,5 +1,10 @@
diff --git a/views/default/site/default.php b/views/default/site/default.php
index dcb305419..432f2ba33 100644
--- a/views/default/site/default.php
+++ b/views/default/site/default.php
@@ -1,21 +1,18 @@
url) {
- forward($site);
- } else {
- forward();
- }
-
- //echo elgg_view('object/default', $vars);
-?>
\ No newline at end of file
+// sites information (including plugin settings) shouldn't be shown.
+// there's not a real reason to display a site object
+// unless specifically overriden with a subtype view.
+if ($site = $vars['entity']->url) {
+ forward($site);
+} else {
+ forward();
+}
\ No newline at end of file
diff --git a/views/default/spotlight/default.php b/views/default/spotlight/default.php
index 6870453a4..38dd73c8d 100644
--- a/views/default/spotlight/default.php
+++ b/views/default/spotlight/default.php
@@ -1,23 +1,20 @@
-
Information
+
Information
\ No newline at end of file
diff --git a/views/default/text/about.php b/views/default/text/about.php
index 24372cb0a..7b10d026c 100644
--- a/views/default/text/about.php
+++ b/views/default/text/about.php
@@ -1,17 +1,14 @@
\ No newline at end of file
diff --git a/views/default/text/privacy_view.php b/views/default/text/privacy_view.php
index 40820b560..cde798c20 100644
--- a/views/default/text/privacy_view.php
+++ b/views/default/text/privacy_view.php
@@ -1,15 +1,11 @@
-
diff --git a/views/default/text/tos_view.php b/views/default/text/tos_view.php
index aa1d12322..983f1038f 100644
--- a/views/default/text/tos_view.php
+++ b/views/default/text/tos_view.php
@@ -1,14 +1,11 @@
\ No newline at end of file
diff --git a/views/default/upload/upload_form_content.php b/views/default/upload/upload_form_content.php
index dd0938cc2..225560a3f 100644
--- a/views/default/upload/upload_form_content.php
+++ b/views/default/upload/upload_form_content.php
@@ -1,3 +1,17 @@
+
+
"title_0"
- ));
-
+ echo elgg_view("input/text", array("internalname" => "title_0"));
+
?>
@@ -35,7 +47,7 @@ if (!$vars['entity']) {
'upload_0'));
-
+
?>
@@ -50,10 +62,10 @@ if (!$vars['entity']) {
"title",
- "value" => $title,
- ));
-
+ "internalname" => "title",
+ "value" => $title,
+ ));
+
?>
@@ -65,9 +77,9 @@ if (!$vars['entity']) {
"description",
- "value" => $description,
- ));
+ "internalname" => "description",
+ "value" => $description,
+ ));
?>
@@ -77,10 +89,10 @@ if (!$vars['entity']) {
"tags",
- "value" => $tags,
- ));
-
+ "internalname" => "tags",
+ "value" => $tags,
+ ));
+
?>
'access_id','value' => $access_id)); ?>
-
+
";
- if (isset($vars['entity']))
+ }
+ if (isset($vars['entity'])) {
echo "
getGUID()}\" />";
-
-?>
+ }
\ No newline at end of file
diff --git a/views/default/user/default.php b/views/default/user/default.php
index 0e83b5fb0..8e48b13f6 100644
--- a/views/default/user/default.php
+++ b/views/default/user/default.php
@@ -1,23 +1,18 @@
\ No newline at end of file
+if ($vars['full']) {
+ echo elgg_view("profile/userdetails",$vars);
+} else {
+ if (get_input('search_viewtype') == "gallery") {
+ echo elgg_view('profile/gallery',$vars);
+ } else {
+ echo elgg_view("profile/listing",$vars);
+ }
+}
diff --git a/views/default/user/search/finishblurb.php b/views/default/user/search/finishblurb.php
index 2b44c3dfc..58c8655e8 100644
--- a/views/default/user/search/finishblurb.php
+++ b/views/default/user/search/finishblurb.php
@@ -1,15 +1,17 @@
$vars['threshold']) {
+if ($vars['count'] > $vars['threshold']) {
?>
-
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/views/default/user/search/startblurb.php b/views/default/user/search/startblurb.php
index fa855aa13..37c2ff818 100644
--- a/views/default/user/search/startblurb.php
+++ b/views/default/user/search/startblurb.php
@@ -1,8 +1,15 @@
-
+
-
\ No newline at end of file
diff --git a/views/default/user/settings/default_access.php b/views/default/user/settings/default_access.php
index d5df5e426..3a6e6842c 100644
--- a/views/default/user/settings/default_access.php
+++ b/views/default/user/settings/default_access.php
@@ -1,30 +1,30 @@
allow_user_default_access) {
+ $user = page_owner_entity();
- * @author Curverider Ltd
+ if ($user) {
+ if (false === ($default_access = $user->getPrivateSetting('elgg_default_access'))) {
+ $default_access = $vars['config']->default_access;
+ }
+?>
+
+
+ :
+ allow_user_default_access) {
- $user = page_owner_entity();
-
- if ($user) {
- if (false === ($default_access = $user->getPrivateSetting('elgg_default_access'))) {
- $default_access = $vars['config']->default_access;
- }
- ?>
-
-
- :
- 'default_access', 'value' => $default_access));
-
- ?>
-
+ echo elgg_view('input/access',array('internalname' => 'default_access', 'value' => $default_access));
-
\ No newline at end of file
+ ?>
+
+
+
-
-
- :
-
+
+ :
+ 'email', 'value' => $user->email));
- echo elgg_view('input/email',array('internalname' => 'email', 'value' => $user->email));
-
- ?>
-
+ ?>
+
-
\ No newline at end of file
+
-
-
-
- : language;
- if ($user->language)
- $value = $user->language;
-
- echo elgg_view("input/pulldown", array('internalname' => 'language', 'value' => $value, 'options_values' => get_installed_translations()));
-
- ?>
-
-
-
-
\ No newline at end of file
+
+
+
+ : language;
+ if ($user->language) {
+ $value = $user->language;
+ }
+
+ echo elgg_view("input/pulldown", array('internalname' => 'language', 'value' => $value, 'options_values' => get_installed_translations()));
+
+ ?>
+
+
+
+
@@ -21,7 +21,8 @@
echo elgg_view('input/text',array('internalname' => 'name', 'value' => $user->name));
echo elgg_view('input/hidden',array('internalname' => 'guid', 'value' => $user->guid));
- ?>
+ ?>
-
\ No newline at end of file
+
-
-
- :
- 'password'));
- ?>
- : 'password2'));
- ?>
-
+
+
+ :
+ 'password'));
+ ?>
+ : 'password2'));
+ ?>
+
-
\ No newline at end of file
+" . elgg_view("usersettings/user") . " ";
- $form_body .= "
" . elgg_view('input/submit', array('value' => elgg_echo('save'))) . "
";
+$form_body = "" . elgg_view("usersettings/user") . " ";
+$form_body .= "
" . 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
+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 9a7afbf51..6d96076f8 100644
--- a/views/default/usersettings/main.php
+++ b/views/default/usersettings/main.php
@@ -1,14 +1,13 @@
" . elgg_view('output/longtext', array('value' => elgg_echo("usersettings:description"))) . "";
-?>
\ No newline at end of file
+// Description of what's going on
+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 a6b51fa64..210096e92 100644
--- a/views/default/usersettings/main_opt/plugins.php
+++ b/views/default/usersettings/main_opt/plugins.php
@@ -1,17 +1,17 @@
\ No newline at end of file
diff --git a/views/default/usersettings/main_opt/statistics.php b/views/default/usersettings/main_opt/statistics.php
index 4a9131d0c..ca9d2d2bb 100644
--- a/views/default/usersettings/main_opt/statistics.php
+++ b/views/default/usersettings/main_opt/statistics.php
@@ -1,12 +1,12 @@