basic skin added

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

8 files changed, 206 insertions, 33 deletions

diff --git a/graphics/blockquote.png b/graphics/blockquote.png
new file mode 100644
index 000000000..3fd144f59
--- /dev/null
+++ b/graphics/blockquote.png
diff --git a/graphics/footer.gif b/graphics/footer.gif
new file mode 100644
index 000000000..450458751
--- /dev/null
+++ b/graphics/footer.gif
diff --git a/graphics/header.gif b/graphics/header.gif
new file mode 100644
index 000000000..410baff22
--- /dev/null
+++ b/graphics/header.gif
diff --git a/graphics/sidebar-bottom.gif b/graphics/sidebar-bottom.gif
new file mode 100644
index 000000000..b89f99b29
--- /dev/null
+++ b/graphics/sidebar-bottom.gif
diff --git a/graphics/sidebar-top.gif b/graphics/sidebar-top.gif
new file mode 100644
index 000000000..84f7e628a
--- /dev/null
+++ b/graphics/sidebar-top.gif
diff --git a/views/default/css.php b/views/default/css.php
index 82d742eaf..2636c25cf 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -7,7 +7,7 @@
 	 * @package Elgg

 	 * @subpackage Core

 	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2

-	 * @author Curverider Ltd

+	 * @author (s) David Tosh / Pete Harris

 	 * @copyright Curverider Ltd 2008

 	 * @link http://elgg.org/

 	 * 

@@ -20,28 +20,110 @@
     Default Elgg CSS

 */

 

+/*

+  Globals

+*/

+

 body {

-    background:#fff;

-    color:#000;

-    margin:20px center;

-    text-align:center;

+    background:#fff url(<?php echo $vars['url']; ?>/graphics/header.gif) repeat-x; /* #d9e2f2  */

+	color:#697C83;

+	font-family:'Trebuchet MS','Lucida Grande', Arial, sans-serif;

+	text-align:left;

+	margin:0 auto;

+	padding:0;

+	font-size: 80%;

+	line-height:1.6em;

 }

 

-#container {

-    width:990px;

-    border-left:2px solid #555;

-    border-right:2px solid #555;

-    margin:auto;

+p {

+	color:#555;

+	margin:0 0 10px 0;

 }

 

-#header {

-    margin:0 0 20px 0;

-    padding:10px;

-    text-align:left;

-    position:relative;

-    border-bottom:1px solid #555;

+a {

+	text-decoration:none;

+	color:#336699;

+}

+

+ol, ul {

+	color:#697C83;

+}

+

+h1 {

+	font-size:130%;

+}

+

+h2, h3, h4, h5 {

+	font-size:100%;

+}

+

+blockquote{

+	background: #EEE url(<?php echo $vars['url']; ?>/graphics/blockquote.png) no-repeat bottom left;

+	padding: 10px;

+	padding-bottom: 40px;

+	margin: 1em;

+}

+

+/******* End of globals *************/

+

+/*

+	TABLES IN ELGG

+*/

+

+td {

+	border:1px solid #eee;

+	padding:0;

+	margin:0;

+}

+

+td h4, h3, h5 {

+	padding:0;

+	margin:0;

 }

 

+/******** end tables **************/

+

+/*

+	CONTAINER: WRAPS THE HEADER AND MAIN CONTENT AREA BELOW THE USER TOOLBAR

+*/

+

+div#container {

+	width:970px;

+	margin:0 auto;

+	padding:0;

+}

+

+/*

+	HEADER: THE HEADER INCLUDES THE LOGO AND SEARCH BAR

+*/

+

+div#header {

+	margin:0;

+	padding:0;

+	text-align:left;

+	position:relative;

+	background:transparent;

+	width:100%;

+	height:120px;

+}

+

+div#header h1 {

+	font-size:30px;

+	padding:20px 0 0 0;

+	margin:10px 0 6px 0;

+}

+

+div#header h1 a{

+	color:#fff;

+	font-family:Helvetica, "Myriad Web", Arial, sans-serif;

+}

+

+/**** End header ****/

+

+/*

+  Topmenu

+*/

+

 #topmenu {

     position:absolute;

     top:2px;

@@ -53,37 +135,127 @@ body {
     list-style:none;

 }

 

-#sidebar_toolbox {

-    float:left;

+#topmenu li a {

+    color:#fff;

+}

+

+/**** end top menu ****/

+

+/*

+    sidebar menu

+*/

+

+#sidebar_menu {

+ /*   float:left;

     width:150px;

     background:#efefef;

     padding:5px;

     text-align:left;

     text-size:10px;

-    margin:0;

+    margin:0; */

+}

+

+div#sidebar_menu {

+	width: 250px;

+	margin:20px 10px 20px 0;

+	padding:0;

+	float: right;

+	background:#efefef url(<?php echo $vars['url']; ?>/graphics/sidebar-top.gif) no-repeat top;

+}

+

+div#sidebar-menu-bottom {

+   background:url(<?php echo $vars['url']; ?>/graphics/sidebar-bottom.gif) no-repeat bottom;

+   height:9px;

+   width:250px;

+   margin:0;

+}

+

+div#sidebar-contents {

+    padding:10px;

+}

+

+div#sidebar_menu ul {

+	margin: 0;

+	padding:0;

+	list-style: none;

+}

+

+div#sidebar_menu ul li {

+	margin:10px 0;

+	padding-left: 5px;

+}

+

+div#sidebar_menu ul li ul li a {

+	padding:0 0 0 5px;

+}

+

+div#sidebar_menu h2 {

+	text-align:left;

+	border-bottom:1px solid #ccc;

+	color:#777;

+	font-size:0.9em;

+	width:220px;

 }

 

-#mainContent_nosidebar {

-    margin:0 0 0 180px;

-    width:750px;

+

+/**** end sidebar menu ****/

+

+#mainContent {

+    margin:0;

+    width:680px;

     padding:20px;

 }

 

 #login-box {

     text-align:left;

-    background:#555;

     border:1px solid #ddd;

     width:300px;

     padding:10px;

-    color:#fff;

 }

 

-#footer {

-    border-top:1px solid #555;

-    margin:20px 0 0 0;

-    padding:10px;

+/*

+	FOOTER

+*/

+

+div#footer {

+	clear: both;

+	position: relative;

+	font-size:1em;

+	height:26px;

+	margin:20px 0 0 0;

+	color:#174764;

+	font-weight:bold;

+	width:100%;

+	padding:3px 0 0 0;

+	background:url(<?php echo $vars['url']; ?>/graphics/footer.gif) repeat-x;

 }

 

+div#footer img {

+   text-align:right;

+   padding:3px 0 0 0;

+}

+

+div#footer p {

+   padding:0 20px 0 20px;

+}

+

+div#footer a {

+	color:#fff;

+	padding:0 5px 0 5px;

+}

+

+div#footer a:hover {

+	text-decoration:underline;

+}

+

+div#footer a:link, div#footer a:visited {

+	text-align:right;

+}

+

+/*

+  System messages

+*/

+

 .messages {

     border:1px solid #D3322A;

     background:#F7DAD8;

diff --git a/views/default/page_elements/footer.php b/views/default/page_elements/footer.php
index 5c3ff09d2..dd6e9d764 100644
--- a/views/default/page_elements/footer.php
+++ b/views/default/page_elements/footer.php
@@ -13,7 +13,7 @@
 	 * 

 	 */

 ?>

-<div style="clear:both">

+<div style="clear:both"></div>

 </div><!-- close container div -->

 <div id="footer">

 <p><a href="http://elgg.com/">Elgg</a></p>

diff --git a/views/default/pageshells/pageshell.php b/views/default/pageshells/pageshell.php
index 2455db5b3..695d63b7f 100644
--- a/views/default/pageshells/pageshell.php
+++ b/views/default/pageshells/pageshell.php
@@ -36,13 +36,14 @@
     <!-- display any system messages -->

     <?php echo elgg_view('messages/list', array('object' => $vars['sysmessages'])); ?>

     

-    <!-- toolbox -->

-    <div id="sidebar_toolbox">

-        <?php echo elgg_view("navigation/toolbox", $vars); ?><!-- include the my world toolbox -->

+    <!-- sidebar menu -->

+    <div id="sidebar_menu">

+        <?php echo elgg_view("navigation/sidebar_menu", $vars); ?>

+        <div id="sidebar-menu-bottom"></div><!-- this just displays rounded corners on the menu options, can be deleted safely -->

     </div>

     

     <!-- get the main body -->

-    <div id="mainContent_nosidebar">

+    <div id="mainContent">

         <?php echo $vars['body']; ?>

     </div>