]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
Finish up standardizing views/default/*
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Fri, 16 Oct 2009 20:54:48 +0000 (20:54 +0000)
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Fri, 16 Oct 2009 20:54:48 +0000 (20:54 +0000)
git-svn-id: http://code.elgg.org/elgg/trunk@3557 36083f99-b078-4883-b0ff-0f9b5a30f544

34 files changed:
views/default/css.php
views/default/settings/install.php
views/default/settings/system.php
views/default/settings/upgrading.php
views/default/site/default.php
views/default/spotlight/default.php
views/default/text/about.php
views/default/text/privacy_view.php
views/default/text/tos_view.php
views/default/upload/upload_form_content.php
views/default/user/default.php
views/default/user/search/finishblurb.php
views/default/user/search/startblurb.php
views/default/user/settings/default_access.php
views/default/user/settings/email.php
views/default/user/settings/language.php
views/default/user/settings/name.php
views/default/user/settings/password.php
views/default/usersettings/form.php
views/default/usersettings/main.php
views/default/usersettings/main_opt/plugins.php
views/default/usersettings/main_opt/statistics.php
views/default/usersettings/main_opt/user.php
views/default/usersettings/plugins.php
views/default/usersettings/plugins_opt/plugin.php
views/default/usersettings/statistics.php
views/default/usersettings/statistics_opt/numentities.php
views/default/usersettings/statistics_opt/online.php
views/default/usersettings/user.php
views/default/welcome.php
views/default/welcome/logged_in.php
views/default/welcome/logged_out.php
views/default/widgets/editwrapper.php
views/default/widgets/wrapper.php

index 89cdaf68cb5702b2110ada652eb9d04e3b16979c..feca462165adf8afd30610aa13246145fa978c5c 100644 (file)
@@ -1,18 +1,16 @@
 <?php
-
-       /**
-        * Elgg v1.6 Default Theme
-        * core CSS file
-        * 
-        * Updated 30 Sept 09
-        * 
-        * @package Elgg
-        * @subpackage Core
-        * @link http://elgg.org/
-        * 
-        * @uses $vars['wwwroot'] The site URL
-        */
-
+/**
+ * Elgg v1.6 Default Theme
+ * core CSS file
+ *
+ * Updated 30 Sept 09
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @link http://elgg.org/
+ *
+ * @uses $vars['wwwroot'] The site URL
+ */
 ?>
 
 /* ***************************************
@@ -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(<?php echo $vars['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(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px;
 }
 .river_object_widget_update {
-       background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_plugin.gif) no-repeat left -1px;    
+       background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_plugin.gif) no-repeat left -1px;
 }
 .river_object_blog_create {
        background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_blog.gif) no-repeat left -1px;
@@ -1251,10 +1249,10 @@ p.user_menu_friends_of {
        background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px;
 }
 .river_object_sitemessage_create {
-       background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_blog.gif) no-repeat left -1px;      
+       background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_blog.gif) no-repeat left -1px;
 }
 .river_user_messageboard {
-       background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px;   
+       background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px;
 }
 .river_object_page_create {
        background: url(<?php echo $vars['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("<?php echo $vars['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(<?php echo $vars['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;
-} 
+}
index 2bf632c6ad32694e0281f73d0528b4da6e61a857..6fccfb06fc4fa9e3707eed625f00cc50b79a8ef6 100644 (file)
@@ -1,19 +1,14 @@
 <?php
-
-       /**
-        * Elgg system settings on initial installation
-        * 
-        * @package Elgg
-        * @subpackage Core
-
-        * @author Curverider Ltd
-
-        * @link http://elgg.org/
-        * 
-        */
-
-       echo "<p>" . autop(elgg_echo("installation:settings:description")) . "</p>";
-
-       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 "<p>" . autop(elgg_echo("installation:settings:description")) . "</p>";
+
+echo elgg_view("settings/system",array("action" => "action/systemsettings/install"));
\ No newline at end of file
index 521415eddee32f0401ecec3798d93e684e022795..8df843276b823ae020d11682376ef4ae4704c242 100644 (file)
@@ -1,72 +1,66 @@
 <?php
+/**
+ * Elgg system settings form
+ * The form to change system settings
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ *
+ * @uses $vars['action'] If set, the place to forward the form to (usually action/systemsettings/save)
+ */
 
-       /**
-        * Elgg system settings form
-        * The form to change system settings
-        * 
-        * @package Elgg
-        * @subpackage Core
+// Set action appropriately
+if (!isset($vars['action'])) {
+       $action = $vars['url'] . "action/systemsettings/save";
+} else {
+       $action = $vars['action'];
+}
 
-        * @author Curverider Ltd
+$form_body = "";
+foreach(array('sitename','sitedescription', 'siteemail', 'wwwroot','path','dataroot', 'view') as $field) {
+       $form_body .= "<p>";
+       $form_body .= elgg_echo('installation:' . $field) . "<br />";
+       $warning = elgg_echo('installation:warning:' . $field);
+       if ($warning != 'installation:warning:' . $field) echo "<b>" . $warning . "</b><br />";
+       $value = $vars['config']->$field;
+       $form_body .= elgg_view("input/text",array('internalname' => $field, 'value' => $value));
+       $form_body .= "</p>";
+}
 
-        * @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 .= "<p>" . elgg_echo('installation:language') . elgg_view("input/pulldown", array('internalname' => 'language', 'value' => $vars['config']->language, 'options_values' => $languages)) . "</p>";
 
-       // 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 .= "<p>";
-                       $form_body .= elgg_echo('installation:' . $field) . "<br />";
-                       $warning = elgg_echo('installation:warning:' . $field);
-                       if ($warning != 'installation:warning:' . $field) echo "<b>" . $warning . "</b><br />";
-                       $value = $vars['config']->$field;
-                       $form_body .= elgg_view("input/text",array('internalname' => $field, 'value' => $value));
-                       $form_body .= "</p>";
-               }
-               
-               $languages = get_installed_translations();
-               $form_body .= "<p>" . elgg_echo('installation:language') . elgg_view("input/pulldown", array('internalname' => 'language', 'value' => $vars['config']->language, 'options_values' => $languages)) . "</p>";
-               
-               $form_body .= "<p class=\"admin_debug\">" . elgg_echo('admin:site:access:warning') . "<br />";
-               $form_body .= elgg_echo('installation:sitepermissions') . elgg_view('input/access', array('internalname' => 'default_access','value' => $vars['config']->default_access)) . "</p>";
-               $form_body .= "<p class=\"admin_debug\">" . elgg_echo('installation:allow_user_default_access:description') . "<br />" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:allow_user_default_access:label')), 'internalname' => 'allow_user_default_access', 'value' => ($vars['config']->allow_user_default_access ? elgg_echo('installation:allow_user_default_access:label') : "") )) . "</p>";
-               $form_body .= "<p class=\"admin_debug\">" . elgg_echo('installation:simplecache:description') . "<br />" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:simplecache:label')), 'internalname' => 'simplecache_enabled', 'value' => ($vars['config']->simplecache_enabled ? elgg_echo('installation:simplecache:label') : "") )) . "</p>";
-               $form_body .= "<p class=\"admin_debug\">" . elgg_echo('installation:viewpathcache:description') . "<br />" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:viewpathcache:label')), 'internalname' => 'viewpath_cache_enabled', 'value' => (($vars['config']->viewpath_cache_enabled) ? elgg_echo('installation:viewpathcache:label') : "") )) . "</p>";
-               
-               $form_body .= "<p class=\"admin_debug\">" . elgg_echo('installation:debug') . "<br />" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:debug:label')), 'internalname' => 'debug', 'value' => ($vars['config']->debug ? elgg_echo('installation:debug:label') : "") )) . "</p>";
-               
-               $form_body .= "<p class=\"admin_debug\">" . elgg_echo('installation:httpslogin') . "<br />" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:httpslogin:label')), 'internalname' => 'https_login', 'value' => ($vars['config']->https_login ? elgg_echo('installation:httpslogin:label') : "") )) . "</p>";
-               
-               
-               $form_body .= "<p class=\"admin_debug\">" . elgg_echo('installation:disableapi') . "<br />";
-               $on = elgg_echo('installation:disableapi:label');
-               if ((isset($CONFIG->disable_api)) && ($CONFIG->disable_api == true))
-                       $on = ($vars['config']->disable_api ?  "" : elgg_echo('installation:disableapi:label'));
-               $form_body .= elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:disableapi:label')), 'internalname' => 'api', 'value' => $on ));
-               $form_body .= "</p>";
-               
-               $form_body .= "<p class=\"admin_usage\">" . elgg_echo('installation:usage') . "<br />";
-               $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 .= "</p>";
-               
-               
-               
-               $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 .= "<p class=\"admin_debug\">" . elgg_echo('admin:site:access:warning') . "<br />";
+$form_body .= elgg_echo('installation:sitepermissions') . elgg_view('input/access', array('internalname' => 'default_access','value' => $vars['config']->default_access)) . "</p>";
+$form_body .= "<p class=\"admin_debug\">" . elgg_echo('installation:allow_user_default_access:description') . "<br />" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:allow_user_default_access:label')), 'internalname' => 'allow_user_default_access', 'value' => ($vars['config']->allow_user_default_access ? elgg_echo('installation:allow_user_default_access:label') : "") )) . "</p>";
+$form_body .= "<p class=\"admin_debug\">" . elgg_echo('installation:simplecache:description') . "<br />" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:simplecache:label')), 'internalname' => 'simplecache_enabled', 'value' => ($vars['config']->simplecache_enabled ? elgg_echo('installation:simplecache:label') : "") )) . "</p>";
+$form_body .= "<p class=\"admin_debug\">" . elgg_echo('installation:viewpathcache:description') . "<br />" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:viewpathcache:label')), 'internalname' => 'viewpath_cache_enabled', 'value' => (($vars['config']->viewpath_cache_enabled) ? elgg_echo('installation:viewpathcache:label') : "") )) . "</p>";
+
+$form_body .= "<p class=\"admin_debug\">" . elgg_echo('installation:debug') . "<br />" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:debug:label')), 'internalname' => 'debug', 'value' => ($vars['config']->debug ? elgg_echo('installation:debug:label') : "") )) . "</p>";
+
+$form_body .= "<p class=\"admin_debug\">" . elgg_echo('installation:httpslogin') . "<br />" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:httpslogin:label')), 'internalname' => 'https_login', 'value' => ($vars['config']->https_login ? elgg_echo('installation:httpslogin:label') : "") )) . "</p>";
+
+$form_body .= "<p class=\"admin_debug\">" . elgg_echo('installation:disableapi') . "<br />";
+$on = elgg_echo('installation:disableapi:label');
+if ((isset($CONFIG->disable_api)) && ($CONFIG->disable_api == true)) {
+       $on = ($vars['config']->disable_api ?  "" : elgg_echo('installation:disableapi:label'));
+}
+$form_body .= elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:disableapi:label')), 'internalname' => 'api', 'value' => $on ));
+$form_body .= "</p>";
+
+$form_body .= "<p class=\"admin_usage\">" . elgg_echo('installation:usage') . "<br />";
+$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 .= "</p>";
+
+$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
index e36d731a7a3e6818fa2b7dcdc0109e37f6d6969a..0cc4c6fdb286e0920b4b5e841c0bd42e5f76848b 100644 (file)
@@ -1,5 +1,10 @@
 <?php
-
+/**
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
 ?>
 
 <html>
index dcb305419b87d0111ec485ac8238b1182218534e..432f2ba338f55aab55d3ccf6c4aae45a38fd0b79 100644 (file)
@@ -1,21 +1,18 @@
 <?php
-       /**
       * ElggSite default view.
-        * 
       * @package Elgg
       * @subpackage Core
       * @author Curverider Ltd
       * @link http://elgg.org/
       */
+/**
+ * ElggSite default view.
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
 
-       // 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();
-       }
-
-       //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
index 6870453a4edbdf3c4264e30e6118ea59890ae22f..38dd73c8d748c5eb64942f8fa9e8f3554e534e26 100644 (file)
@@ -1,23 +1,20 @@
 <?php
-
-       /**
-        * Elgg default spotlight
-        * The spotlight area that displays across the site
-        * 
-        * @package Elgg
-        * @subpackage Core
-
-        * @author Curverider Ltd
-
-        * @link http://elgg.org/
-        * 
-        */
+/**
+ * Elgg default spotlight
+ * The spotlight area that displays across the site
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ *
+ */
 ?>
 
 <div id="spotlight_table">
        <!-- spotlight RHS content -->
        <div class="spotlightRHS">
-               <h2>Information</h2>                    
+               <h2>Information</h2>
                <ul>
                        <li><a href="http://docs.elgg.org/wiki/Views/SystemViews">Populating this spotlight area</a></li>
                        <li><a href="http://community.elgg.org">Elgg open source community</a></li>
        <div class="spotlightLHS">
                <h2>Welcome to Elgg</h2>
                <p>
-                       Elgg allows you to run your own social networking site, whether publicly (like 
+                       Elgg allows you to run your own social networking site, whether publicly (like
                        Facebook) or privately within your company or organization.
                        <a href="http://elgg.com/">Support and commercial services</a> are available,
                        or you can find new tools for your Elgg site at the
-                       <a href="http://community.elgg.org/">Elgg community</a>.  
-               </p> 
+                       <a href="http://community.elgg.org/">Elgg community</a>.
+               </p>
        </div><!-- /spotlight LHS content -->
        <div class="clearfloat"></div>
 </div>
\ No newline at end of file
index 24372cb0a5f8d42695d90ceb278ba749f66ae4d1..7b10d026ca10a74379638b68e29c6fd71c40a375 100644 (file)
@@ -1,17 +1,14 @@
 <?php
-
-       /**
-        * Elgg basic about page
-        * The standard HTML about page
-        * 
-        * @package Elgg
-        * @subpackage Core
-
-        * @author Curverider Ltd
-
-        * @link http://elgg.org/
-        *
-        */
+/**
+ * Elgg basic about page
+ * The standard HTML about page
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ *
+ */
 ?>
 
 <!-- still to do -->
\ No newline at end of file
index 40820b56072ca2052a5fffd34e449c425aa2e543..cde798c204e9badc986456d8e8547d0b32f4ff03 100644 (file)
@@ -1,15 +1,11 @@
 <?php
-
-       /**
-        * Elgg basic privacy page
-        * 
-        * @package Elgg
-        * @subpackage Core
-
-        * @author Curverider Ltd
-
-        * @link http://elgg.org/
-        *
-        */
+/**
+ * Elgg basic privacy page
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ *
+ */
 ?>
-
index aa1d1232203e488effc476919728e3be130ff13c..983f1038f1f73917179b2cfa7f85362005574d88 100644 (file)
@@ -1,14 +1,11 @@
 <?php
-
-       /**
-        * Elgg basic tos page
-        * 
-        * @package Elgg
-        * @subpackage Core
-
-        * @author Curverider Ltd
-
-        * @link http://elgg.org/
-        *
-        */
+/**
+ * Elgg basic tos page
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ *
+ */
 ?>
\ No newline at end of file
index dd0938cc230479093e05db3e18dce2a5cd45a211..225560a3f6a1a01fd710b6f4316cf0a43d704f87 100644 (file)
@@ -1,3 +1,17 @@
+<?php
+/**
+ * Elgg system settings form
+ * The form to change system settings
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ *
+ * @uses $vars['action'] If set, the place to forward the form to (usually action/systemsettings/save)
+ */
+?>
+
 <input type="hidden" name="number_of_files" value="1">
 <?php
 
@@ -23,10 +37,8 @@ if (!$vars['entity']) {
                        <label><?php echo elgg_echo("title"); ?><br />
                        <?php
 
-                               echo elgg_view("input/text", array(
-                                                                       "internalname" => "title_0"
-                                                                                                       ));
-                       
+                               echo elgg_view("input/text", array("internalname" => "title_0"));
+
                        ?>
                        </label>
                </p>
@@ -35,7 +47,7 @@ if (!$vars['entity']) {
                        <?php
 
                                echo elgg_view("input/file",array('internalname' => 'upload_0'));
-                       
+
                        ?>
                        </label>
                </p>
@@ -50,10 +62,10 @@ if (!$vars['entity']) {
                        <?php
 
                                echo elgg_view("input/text", array(
-                                                                       "internalname" => "title",
-                                                                       "value" => $title,
-                                                                                                       ));
-                       
+                                       "internalname" => "title",
+                                       "value" => $title,
+                               ));
+
                        ?>
                        </label>
                </p>
@@ -65,9 +77,9 @@ if (!$vars['entity']) {
                        <?php
 
                                echo elgg_view("input/longtext",array(
-                                                                       "internalname" => "description",
-                                                                       "value" => $description,
-                                                                                                       ));
+                                       "internalname" => "description",
+                                       "value" => $description,
+                               ));
                        ?>
                        </label>
                </p>
@@ -77,10 +89,10 @@ if (!$vars['entity']) {
                        <?php
 
                                echo elgg_view("input/tags", array(
-                                                                       "internalname" => "tags",
-                                                                       "value" => $tags,
-                                                                                                       ));
-                       
+                                       "internalname" => "tags",
+                                       "value" => $tags,
+                               ));
+
                        ?>
                </label></p>
 <?php
@@ -104,12 +116,12 @@ if (!$vars['entity']) {
                                <?php echo elgg_view('input/access', array('internalname' => 'access_id','value' => $access_id)); ?>
                        </label>
                </p>
-       
+
 <?php
 
-       if (isset($vars['container_guid']))
+       if (isset($vars['container_guid'])) {
                echo "<input type=\"hidden\" name=\"container_guid\" value=\"{$vars['container_guid']}\" />";
-       if (isset($vars['entity']))
+       }
+       if (isset($vars['entity'])) {
                echo "<input type=\"hidden\" name=\"file_guid\" value=\"{$vars['entity']->getGUID()}\" />";
-
-?>
+       }
\ No newline at end of file
index 0e83b5fb0e691b34133ac522a8604074192dc4ff..8e48b13f65685efe5576b47b4214bb2a51e95545 100644 (file)
@@ -1,23 +1,18 @@
 <?php
+/**
+ * Elgg user display
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @link http://elgg.org/
+ */
 
-       /**
-        * Elgg user display
-        * 
-        * @package Elgg
-        * @subpackage Core
-
-
-        * @link http://elgg.org/
-        */
-
-               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);
-                       }
-               }
-       
-?>
\ 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);
+       }
+}
index 2b44c3dfccd45354ac370eddc4e61b1cf8e2991b..58c8655e86e70fcd12a38c1a2cc0a35571f80412 100644 (file)
@@ -1,15 +1,17 @@
 <?php\r
+/**\r
+ * @package Elgg\r
+ * @subpackage Core\r
+ * @author Curverider Ltd\r
+ * @link http://elgg.org/\r
+ */\r
 \r
-       if ($vars['count'] > $vars['threshold']) {\r
+if ($vars['count'] > $vars['threshold']) {\r
 \r
 ?>\r
-<div class="contentWrapper"><a href="<?php echo $vars['url']; ?>pg/search/users/?tag=<?php echo urlencode($vars['tag']); ?>"><?php \r
-       \r
-               echo elgg_echo("user:search:finishblurb"); \r
-       \r
+<div class="contentWrapper"><a href="<?php echo $vars['url']; ?>pg/search/users/?tag=<?php echo urlencode($vars['tag']); ?>"><?php\r
+       echo elgg_echo("user:search:finishblurb");\r
        ?></a></div>\r
 <?php\r
 \r
-       }\r
-\r
-?>
\ No newline at end of file
+}
\ No newline at end of file
index fa855aa1398f29a38e387025d4f125c0fbfadfc2..37c2ff818fabcdcfb32a1e97bf72ea0df5e5ee09 100644 (file)
@@ -1,8 +1,15 @@
-\r
+<?php\r
+/**\r
+ * @package Elgg\r
+ * @subpackage Core\r
+ * @author Curverider Ltd\r
+ * @link http://elgg.org/\r
+ */\r
+?>\r
 <div class="contentWrapper">\r
-       <?php \r
-       \r
-               echo sprintf(elgg_echo("user:search:startblurb"),$vars['tag']); \r
-       \r
+       <?php\r
+\r
+               echo sprintf(elgg_echo("user:search:startblurb"),$vars['tag']);\r
+\r
        ?>\r
 </div>
\ No newline at end of file
index d5df5e426018eb7a9aae795e3c2bdcb50a77bcad..3a6e6842ccd3813a70735345bc15a6dda5f671ff 100644 (file)
@@ -1,30 +1,30 @@
 <?php
-       /**
-        * Provide a way of setting your default access
-        * 
-        * @package Elgg
-        * @subpackage Core
+/**
+ * Provide a way of setting your default access
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
+if ($vars['config']->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;
+               }
+?>
+       <h3><?php echo elgg_echo('default_access:settings'); ?></h3>
+       <p>
+               <?php echo elgg_echo('default_access:label'); ?>:
+               <?php
 
-        * @link http://elgg.org/
-        */
-       if ($vars['config']->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;
-                       }
-       ?>
-               <h3><?php echo elgg_echo('default_access:settings'); ?></h3>
-               <p>
-                       <?php echo elgg_echo('default_access:label'); ?>:
-                       <?php
-       
-                               echo elgg_view('input/access',array('internalname' => 'default_access', 'value' => $default_access));
-                       
-                       ?> 
-               </p>
+                       echo elgg_view('input/access',array('internalname' => 'default_access', 'value' => $default_access));
 
-<?php }} ?>
\ No newline at end of file
+               ?>
+       </p>
+
+<?php
+       }
+}
\ No newline at end of file
index 60f2f7acd99c8f723646c58f13978d8cdd8a66e6..699f7258369a5a8addb31b5b5aa7f5f3d09b7019 100644 (file)
@@ -1,27 +1,26 @@
 <?php
-       /**
-        * Provide a way of setting your email
-        * 
-        * @package Elgg
-        * @subpackage Core
+/**
+ * Provide a way of setting your email
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
 
-        * @author Curverider Ltd
+$user = page_owner_entity();
 
-        * @link http://elgg.org/
-        */
-
-       $user = page_owner_entity();
-       
-       if ($user) {
+if ($user) {
 ?>
-       <h3><?php echo elgg_echo('email:settings'); ?></h3>
-       <p>
-               <?php echo elgg_echo('email:address:label'); ?>:
-               <?php
+<h3><?php echo elgg_echo('email:settings'); ?></h3>
+<p>
+       <?php echo elgg_echo('email:address:label'); ?>:
+       <?php
+
+               echo elgg_view('input/email',array('internalname' => 'email', 'value' => $user->email));
 
-                       echo elgg_view('input/email',array('internalname' => 'email', 'value' => $user->email));
-               
-               ?> 
-       </p>
+       ?>
+</p>
 
-<?php } ?>
\ No newline at end of file
+<?php
+}
\ No newline at end of file
index fa5dec0fa69f53d4f6c3ecc6cf1ccdb12cd74895..a7a66e5c25c87d4ff800e77636e9ed5340937592 100644 (file)
@@ -1,31 +1,33 @@
 <?php
-       /**
       * Provide a way of setting your language prefs
-        * 
       * @package Elgg
       * @subpackage Core
       * @author Curverider Ltd
       * @link http://elgg.org/
       */
-
-       global $CONFIG;
-       $user = page_owner_entity();
-       
-       if ($user) {
+/**
+ * Provide a way of setting your language prefs
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
+
+global $CONFIG;
+$user = page_owner_entity();
+
+if ($user) {
 ?>
-       <h3><?php echo elgg_echo('user:set:language'); ?></h3>
-       <p>
-       
-               <?php echo elgg_echo('user:language:label'); ?>: <?php
-
-                       $value = $CONFIG->language;
-                       if ($user->language)
-                               $value = $user->language;
-                       
-                       echo elgg_view("input/pulldown", array('internalname' => 'language', 'value' => $value, 'options_values' => get_installed_translations()));
-               
-                ?> 
-
-       </p>
-
-<?php } ?>
\ No newline at end of file
+<h3><?php echo elgg_echo('user:set:language'); ?></h3>
+<p>
+
+       <?php echo elgg_echo('user:language:label'); ?>: <?php
+
+               $value = $CONFIG->language;
+               if ($user->language) {
+                       $value = $user->language;
+               }
+
+               echo elgg_view("input/pulldown", array('internalname' => 'language', 'value' => $value, 'options_values' => get_installed_translations()));
+
+       ?>
+
+</p>
+
+<?php
+}
\ No newline at end of file
index 56f6139e7b52378dd45ecb702cebb336b0bf6218..072c7cb037941202b334b25068870ca3be0a4b5d 100644 (file)
@@ -1,7 +1,7 @@
 <?php
        /**
         * Provide a way of setting your full name.
-        * 
+        *
         * @package Elgg
         * @subpackage Core
 
@@ -11,8 +11,8 @@
         */
 
        $user = page_owner_entity();
-       
-       if ($user) {
+
+if ($user) {
 ?>
        <h3><?php echo elgg_echo('user:set:name'); ?></h3>
        <p>
@@ -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));
-               ?> 
+               ?>
        </p>
 
-<?php } ?>
\ No newline at end of file
+<?php
+}
\ No newline at end of file
index d2b794808dce4bd871d91f65ec2fda64e28be280..5cefe3821dce992d3a42b251495e1ecfa58efadd 100644 (file)
@@ -1,28 +1,27 @@
 <?php
-       /**
-        * Provide a way of setting your password
-        * 
-        * @package Elgg
-        * @subpackage Core
+/**
+ * Provide a way of setting your password
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
 
-        * @author Curverider Ltd
+$user = page_owner_entity();
 
-        * @link http://elgg.org/
-        */
-
-       $user = page_owner_entity();
-       
-       if ($user) {
+if ($user) {
 ?>
-       <h3><?php echo elgg_echo('user:set:password'); ?></h3>
-       <p>
-               <?php echo elgg_echo('user:password:label'); ?>: 
-               <?php
-                       echo elgg_view('input/password',array('internalname' => 'password'));
-               ?></p><p>
-               <?php echo elgg_echo('user:password2:label'); ?>: <?php
-                       echo elgg_view('input/password',array('internalname' => 'password2'));
-               ?>
-       </p>
+<h3><?php echo elgg_echo('user:set:password'); ?></h3>
+<p>
+       <?php echo elgg_echo('user:password:label'); ?>:
+       <?php
+               echo elgg_view('input/password',array('internalname' => 'password'));
+       ?></p><p>
+       <?php echo elgg_echo('user:password2:label'); ?>: <?php
+               echo elgg_view('input/password',array('internalname' => 'password2'));
+       ?>
+</p>
 
-<?php } ?>
\ No newline at end of file
+<?php
+}
\ No newline at end of file
index 0d7be712e84f98f3ae85fcc6ccb36734570eb293..2d4a7cb80515ec18b3980e90a8c0b5af0cfc473a 100644 (file)
@@ -1,7 +1,12 @@
 <?php
+/**
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
 
-       $form_body = "<div class=\"contentWrapper user_settings\">" . elgg_view("usersettings/user") . " ";
-       $form_body .= "<p>" . elgg_view('input/submit', array('value' => elgg_echo('save'))) . "</p></div>";
+$form_body = "<div class=\"contentWrapper user_settings\">" . elgg_view("usersettings/user") . " ";
+$form_body .= "<p>" . elgg_view('input/submit', array('value' => elgg_echo('save'))) . "</p></div>";
 
-       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
index 9a7afbf5183fe9e90fa96c2ee48b87dfd2f9458f..6d96076f871296808cfbe879ce6fc43b9ab80c7d 100644 (file)
@@ -1,14 +1,13 @@
 <?php
-       /**
       * Elgg user main settings page.
       * Functions for adding and manipulating options on the user settings panel.
-        * 
       * @package Elgg
       * @subpackage Core
-        * @author Curverider Ltd 
       * @link http://elgg.org/
       */
+/**
+ * Elgg user main settings page.
+ * Functions for adding and manipulating options on the user settings panel.
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
 
-       // Description of what's going on
-               echo "<p>" . elgg_view('output/longtext', array('value' => elgg_echo("usersettings:description"))) . "</p>";
-?>
\ No newline at end of file
+// Description of what's going on
+echo "<p>" . elgg_view('output/longtext', array('value' => elgg_echo("usersettings:description"))) . "</p>";
index a6b51fa6460b679cf619feca4958198c4ab8a0e3..210096e921da596ce4c3e382adb9f6cd5e780b5d 100644 (file)
@@ -1,17 +1,17 @@
 <?php
-       /**
       * Elgg plugin sub-component on the main menu.
-        * 
       * @package Elgg
       * @subpackage Core
       * @author Curverider Ltd
       * @link http://elgg.org/
       */
+/**
+ * Elgg plugin sub-component on the main menu.
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
 
-       global $CONFIG;
+global $CONFIG;
 ?>
 <div class="admin-menu-option">
        <h2><?php echo elgg_echo('usersettings:plugins'); ?> </h2>
        <p><?php echo elgg_echo('usersettings:plugins:opt:description'); ?><br />
-       <a href="<?php echo $CONFIG->wwwroot . "pg/settings/plugins/"; ?>"><?php echo elgg_echo('usersettings:plugins:opt:linktext'); ?></a></p> 
+       <a href="<?php echo $CONFIG->wwwroot . "pg/settings/plugins/"; ?>"><?php echo elgg_echo('usersettings:plugins:opt:linktext'); ?></a></p>
 </div>
\ No newline at end of file
index 4a9131d0c2172f759218fb7a23ed7d447b93409d..ca9d2d2bb76d5ce62655c691d43169985fc2c41a 100644 (file)
@@ -1,12 +1,12 @@
 <?php
-       /**
       * Elgg satistics sub-component on the main menu.
-        * 
       * @package Elgg
       * @subpackage Core
       * @author Curverider Ltd
       * @link http://elgg.org/
       */
+/**
+ * Elgg satistics sub-component on the main menu.
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
 ?>
 <div class="admin-menu-option">
        <h2><?php echo elgg_echo('usersettings:statistics'); ?> </h2>
index d3298cd2e57a9e0149401b55f42fe846c0f30dc0..92b09cae0640c370c12b9687daf59b911a3ac536 100644 (file)
@@ -1,12 +1,12 @@
 <?php
-       /**
       * Elgg user sub-component on the main menu.
-        * 
       * @package Elgg
       * @subpackage Core
       * @author Curverider Ltd
       * @link http://elgg.org/
       */
+/**
+ * Elgg user sub-component on the main menu.
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
 ?>
 <div class="admin-menu-option">
        <h2><?php echo elgg_echo('usersettings:user'); ?> </h2>
index af4f4bb36a01802f10cea53a94083b9acad05010..95a856850da9a5d70acfa88677f0f179d7b9ac24 100644 (file)
@@ -1,31 +1,27 @@
 <?php
-       /**
       * Elgg plugin specific user settings.
-        * 
       * @package Elgg
       * @subpackage Core
-        * @author Curverider Ltd 
       * @link http://elgg.org/
       */
+/**
+ * Elgg plugin specific user settings.
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
 
-       // Description of what's going on
-               echo "<div class=\"contentWrapper\">" . elgg_view('output/longtext', array('value' => elgg_echo("usersettings:plugins:description"))) . "</div>";
+// Description of what's going on
+echo "<div class=\"contentWrapper\">" . elgg_view('output/longtext', array('value' => elgg_echo("usersettings:plugins:description"))) . "</div>";
 
-               $limit = get_input('limit', 10);
-               $offset = get_input('offset', 0);
-               
-       // Get the installed plugins
-               $installed_plugins = $vars['installed_plugins'];
-               $count = count($installed_plugins);
-               
-       // Display list of plugins
-               $n = 0;
-               foreach ($installed_plugins as $plugin => $data)
-               {
-                       if (is_plugin_enabled($plugin))
-                               echo elgg_view("usersettings/plugins_opt/plugin", array('plugin' => $plugin, 'details' => $data));
-                       
-               }
-               
-       
-?>
\ No newline at end of file
+$limit = get_input('limit', 10);
+$offset = get_input('offset', 0);
+
+// Get the installed plugins
+$installed_plugins = $vars['installed_plugins'];
+$count = count($installed_plugins);
+
+// Display list of plugins
+$n = 0;
+foreach ($installed_plugins as $plugin => $data) {
+       if (is_plugin_enabled($plugin)) {
+               echo elgg_view("usersettings/plugins_opt/plugin", array('plugin' => $plugin, 'details' => $data));
+       }
+}
\ No newline at end of file
index a7935f2ee22322483851370454837bdc74f1a543..c27212887f18b5615029bfe6c54e3452aecacc30 100644 (file)
@@ -1,33 +1,36 @@
 <?php
-       /**
       * Elgg plugin manifest class
-        * 
       * This file renders a plugin for the admin screen, including active/deactive, manifest details & display plugin
       * settings.
-        * 
       * @package Elgg
       * @subpackage Core
       * @author Curverider Ltd
       * @link http://elgg.org/
       */
+/**
+ * Elgg plugin manifest class
+ *
+ * This file renders a plugin for the admin screen, including active/deactive, manifest details & display plugin
+ * settings.
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
 
 
-       $plugin = $vars['plugin'];
-       $details = $vars['details'];
-       
-       $active = $details['active'];
-       $manifest = $details['manifest'];
-       
-       $user_guid = $details['user_guid'];
-       if ($user_guid) $user_guid = $_SESSION['user']->guid;
-       
-       if (elgg_view("usersettings/{$plugin}/edit")) { 
+$plugin = $vars['plugin'];
+$details = $vars['details'];
+
+$active = $details['active'];
+$manifest = $details['manifest'];
+
+$user_guid = $details['user_guid'];
+if ($user_guid) {
+       $user_guid = $_SESSION['user']->guid;
+}
+
+if (elgg_view("usersettings/{$plugin}/edit")) {
 ?>
 <div class="contentWrapper">
        <h3 class="settings"><?php echo elgg_echo($plugin); ?></h3>
-       
+
        <div id="<?php echo $plugin; ?>_settings">
                <?php echo elgg_view("object/plugin", array('plugin' => $plugin, 'entity' => find_plugin_usersettings($plugin, $user_guid), 'prefix' => 'user')) ?>
        </div>
 </div>
-<?php } ?>
\ No newline at end of file
+<?php
+}
\ No newline at end of file
index f01ac524d766e5bbc8e307f5ca3ef2046b8cee55..728abf37c816b6a3087766ba654a055de26d37dd 100644 (file)
@@ -1,11 +1,11 @@
 <?php
-       /**
       * Elgg settings specific user settings.
-        * 
       * @package Elgg
       * @subpackage Core
-        * @author Curverider Ltd 
       * @link http://elgg.org/
       */
+/**
+ * Elgg settings specific user settings.
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
 
 ?>
\ No newline at end of file
index ffc6b32807ad2176150bb16beb75288e0d6cae12..cf1d8598b62ce67420910750a1288fe965f2cefa 100644 (file)
@@ -1,53 +1,49 @@
 <?php
-       /**
-        * Elgg statistics screen
-        * 
-        * @package Elgg
-        * @subpackage Core
+/**
+ * Elgg statistics screen
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
 
-        * @author Curverider Ltd
+// Get entity statistics
+$entity_stats = get_entity_statistics($_SESSION['user']->guid);
 
-        * @link http://elgg.org/
-        */
-
-       
-       // Get entity statistics
-       $entity_stats = get_entity_statistics($_SESSION['user']->guid);
-       
-       if ($entity_stats)
-       {
+if ($entity_stats) {
 ?>
 <div class="usersettings_statistics">
-    <h3><?php echo elgg_echo('usersettings:statistics:label:numentities'); ?></h3>
-    <table>
-        <?php
-            foreach ($entity_stats as $k => $entry)
-            {
-                foreach ($entry as $a => $b)
-                {
-                    
-                    //This function controls the alternating class
-                       $even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even';
+       <h3><?php echo elgg_echo('usersettings:statistics:label:numentities'); ?></h3>
+       <table>
+               <?php
+                       foreach ($entity_stats as $k => $entry) {
+                               foreach ($entry as $a => $b) {
+
+                                       //This function controls the alternating class
+                                       $even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even';
 
-                    if ($a == "__base__") {
-                        $a = elgg_echo("item:{$k}");
-                        if (empty($a))
-                               $a = $k;
-                       } else {
-                               $a = elgg_echo("item:{$k}:{$a}");
-                               if (empty($a)) {
-                                                               $a = "$k $a";
-                               }
-                        }
-                    echo <<< END
-                        <tr class="{$even_odd}">
-                            <td class="column_one"><b>{$a}:</b></td>
-                            <td>{$b}</td>
-                        </tr>
+                                       if ($a == "__base__") {
+                                               $a = elgg_echo("item:{$k}");
+                                               if (empty($a)) {
+                                                       $a = $k;
+                                               }
+                                       } else {
+                                               $a = elgg_echo("item:{$k}:{$a}");
+                                               if (empty($a)) {
+                                                       $a = "$k $a";
+                                               }
+                                       }
+                                       echo <<< END
+                                               <tr class="{$even_odd}">
+                                                       <td class="column_one"><b>{$a}:</b></td>
+                                                       <td>{$b}</td>
+                                               </tr>
 END;
-                }
-            }
-        ?>
-    </table>
+                               }
+                       }
+               ?>
+       </table>
 </div>
-<?php } ?>
\ No newline at end of file
+<?php
+}
\ No newline at end of file
index f364e6cabd27ac8e3be7bb5ce57b2150acc39ae1..2ea9bef288cca2022ab6c71261fb823862f706d1 100644 (file)
@@ -1,25 +1,26 @@
 <?php
-       /**
-        * Elgg statistics screen showing online users.
-        * 
-        * @package Elgg
-        * @subpackage Core
-        * @author Curverider Ltd
-        * @link http://elgg.org/
-        */
+/**
+ * Elgg statistics screen showing online users.
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
+
+$user = $_SESSION['user'];
+
+$logged_in = 0;
+$log = get_system_log($_SESSION['user']->guid, "login", "", 'user', '', 1);
+
+if ($log) {
+       $logged_in=$log[0]->time_created;
+}
 
-       $user = $_SESSION['user'];
-       
-       $logged_in = 0;
-       $log = get_system_log($_SESSION['user']->guid, "login", "", 'user', '', 1);
-       
-       if ($log)
-               $logged_in=$log[0]->time_created;
-       
 ?>
 <div class="usersettings_statistics">
        <h3><?php echo elgg_echo('usersettings:statistics:yourdetails'); ?></h3>
-       
+
        <table>
                <tr class="odd"><td class="column_one"><?php echo elgg_echo('usersettings:statistics:label:name'); ?></td><td><?php echo $user->name; ?></td></tr>
                <tr class="even"><td class="column_one"><?php echo elgg_echo('usersettings:statistics:label:email'); ?></td><td><?php echo $user->email; ?></td></tr>
index 15c5adc7fae9b7dab7ba2410a6cabc4361f76852..e48ee6ecc832a6c136be19f302fe296dbba1e974 100644 (file)
@@ -1,3 +1,8 @@
 <?php
-
+/**
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
 ?>
\ No newline at end of file
index 1ae060d49f7a9a3ea96bc2754805b391c5ffe146..b84bfb50dafe44f56af64cd0af143756af1dcab8 100644 (file)
@@ -1,20 +1,15 @@
 <?php
+/**
+ * Elgg sample welcome page
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
 
-    /**
-        * Elgg sample welcome page
-        * 
-        * @package Elgg
-        * @subpackage Core
-
-        * @author Curverider Ltd
-
-        * @link http://elgg.org/
-        */
-        
-       if (isloggedin()) {
-               echo elgg_view("welcome/logged_in");            
-       } else {
-               echo elgg_view("welcome/logged_out");
-       }
-        
-?>
\ No newline at end of file
+if (isloggedin()) {
+       echo elgg_view("welcome/logged_in");
+} else {
+       echo elgg_view("welcome/logged_out");
+}
\ No newline at end of file
index 14681cfc92f530ae5e0f6d54207240ff6a2dc7ac..8f70d300595ad1bf3ef8c34a14fed3f0682705fb 100644 (file)
@@ -1,27 +1,21 @@
 <?php
+/**
+ * Elgg sample welcome page (logged in)
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
 
-       /**
-        * Elgg sample welcome page (logged in)
-        * 
-        * @package Elgg
-        * @subpackage Core
-        * @author Curverider Ltd
-        * @link http://elgg.org/
-        */
+//add various views to area1
+$area1 = "<h2>" . sprintf(elgg_echo("welcome:user"),$vars['user']->name) . "</h2>";
+$area1 .= "<p>" . elgg_echo("welcome_message") . "</p><br />";
+$url = $vars['url'] . "action/logout";
+$area1 .= "<a href=" . $url . ">" . elgg_echo('logout') . "</a>";
 
-?>
+//send area one to the appropriate canvas layout
+$body = elgg_view_layout("one_column", $area1);
 
-       <?php
-
-               //add various views to area1
-               $area1 = "<h2>" . sprintf(elgg_echo("welcome:user"),$vars['user']->name) . "</h2>"; 
-               $area1 .= "<p>" . elgg_echo("welcome_message") . "</p><br />";
-               $url = $vars['url'] . "action/logout";
-               $area1 .= "<a href=" . $url . ">" . elgg_echo('logout') . "</a>";
-
-               //send area one to the appropriate canvas layout
-               $body = elgg_view_layout("one_column", $area1);
-
-               //draw to screen
-               echo $body;     
-       ?>
\ No newline at end of file
+//draw to screen
+echo $body;
\ No newline at end of file
index c3981c404041f8adc82e48c37b9e05737d22fabb..a7b62cf453b6403f1bf6381db3b46cdf72c3c431 100644 (file)
@@ -1,22 +1,16 @@
 <?php
+/**
+ * Elgg sample welcome page (logged out)
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
 
-       /**
-        * Elgg sample welcome page (logged out)
-        * 
-        * @package Elgg
-        * @subpackage Core
-        * @author Curverider Ltd
-        * @link http://elgg.org/
-        */
+//add various views to area1
+$area1 = "<p>" . elgg_echo("welcome_message") . "</p>";
+$area1 .= elgg_view("account/forms/login");
 
-?>
-
-       <?php
-
-               //add various views to area1
-               $area1 = "<p>" . elgg_echo("welcome_message") . "</p>";
-               $area1 .= elgg_view("account/forms/login");
-
-               //draw to screen
-               echo $body;     
-       ?>
\ No newline at end of file
+//draw to screen
+echo $body;
\ No newline at end of file
index 75e96602824453849b852fe9ea1af05654f39605..8ed29dd59035528b2d170f310b34e563cc5bf6c9 100644 (file)
@@ -1,37 +1,31 @@
 <?php
-
-       /**
-        * Elgg edit widget layout
-        * 
-        * @package Elgg
-        * @subpackage Core
-
-        * @author Curverider Ltd
-
-        * @link http://elgg.org/
-        */
-
-       $guid = $vars['entity']->getGUID();
-
-       
-       $form_body = $vars['body'];
-       $form_body .= "<p><label>" . elgg_echo('access') . ": " . elgg_view('input/access', array('internalname' => 'params[access_id]','value' => $vars['entity']->access_id)) . "</label></p>";
-       $form_body .= "<p>" . elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $guid)) . elgg_view('input/hidden', array('internalname' => 'noforward', 'value' => 'true')) . elgg_view('input/submit', array('internalname' => "submit$guid", 'value' => elgg_echo('save'))) . "</p>";
-
-       echo elgg_view('input/form', array('internalid' => "widgetform$guid", 'body' => $form_body, 'action' => "{$vars['url']}action/widgets/save"))   
+/**
+ * Elgg edit widget layout
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
+
+$guid = $vars['entity']->getGUID();
+
+$form_body = $vars['body'];
+$form_body .= "<p><label>" . elgg_echo('access') . ": " . elgg_view('input/access', array('internalname' => 'params[access_id]','value' => $vars['entity']->access_id)) . "</label></p>";
+$form_body .= "<p>" . elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $guid)) . elgg_view('input/hidden', array('internalname' => 'noforward', 'value' => 'true')) . elgg_view('input/submit', array('internalname' => "submit$guid", 'value' => elgg_echo('save'))) . "</p>";
+
+echo elgg_view('input/form', array('internalid' => "widgetform$guid", 'body' => $form_body, 'action' => "{$vars['url']}action/widgets/save"))
 ?>
-
-
 <script type="text/javascript">
 $(document).ready(function() {
 
        $("#widgetform<?php echo $guid; ?>").submit(function () {
-       
+
                $("#submit<?php echo $guid; ?>").attr("disabled","disabled");
                $("#submit<?php echo $guid; ?>").attr("value","<?php echo elgg_echo("saving"); ?>");
                $("#widgetcontent<?php echo $guid; ?>").html('<?php echo elgg_view('ajax/loader',array('slashes' => true)); ?>');
                $("#widget<?php echo $guid; ?> .toggle_box_edit_panel").click();
-       
+
                var variables = $("#widgetform<?php echo $guid; ?>").serialize();
                $.post($("#widgetform<?php echo $guid; ?>").attr("action"),variables,function() {
                        $("#submit<?php echo $guid; ?>").attr("disabled","");
@@ -39,8 +33,8 @@ $(document).ready(function() {
                        $("#widgetcontent<?php echo $guid; ?>").load("<?php echo $vars['url']; ?>pg/view/<?php echo $guid; ?>?shell=no&username=<?php echo page_owner_entity()->username; ?>&context=<?php echo get_context(); ?>&callback=true");
                });
                return false;
-       
+
        });
 
-}); 
+});
 </script>
\ No newline at end of file
index e7791bde98bde601ef85f588a4552dabb836da74..eeb6d1cd195e53dc1cdd888c5bd8eaa6ba6c96c2 100644 (file)
@@ -1,35 +1,35 @@
 <?php
-
-       /**
-        * Elgg widget wrapper
-        * 
-        * @package Elgg
-        * @subpackage Core
-
-        * @author Curverider Ltd
-
-        * @link http://elgg.org/
-        */
-
-       static $widgettypes;
-       
-       $callback = get_input('callback');
-       
-       if (!isset($widgettypes)) $widgettypes = get_widget_types();
-       
-       if ($vars['entity'] instanceof ElggObject && $vars['entity']->getSubtype() == 'widget') {
-               $handler = $vars['entity']->handler;
-               $title = $widgettypes[$vars['entity']->handler]->name;
-               if (!$title)
-                       $title = $handler;
-       } else {
-               $handler = "error";
-               $title = elgg_echo("error"); 
+/**
+ * Elgg widget wrapper
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
+
+static $widgettypes;
+
+$callback = get_input('callback');
+
+if (!isset($widgettypes)) {
+       $widgettypes = get_widget_types();
+}
+
+if ($vars['entity'] instanceof ElggObject && $vars['entity']->getSubtype() == 'widget') {
+       $handler = $vars['entity']->handler;
+       $title = $widgettypes[$vars['entity']->handler]->name;
+       if (!$title) {
+               $title = $handler;
        }
-       
-       if ($callback != "true") {
-       
-?>
+} else {
+       $handler = "error";
+       $title = elgg_echo("error");
+}
+
+if ($callback != "true") {
+
+       ?>
 
        <div id="widget<?php echo $vars['entity']->getGUID(); ?>">
        <div class="collapsable_box">
        </div>
        <?php
 
-               if ($vars['entity']->canEdit()) {
-       
-       ?>
-       <div class="collapsable_box_editpanel"><?php 
-               
-               echo elgg_view('widgets/editwrapper', 
-                                               array(
-                                                               'body' => elgg_view("widgets/{$handler}/edit",$vars),
-                                                               'entity' => $vars['entity']
-                                                         )
-                                          ); 
-               
-       ?></div><!-- /collapsable_box_editpanel -->
-       <?php
+       if ($vars['entity']->canEdit()) {
+               ?>
+               <div class="collapsable_box_editpanel"><?php
 
-               }
-       
-       ?>
-       <div class="collapsable_box_content">
-               <?php 
+               echo elgg_view('widgets/editwrapper',
+               array(
+                       'body' => elgg_view("widgets/{$handler}/edit",$vars),
+                       'entity' => $vars['entity']
+                       )
+               );
 
-               echo "<div id=\"widgetcontent{$vars['entity']->getGUID()}\">";
-               
-               
-       } else { // end if callback != "true"
+               ?></div><!-- /collapsable_box_editpanel -->
+               <?php
+       }
 
-               if (elgg_view_exists("widgets/{$handler}/view"))
-                       echo elgg_view("widgets/{$handler}/view",$vars);
-               else
-                       echo elgg_echo('widgets:handlernotfound');
+       ?>
+       <div class="collapsable_box_content">
+       <?php
 
-?>
+       echo "<div id=\"widgetcontent{$vars['entity']->getGUID()}\">";
+} else { // end if callback != "true"
+       if (elgg_view_exists("widgets/{$handler}/view")) {
+               echo elgg_view("widgets/{$handler}/view",$vars);
+       } else {
+               echo elgg_echo('widgets:handlernotfound');
+       }
 
-<script language="javascript">
- $(document).ready(function(){
-       setup_avatar_menu();
- });
+       ?>
 
-</script>
+       <script language="javascript">
+       $(document).ready(function(){
+               setup_avatar_menu();
+       });
 
+       </script>
+       <?php
+}
 
-<?php
-               
-       }
-               
-       if ($callback != "true") {
+if ($callback != "true") {
                echo elgg_view('ajax/loader');
                echo "</div>";
-               
+
                ?>
        </div><!-- /.collapsable_box_content -->
-       </div><!-- /.collapsable_box -->        
+       </div><!-- /.collapsable_box -->
        </div>
-       
+
 <script type="text/javascript">
 $(document).ready(function() {
 
@@ -105,9 +98,7 @@ $(document).ready(function() {
 
 });
 </script>
-       
-<?php
 
-       }
+<?php
 
-?>
\ No newline at end of file
+}
\ No newline at end of file