Pulled in the interface changes.

git-svn-id: http://code.elgg.org/elgg/trunk@5257 36083f99-b078-4883-b0ff-0f9b5a30f544

2 files changed, 217 insertions, 0 deletions

diff --git a/mod/custom_index/views/default/canvas/layouts/new_index.php b/mod/custom_index/views/default/canvas/layouts/new_index.php
new file mode 100644
index 000000000..e1b48ec0c
--- /dev/null
+++ b/mod/custom_index/views/default/canvas/layouts/new_index.php
@@ -0,0 +1,131 @@
+<?php
+
+	/**
+	 * Elgg custom profile 
+	 * You can edit the layout of this page with your own layout and style. Whatever you put in the file
+	 * will replace the frontpage of your Elgg site.
+	 * 
+	 * @package Elgg
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 */
+	 
+?>
+
+<div id="custom_index">
+
+    <!-- left column content -->
+    <div id="index_left">
+        <!-- welcome message -->
+        <div id="index_welcome"> 
+        	<?php
+        		if (isloggedin()){
+	        		echo "<h2>" . elgg_echo("welcome") . " ";
+        			echo $vars['user']->name;
+        			echo "</h2>";
+    			}
+        	?>
+            <?php
+            	//include a view that plugins can extend
+            	echo elgg_view("index/lefthandside");
+            ?>
+	        <?php
+	            //this displays some content when the user is logged out
+			    if (!isloggedin()){
+	            	//display the login form
+			    	echo $vars['area1'];
+			    	echo "<div class=\"clearfloat\"></div>";
+		        }
+	        ?>
+        </div>
+<?php
+    if(is_plugin_enabled('file')){
+?> 	
+        <!-- display latest files -->
+        <div class="index_box">
+            <h2><?php echo elgg_echo("custom:files"); ?></h2>
+            <?php 
+                if (!empty($vars['area2'])) {
+                    echo $vars['area2'];//this will display files
+                }else{
+                    echo "<p><?php echo elgg_echo('custom:nofiles'); ?></p>";
+                }
+            ?>
+        </div>
+<?php
+	}
+	
+    if(is_plugin_enabled('groups')){
+?> 
+        <!-- display latest groups -->
+	    <div class="index_box">
+            <h2><?php echo elgg_echo("custom:groups"); ?></h2>
+        <?php 
+                if (!empty($vars['area5'])) {
+                    echo $vars['area5'];//this will display groups
+                }else{
+                    echo "<p><?php echo elgg_echo('custom:nogroups'); ?>.</p>";
+                }
+            ?>
+    	</div>
+<?php
+	}
+?>
+    </div>
+    
+    <!-- right hand column -->
+    <div id="index_right">
+        <!-- more content -->
+	    <?php
+            //include a view that plugins can extend
+            echo elgg_view("index/righthandside");
+        ?>
+        <!-- latest members -->
+        <div class="index_box">
+            <h2><?php echo elgg_echo("custom:members"); ?></h2>
+            <div class="contentWrapper">
+            <?php 
+                if(isset($vars['area3'])) {
+                    //display member avatars
+                    foreach($vars['area3'] as $members){
+                        echo "<div class=\"index_members\">";
+                        echo elgg_view("profile/icon",array('entity' => $members, 'size' => 'small'));
+                        echo "</div>";
+                    }
+                }
+            ?>
+	        <div class="clearfloat"></div>
+	        </div>
+        </div>
+<?php
+    if(is_plugin_enabled('blog')){
+?> 
+        <!-- latest blogs -->
+        <div class="index_box">
+            <h2><?php echo elgg_echo("custom:blogs"); ?></h2>
+            <?php 
+                if (isset($vars['area4'])) 
+                    echo $vars['area4']; //display blog posts
+            ?>
+        </div>
+<?php
+	}
+
+    if(is_plugin_enabled('bookmarks')){
+?>
+        <!-- display latest bookmarks -->
+    	<div class="index_box">
+            <h2><?php echo elgg_echo("custom:bookmarks"); ?></h2>
+            <?php 
+                if (isset($vars['area6'])) 
+                    echo $vars['area6']; //display bookmarks
+            ?>
+        </div>
+<?php
+	}
+?>
+    </div>
+    <div class="clearfloat"></div>
+</div>
\ No newline at end of file
diff --git a/mod/custom_index/views/default/custom_index/css.php b/mod/custom_index/views/default/custom_index/css.php
new file mode 100644
index 000000000..9c35aaa27
--- /dev/null
+++ b/mod/custom_index/views/default/custom_index/css.php
@@ -0,0 +1,86 @@
+<?php
+	/**
+	 * Custom Index page css extender
+	 * 
+	 * @package custom_index
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+?>
+
+#custom_index {
+	margin:10px;
+}
+#index_left {
+    width:442px;
+    float:left;
+    margin:0 0 30px 0;
+    padding:0 0 20px 0px;
+}
+#index_right {
+    width:442px;
+    float:right;
+    margin:0 0 30px 0;
+    padding:0 0px 20px 0;
+}
+#index_welcome {
+	padding:5px 10px 5px 10px;
+	margin:0 0 20px 0;
+	border:1px solid silver;
+	background: white;
+	-moz-border-radius: 8px;
+	-webkit-border-radius: 8px; 
+}
+#index_welcome #login-box {
+	margin:5px 0 10px 0;
+	padding:0 0 10px 0;
+	background: #dedede;
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;
+	width:240px;
+}
+#index_welcome #login-box form {
+	margin:0 10px 0 10px;
+	padding:0 10px 4px 10px;
+	background: white;
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;
+	width:200px;
+}
+#index_welcome #login-box h2,
+.index_box h2 {
+	color:#0054A7;
+	font-size:1.35em;
+	line-height:1.2em;
+	margin:0 0 0 8px;
+	padding:5px;
+}
+#index_welcome #login-box h2 {
+	padding-bottom:5px;
+}
+
+.index_box {
+	margin:0 0 20px 0;
+	background: #dedede;
+	padding:0 0 5px 0;
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;
+}
+
+.index_box .search_listing {
+
+}
+.index_box .index_members {
+	float:left;
+	margin:2pt 5px 3px 0pt;
+}
+#persistent_login {
+	float:right;
+	display:block;
+	margin-top:-34px;
+}
+
+
+