Merge branch 'lorea-preprod'

Conflicts:
	.gitmodules

37 files changed, 91 insertions, 572 deletions

diff --git a/mod/developers/views/default/page/theme_preview.php b/mod/developers/views/default/page/theme_preview.php
index 5b31fd789..584387ec1 100644
--- a/mod/developers/views/default/page/theme_preview.php
+++ b/mod/developers/views/default/page/theme_preview.php
@@ -20,7 +20,7 @@ header("Content-type: text/html; charset=UTF-8");
 <div class="elgg-page elgg-page-default">
 	<div class="elgg-page-header">
 		<div class="elgg-inner">
-			<h1 class="elgg-heading-site">Theme Preview</h1>
+			<h1 class="elgg-heading-site">Theme Sandbox</h1>
 		</div>
 	</div>
 	<div class="elgg-page-body">
diff --git a/mod/developers/views/default/theme_preview/buttons.php b/mod/developers/views/default/theme_preview/buttons.php
deleted file mode 100644
index 718d88617..000000000
--- a/mod/developers/views/default/theme_preview/buttons.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<table class="elgg-table">
-	<thead>
-		<tr>
-			<th></th>
-			<th>Default</th>
-			<th>Disabled (.elgg-state-disabled)</th>
-		</tr>
-	</thead>
-	<tbody>
-		<tr>
-			<th>Base (.elgg-button)</th>
-			<td><a href="#" class="elgg-button">anchor</a></td>
-			<td><a href="#" class="elgg-button elgg-state-disabled">anchor</a></td>
-		</tr>
-		<tr>
-			<th>Action (.elgg-button-action)</th>
-			<td><a href="#" class="elgg-button elgg-button-action">anchor</a></td>
-			<td><a href="#" class="elgg-button elgg-button-action elgg-state-disabled">anchor</a></td>
-		</tr>
-		<tr>
-			<th>Cancel (.elgg-button-cancel)</th>
-			<td><a href="#" class="elgg-button elgg-button-cancel">anchor</a></td>
-			<td><a href="#" class="elgg-button elgg-button-cancel elgg-state-disabled">anchor</a></td>
-		</tr>
-		<tr>
-			<th>Submit (.elgg-button-submit)</th>
-			<td><a href="#" class="elgg-button elgg-button-submit">anchor</a></td>
-			<td><a href="#" class="elgg-button elgg-button-submit elgg-state-disabled">anchor</a></td>
-		</tr>
-		<tr>
-			<th>Special (.elgg-button-special)</th>
-			<td><a href="#" class="elgg-button elgg-button-special">anchor</a></td>
-			<td><a href="#" class="elgg-button elgg-button-special elgg-state-disabled">anchor</a></td>
-		</tr>
-		<tr>
-			<th>Delete (.elgg-button-delete)</th>
-			<td><a href="#" class="elgg-button elgg-button-delete">anchor</a></td>
-			<td><a href="#" class="elgg-button elgg-button-delete elgg-state-disabled">anchor</a></td>
-		</tr>
-	</tbody>
-</table>
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/components.php b/mod/developers/views/default/theme_preview/components.php
index 45f520f2c..2f414cd88 100644
--- a/mod/developers/views/default/theme_preview/components.php
+++ b/mod/developers/views/default/theme_preview/components.php
@@ -15,5 +15,11 @@ echo elgg_view_module('info', 'Table (.elgg-table)', $body);
 $body = elgg_view('theme_preview/components/table', array('class' => 'elgg-table-alt'));
 echo elgg_view_module('info', 'Table Alternate (.elgg-table-alt)', $body);
 
+$body = elgg_view('theme_preview/components/tagcloud');
+echo elgg_view_module('info', 'Tag cloud (.elgg-tagcloud)', $body);
+
+$body = elgg_view('theme_preview/components/tags');
+echo elgg_view_module('info', 'Tags (.elgg-tag)', $body);
+
 $body = elgg_view('theme_preview/components/messages');
 echo elgg_view_module('info', 'Messages (.elgg-message)', $body);
diff --git a/mod/developers/views/default/theme_preview/components/image_block.php b/mod/developers/views/default/theme_preview/components/image_block.php
deleted file mode 100644
index 0bb16428b..000000000
--- a/mod/developers/views/default/theme_preview/components/image_block.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php

-$ipsum = elgg_view('developers/ipsum');

-

-$user = new ElggUser();

-$image = elgg_view_entity_icon($user, 'small');

-echo elgg_view_image_block($image, "$ipsum $ipsum $ipsum $ipsum $ipsum $ipsum $ipsum");

diff --git a/mod/developers/views/default/theme_preview/components/list.php b/mod/developers/views/default/theme_preview/components/list.php
deleted file mode 100644
index 8096bda04..000000000
--- a/mod/developers/views/default/theme_preview/components/list.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php

-

-$obj1 = new ElggObject();

-$obj1->title = "Object 1";

-$obj1->description = $ipsum;

-

-$obj2 = new ElggObject();

-$obj2->title = "Object 2";

-$obj2->description = $ipsum;

-

-$obj3 = new ElggObject();

-$obj3->title = "Object 3";

-$obj3->description = $ipsum;

-

-$obj4 = new ElggObject();

-$obj4->title = "Object 4";

-$obj4->description = $ipsum;

-

-echo elgg_view('page/components/list', array('items' => array($obj1, $obj2, $obj3, $obj4)));

diff --git a/mod/developers/views/default/theme_preview/components/messages.php b/mod/developers/views/default/theme_preview/components/messages.php
deleted file mode 100644
index ac4d2bfd7..000000000
--- a/mod/developers/views/default/theme_preview/components/messages.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<ul>

-	<li class="elgg-message elgg-state-success mas">Success message (.elgg-state-success)</li>

-	<li class="elgg-message elgg-state-error mas">Error message (.elgg-state-error)</li>

-	<li class="elgg-message elgg-state-notice mas">Notice message (.elgg-state-notice)</li>

-</ul>

diff --git a/mod/developers/views/default/theme_preview/components/table.php b/mod/developers/views/default/theme_preview/components/table.php
deleted file mode 100644
index 8b8b13e76..000000000
--- a/mod/developers/views/default/theme_preview/components/table.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<table class="<?php echo $vars['class']; ?>">

-<?php

-	echo "<thead><tr><th>column 1</th><th>column 2</th></tr></thead>";

-	for ($i = 1; $i < 5; $i++) {

-		echo '<tr>';

-		for ($j = 1; $j < 3; $j++) {

-			echo "<td>value $j</td>";

-		}

-		echo '</tr>';

-	}

-?>

-</table>
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/components/tagcloud.php b/mod/developers/views/default/theme_preview/components/tagcloud.php
new file mode 100644
index 000000000..3cbf34745
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/components/tagcloud.php
@@ -0,0 +1,17 @@
+<?php
+
+$tags = array(
+	(object)array('tag' => 'php', 'total' => 2),
+	(object)array('tag' => 'elgg', 'total' => 8),
+	(object)array('tag' => 'javascript', 'total' => 3),
+	(object)array('tag' => 'css', 'total' => 4),
+	(object)array('tag' => 'html', 'total' => 1),
+	(object)array('tag' => 'framework', 'total' => 4),
+	(object)array('tag' => 'social', 'total' => 3),
+	(object)array('tag' => 'web', 'total' => 7),
+	(object)array('tag' => 'code', 'total' => 2),
+);
+
+echo '<div style="width: 200px;">';
+echo elgg_view('output/tagcloud', array('value' => $tags));
+echo '</div>';
diff --git a/mod/developers/views/default/theme_preview/components/tags.php b/mod/developers/views/default/theme_preview/components/tags.php
new file mode 100644
index 000000000..04df9511a
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/components/tags.php
@@ -0,0 +1,5 @@
+<?php
+
+echo elgg_view('output/tags', array(
+	'value' => array('one', 'two', 'three', 'four', 'cinco'),
+));
diff --git a/mod/developers/views/default/theme_preview/forms.php b/mod/developers/views/default/theme_preview/forms.php
deleted file mode 100644
index ffb77f3a9..000000000
--- a/mod/developers/views/default/theme_preview/forms.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<form action="#">
-	<fieldset>
-		<legend>Fieldset Legend</legend>
-		<div>
-			<label for="f1">Text input (.elgg-input-text):</label>
-			<?php echo elgg_view('input/text', array(
-					'name' => 'f1',
-					'id' => 'f1',
-					'value' => 'input text',
-					));
-			?>
-		</div>
-		<div>
-			<label for="f2">Password input (.elgg-input-password):</label>
-			<?php echo elgg_view('input/password', array(
-					'name' => 'f2',
-					'id' => 'f2',
-					'value' => 'password',
-					));
-			?>
-		</div>
-		<div>
-			<label for="f3">Radio input (.elgg-input-radios):</label><br />
-			<?php echo elgg_view('input/radio', array(
-					'name' => 'f3',
-					'id' => 'f3',
-					'options' => array('a (.elgg-input-radio)' => 1, 'b (.elgg-input-radio)' => 2),
-					));
-			?>
-		</div>
-		<div>
-			<label for="f4">Checkboxes input (.elgg-input-checkboxes):</label><br />
-			<?php echo elgg_view('input/checkboxes', array(
-					'name' => 'f4',
-					'id' => 'f4',
-					'options' => array('a (.elgg-input-checkbox)' => 1, 'b (.elgg-input-checkbox)' => 2),
-					));
-			?>
-		</div>
-		<div>
-			<label for="f5">Dropdown input (.elgg-input-dropdown):</label><br />
-			<?php echo elgg_view('input/dropdown', array(
-					'name' => 'f5',
-					'id' => 'f5',
-					'options' => array('option 1', 'option 2'),
-					));
-			?>
-		</div>
-		<div>
-			<label for="f6">Access input (.elgg-input-access):</label><br />
-			<?php echo elgg_view('input/access', array(
-					'name' => 'f6',
-					'id' => 'f6',
-					'value' => ACCESS_PUBLIC,
-					));
-			?>
-		</div>
-		<div>
-			<label for="f7">File input (.elgg-input-file):</label>
-			<?php echo elgg_view('input/file', array(
-					'name' => 'f7',
-					'id' => 'f7',
-					));
-			?>
-		</div>
-		<div>
-			<label for="f8">URL input (.elgg-input-url):</label>
-			<?php echo elgg_view('input/url', array(
-					'name' => 'f8',
-					'id' => 'f8',
-					'value' => 'http://elgg.org/',
-					));
-			?>
-		</div>
-		<div>
-			<label for="f9">Tags input (.elgg-input-tags):</label>
-			<?php echo elgg_view('input/tags', array(
-					'name' => 'f9',
-					'id' => 'f9',
-					'value' => 'one, two, three',
-					));
-			?>
-		</div>
-		<div>
-			<label for="f10">Email input (.elgg-input-email):</label>
-			<?php echo elgg_view('input/email', array(
-					'name' => 'f10',
-					'id' => 'f10',
-					'value' => 'noone@elgg.org',
-					));
-			?>
-		</div>
-		<div>
-			<label for="f11">Autocomplete input (.elgg-input-autocomplete):</label>
-			<?php echo elgg_view('input/autocomplete', array(
-					'name' => 'f11',
-					'id' => 'f11',
-					'match_on' => 'users',
-					));
-			?>
-		</div>
-		<div>
-			<label for="f12">Date input (.elgg-input-date):</label>
-			<?php echo elgg_view('input/date', array(
-					'name' => 'f12',
-					'id' => 'f12',
-					'value' => '2012-12-31',
-					));
-			?>
-		</div>
-		<div>
-			<label for="f13">User picker input (.elgg-user-picker):</label>
-			<?php echo elgg_view('input/userpicker', array(
-					'name' => 'f13',
-					'id' => 'f13',
-					));
-			?>
-		</div>
-		<div>
-			<label for="f15">Plain textarea input (.elgg-input-plaintext):</label>
-			<?php echo elgg_view('input/plaintext', array(
-					'name' => 'f15',
-					'id' => 'f15',
-					'value' => $ipsum,
-					));
-			?>
-		</div>
-		<div>
-			<label for="f14">Long textarea input (.elgg-input-longtext):</label>
-			<?php echo elgg_view('input/longtext', array(
-					'name' => 'f14',
-					'id' => 'f14',
-					'value' => $ipsum,
-					));
-			?>
-		</div>
-	</fieldset>
-</form>
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/general.php b/mod/developers/views/default/theme_preview/general.php
index 35d8ccbfd..629462873 100644
--- a/mod/developers/views/default/theme_preview/general.php
+++ b/mod/developers/views/default/theme_preview/general.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Quick introduction to the theme preview
+ * Quick introduction to the theme sandbox
  *
  * @todo links to resources?
  */
 ?>
 
-<p>This theme preview provides a visual catalog for many of the theming elements
+<p>This theme sandbox provides a visual catalog for many of the theming elements
 	that Elgg uses. The primary css selector is listed with each theme element.
 	The preview is divided into sections that are listed in the page menu
 	(usually in the sidebar but depends on your current theme).
diff --git a/mod/developers/views/default/theme_preview/grid.php b/mod/developers/views/default/theme_preview/grid.php
deleted file mode 100644
index 030e752e7..000000000
--- a/mod/developers/views/default/theme_preview/grid.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * Grid CSS
- */
-
-?>
-<style>
-h3 {text-align: center;}
-.elgg-col > .elgg-inner {border: 1px solid #cccccc; padding: 5px;}
-</style>
-
-<div class="elgg-col elgg-col-1of5">
-	<div class="elgg-inner">
-		<h3>1/5</h3>
-		<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
-		<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
-		<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
-	</div>
-</div>
-<div class="elgg-col elgg-col-3of5">
-	<div class="elgg-inner clearfix">
-		<h3>3/5</h3>
-		<div class="elgg-col elgg-col-1of2">
-			<div class="elgg-inner">
-				<h3>1/2</h3>
-				<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
-			</div>
-		</div>
-		<div class="elgg-col elgg-col-1of2">
-			<div class="elgg-inner">
-				<h3>1/2</h3>
-				<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
-			</div>
-		</div>
-		<div class="elgg-col elgg-col-1of3">
-			<div class="elgg-inner">
-				<h3>1/3</h3>
-				<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
-				<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
-			</div>
-		</div>
-		<div class="elgg-col elgg-col-2of3">
-			<div class="elgg-inner">
-				<h3>2/3</h3>
-				<div class="elgg-col elgg-col-1of2">
-					<div class="elgg-inner">
-						<h3>1/2</h3>
-						<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
-					</div>
-				</div>
-				<div class="elgg-col elgg-col-1of2">
-					<div class="elgg-inner">
-						<h3>1/2</h3>
-						<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
-					</div>
-				</div>
-				<div class="elgg-col elgg-col-1of1">
-					<div class="elgg-inner">
-						<h3>1</h3>
-						<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-<div class="elgg-col elgg-col-1of5 elgg-col-last">
-	<div class="elgg-inner">
-		<h3>1/5</h3>
-		<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
-		<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
-		<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
-	</div>
-</div>
-
-</div>
diff --git a/mod/developers/views/default/theme_preview/icons.php b/mod/developers/views/default/theme_preview/icons.php
deleted file mode 100644
index e1684c110..000000000
--- a/mod/developers/views/default/theme_preview/icons.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-/**
- * Icons CSS
- */
-
-echo elgg_view_module('info', 'Icon Sprites (.elgg-icon)', elgg_view('theme_preview/icons/sprites'));
-
-echo elgg_view_module('info', 'Ajax Loader (.elgg-ajax-loader)', elgg_view('theme_preview/icons/loader'));
-
-echo elgg_view_module('info', 'Avatars (.elgg-avatar)', elgg_view('theme_preview/icons/avatars'));
diff --git a/mod/developers/views/default/theme_preview/icons/avatars.php b/mod/developers/views/default/theme_preview/icons/avatars.php
deleted file mode 100644
index f50a6b70d..000000000
--- a/mod/developers/views/default/theme_preview/icons/avatars.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php

-	$user = new ElggUser();

-	$group = new ElggGroup();

-	

-	$sizes = array('large', 'medium', 'small', 'tiny');

-?>

-<table class="elgg-table">

-	<tr>

-		<th></th>

-		<?php

-			foreach ($sizes as $size) {

-				echo "<th>$size</th>";

-			}

-		?>

-	</tr>

-	<tr>

-		<th>User</th>

-		<?php

-			foreach ($sizes as $size) {

-				echo '<td>';

-				echo elgg_view_entity_icon($user, $size, array('use_hover' => false));

-				echo '</td>';

-			}

-		?>

-	</tr>

-	<tr>

-		<th>Group</th>

-		<?php

-			foreach ($sizes as $size) {

-				echo '<td>';

-				echo elgg_view_entity_icon($group, $size, array('use_hover' => false));

-				echo '</td>';

-			}

-		?>

-	</tr>

-</table>

diff --git a/mod/developers/views/default/theme_preview/icons/loader.php b/mod/developers/views/default/theme_preview/icons/loader.php
deleted file mode 100644
index e542da27c..000000000
--- a/mod/developers/views/default/theme_preview/icons/loader.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo elgg_view('graphics/ajax_loader', array('hidden' => false)); ?>
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/icons/sprites.php b/mod/developers/views/default/theme_preview/icons/sprites.php
deleted file mode 100644
index 134dd9aca..000000000
--- a/mod/developers/views/default/theme_preview/icons/sprites.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php 

-$icons = array(

-	'arrow-left',

-	'arrow-right',

-	'arrow-two-head',

-	'calendar',

-	'checkmark',

-	'clip',

-	'cursor-drag-arrow',

-	'delete-alt',

-	'delete',

-	'download',

-	'facebook',

-	'home',

-	'hover-menu',

-	'link',

-	'mail-alt',

-	'mail',

-	'print-alt',

-	'print',

-	'push-pin-alt',

-	'push-pin',

-	'redo',

-	'refresh',

-	'round-arrow-left',

-	'round-arrow-right',

-	'round-checkmark',

-	'round-minus',

-	'round-plus',

-	'rss',

-	'search-focus',

-	'search',

-	'settings-alt',

-	'settings',

-	'share',

-	'shop-cart',

-	'speech-bubble-alt',

-	'speech-bubble',

-	'star-alt',

-	'star-empty',

-	'star',

-	'tag',

-	'thumbs-down-alt',

-	'thumbs-down',

-	'thumbs-up-alt',

-	'thumbs-up',

-	'trash',

-	'twitter',

-	'undo',

-	'user',

-	'users',

-);

-?>

-

-<ul class="elgg-gallery">

-<?php 

-	foreach ($icons as $icon) {

-		echo "<li title=\".elgg-icon-$icon\" style=\"margin:10px\">" . elgg_view_icon($icon) . "</li>";

-	}

-?>

-</ul>
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/modules.php b/mod/developers/views/default/theme_preview/modules.php
deleted file mode 100644
index 3e0acb3a5..000000000
--- a/mod/developers/views/default/theme_preview/modules.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-echo elgg_view_module('info', 'Modules (.elgg-module)', elgg_view('theme_preview/modules/modules'));
-
-echo elgg_view_module('info', 'Widgets (.elgg-widget)', elgg_view('theme_preview/modules/widgets'));
-
diff --git a/mod/developers/views/default/theme_preview/modules/modules.php b/mod/developers/views/default/theme_preview/modules/modules.php
deleted file mode 100644
index e0d39c0da..000000000
--- a/mod/developers/views/default/theme_preview/modules/modules.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php 

-

-$ipsum = elgg_view('developers/ipsum');

-

-?>

-<div class="elgg-grid">

-	<div class="elgg-col elgg-col-1of2">

-		<div class="pam">

-			<?php

-				echo elgg_view_module('aside', 'Aside (.elgg-module-aside)', $ipsum);

-				echo elgg_view_module('popup', 'Popup (.elgg-module-popup)', $ipsum);

-			?>

-		</div>

-	</div>

-	<div class="elgg-col elgg-col-1of2">

-		<div class="pam">

-			<?php

-				echo elgg_view_module('info', 'Info (.elgg-module-info)', $ipsum);

-				echo elgg_view_module('featured', 'Featured (.elgg-module-featured)', $ipsum);

-			?>

-		</div>

-	</div>

-</div>
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/modules/widgets.php b/mod/developers/views/default/theme_preview/modules/widgets.php
deleted file mode 100644
index 8c9fd6483..000000000
--- a/mod/developers/views/default/theme_preview/modules/widgets.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Widgets CSS
- */
-
-$url = current_page_url();
-
-elgg_register_plugin_hook_handler('view', 'widgets/friends/content', 'css_widget_content');
-elgg_register_plugin_hook_handler('view', 'widgets/friends/edit', 'css_widget_content');
-elgg_register_plugin_hook_handler('permissions_check', 'all', 'css_permissions_override');
-
-function css_widget_content() {
-	return $ipsum = elgg_view('developers/ipsum');
-}
-
-function css_permissions_override() {
-	return true;
-}
-
-
-?>
-<div class="elgg-body mal">
-	<?php echo elgg_view('theme_preview/header', $vars); ?>
-<?php
-$w = array();
-for ($i=1; $i<=6; $i++) {
-	$obj = new ElggWidget();
-	$obj->handler = 'friends';
-	$obj->title = "Widget $i";
-	$w[] = $obj;
-}
-$column1 = array($w[0], $w[1]);
-$column2 = array($w[2], $w[3]);
-$column3 = array($w[4], $w[5]);
-$widgets = array(1 => $column1, 2 => $column2, 3 => $column3);
-$num_columns = 3;
-$widget_class = "elgg-col-1of{$num_columns}";
-for ($column_index = 1; $column_index <= $num_columns; $column_index++) {
-	$column_widgets = $widgets[$column_index];
-
-	echo "<div class=\"$widget_class elgg-widgets\" id=\"elgg-widget-col-$column_index\">";
-	if (is_array($column_widgets) && sizeof($column_widgets) > 0) {
-		foreach ($column_widgets as $widget) {
-			echo elgg_view_entity($widget);
-		}
-	}
-	echo '</div>';
-}
-?>
-</div>
-<script type="text/javascript">
-	// widgets do not have guids so we override the edit toggle and delete button
-	$(function() {
-		$('.elgg-widget-edit-button').unbind('click');
-		$('.elgg-widget-edit-button').click(function() {
-			$(this).closest('.elgg-module-widget').find('.elgg-widget-edit').slideToggle('medium');
-			return false;
-		});
-		$('.elgg-widget-delete-button').click(function() {
-			$(this).closest('.elgg-module-widget').remove();
-			return false;
-		});
-	});
-</script>
diff --git a/mod/developers/views/default/theme_preview/navigation.php b/mod/developers/views/default/theme_preview/navigation.php
index b80634317..5d3060d10 100644
--- a/mod/developers/views/default/theme_preview/navigation.php
+++ b/mod/developers/views/default/theme_preview/navigation.php
@@ -2,9 +2,9 @@
 /**
  * Navigation CSS
  */
-echo elgg_view_module('info', "Tabs", elgg_view('theme_preview/navigation/tabs'));
+echo elgg_view_module('info', "Tabs (.elgg-tabs)", elgg_view('theme_preview/navigation/tabs'));
 
-echo elgg_view_module('info', "Pagination", elgg_view('theme_preview/navigation/pagination'));
+echo elgg_view_module('info', "Pagination (.elgg-pagination)", elgg_view('theme_preview/navigation/pagination'));
 
 echo elgg_view_module('info', "Site Menu (.elgg-menu-site)", elgg_view('theme_preview/navigation/site'));
 
@@ -14,8 +14,10 @@ echo elgg_view_module('info', "Page Menu (.elgg-menu-page)", elgg_view('theme_pr
 
 echo elgg_view_module('info', "Filter Menu (.elgg-menu-filter)", elgg_view('theme_preview/navigation/filter'));
 
-echo elgg_view_module('info', "Extras Menu (.elgg-menu-extras)", elgg_view('theme_preview/navigation/extras'));
+echo elgg_view_module('info', "Extras Menu (.elgg-menu-extras and .elgg-menu-hz)", elgg_view('theme_preview/navigation/extras'));
+
+echo elgg_view_module('info', "Entity Menu (.elgg-menu-entity and .elgg-menu-hz)", elgg_view('theme_preview/navigation/entity'));
 
 echo elgg_view_module('info', "Owner Block Menu (.elgg-menu-owner-block)", elgg_view('theme_preview/navigation/owner_block'));
 
-?>
+echo elgg_view_module('info', "Footer Menu (.elgg-menu-footer)", elgg_view('theme_preview/navigation/footer'));
diff --git a/mod/developers/views/default/theme_preview/navigation/breadcrumbs.php b/mod/developers/views/default/theme_preview/navigation/breadcrumbs.php
index eb3dd47a3..c910b2aa4 100644
--- a/mod/developers/views/default/theme_preview/navigation/breadcrumbs.php
+++ b/mod/developers/views/default/theme_preview/navigation/breadcrumbs.php
@@ -3,4 +3,8 @@ elgg_push_breadcrumb('First', "#");
 elgg_push_breadcrumb('Second', "#");

 elgg_push_breadcrumb('Third');

 

-echo elgg_view('navigation/breadcrumbs');

+echo elgg_view('navigation/breadcrumbs', array('class' => mts));

+

+elgg_pop_breadcrumb();

+elgg_pop_breadcrumb();

+elgg_pop_breadcrumb();

diff --git a/mod/developers/views/default/theme_preview/navigation/default.php b/mod/developers/views/default/theme_preview/navigation/default.php
index fd67b8094..bfd26162f 100644
--- a/mod/developers/views/default/theme_preview/navigation/default.php
+++ b/mod/developers/views/default/theme_preview/navigation/default.php
@@ -4,7 +4,7 @@ $params = array();
 $params['menu'] = array();

 $params['menu']['default'] = array();

 for ($i=1; $i<=5; $i++) {

-	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "$url#");

+	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "#");

 }

 $params['menu']['default'][2]->setSelected(true);

 

diff --git a/mod/developers/views/default/theme_preview/navigation/entity.php b/mod/developers/views/default/theme_preview/navigation/entity.php
new file mode 100644
index 000000000..465585b00
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/navigation/entity.php
@@ -0,0 +1,12 @@
+<?php
+$params = array();
+$params['menu'] = array();
+$params['menu']['default'] = array();
+$params['menu']['default'][] = new ElggMenuItem(1, "Public", false);
+$params['menu']['default'][] = new ElggMenuItem(2, "Edit", "#");
+$params['menu']['default'][] = new ElggMenuItem(3, elgg_view_icon('thumbs-up'), "#");
+$params['name'] = 'entity';
+$params['class'] = 'elgg-menu-hz';
+
+echo elgg_view('navigation/menu/default', $params);
+
diff --git a/mod/developers/views/default/theme_preview/navigation/extras.php b/mod/developers/views/default/theme_preview/navigation/extras.php
index 6982cf57d..43b19f8e3 100644
--- a/mod/developers/views/default/theme_preview/navigation/extras.php
+++ b/mod/developers/views/default/theme_preview/navigation/extras.php
@@ -3,11 +3,11 @@
 $params = array();

 $params['menu'] = array();

 $params['menu']['default'] = array();

-for ($i=1; $i<=5; $i++) {

-	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "$url#");

-}

-$params['class'] = 'elgg-menu-extras';

-

+$params['menu']['default'][] = new ElggMenuItem(1, elgg_view_icon('push-pin-alt'), "#");

+$params['menu']['default'][] = new ElggMenuItem(2, elgg_view_icon('rss'), "#");

+$params['menu']['default'][] = new ElggMenuItem(3, elgg_view_icon('star-alt'), "#");

+$params['name'] = 'extras';

+$params['class'] = 'elgg-menu-hz';

 

 ?>

 

diff --git a/mod/developers/views/default/theme_preview/navigation/filter.php b/mod/developers/views/default/theme_preview/navigation/filter.php
index f27edf150..ea1c8b033 100644
--- a/mod/developers/views/default/theme_preview/navigation/filter.php
+++ b/mod/developers/views/default/theme_preview/navigation/filter.php
@@ -4,7 +4,7 @@ $params = array();
 $params['menu'] = array();

 $params['menu']['default'] = array();

 for ($i=1; $i<=5; $i++) {

-	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "$url#");

+	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "#");

 }

 $params['menu']['default'][2]->setSelected(true);

 

diff --git a/mod/developers/views/default/theme_preview/navigation/footer.php b/mod/developers/views/default/theme_preview/navigation/footer.php
new file mode 100644
index 000000000..92a1bb43c
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/navigation/footer.php
@@ -0,0 +1,10 @@
+<?php
+$params = array();
+$params['menu'] = array();
+$params['menu']['default'] = array();
+for ($i=1; $i<=5; $i++) {
+	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "#");
+}
+$params['name'] = 'footer';
+
+echo elgg_view('navigation/menu/default', $params);
diff --git a/mod/developers/views/default/theme_preview/navigation/horizontal.php b/mod/developers/views/default/theme_preview/navigation/horizontal.php
index 69e75c063..f404f42c0 100644
--- a/mod/developers/views/default/theme_preview/navigation/horizontal.php
+++ b/mod/developers/views/default/theme_preview/navigation/horizontal.php
@@ -4,7 +4,7 @@ $params = array();
 $params['menu'] = array();

 $params['menu']['default'] = array();

 for ($i=1; $i<=5; $i++) {

-	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "$url#");

+	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "#");

 }

 $params['menu']['default'][2]->setSelected(true);

 $params['class'] = 'elgg-menu-hz';

diff --git a/mod/developers/views/default/theme_preview/navigation/owner_block.php b/mod/developers/views/default/theme_preview/navigation/owner_block.php
index 6bf79fe7e..20b93d166 100644
--- a/mod/developers/views/default/theme_preview/navigation/owner_block.php
+++ b/mod/developers/views/default/theme_preview/navigation/owner_block.php
@@ -3,9 +3,11 @@ $params = array();
 $params['menu'] = array();

 $params['menu']['default'] = array();

 for ($i=1; $i<=5; $i++) {

-	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "$url#");

+	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "#");

 }

 $params['menu']['default'][2]->setSelected(true);

-$params['class'] = 'elgg-menu-owner-block';

+$params['name'] = 'owner-block';

 

-echo elgg_view('navigation/menu/default', $params); 
\ No newline at end of file
+echo '<div class="elgg-sidebar">';

+echo elgg_view('navigation/menu/default', $params);

+echo '</div>';

diff --git a/mod/developers/views/default/theme_preview/navigation/page.php b/mod/developers/views/default/theme_preview/navigation/page.php
index fb3f075dc..a57edc2e2 100644
--- a/mod/developers/views/default/theme_preview/navigation/page.php
+++ b/mod/developers/views/default/theme_preview/navigation/page.php
@@ -5,11 +5,10 @@ $params['menu'] = array();
 $params['menu']['default'] = array();

 for ($i=1; $i<=5; $i++) {

 	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "#");

-	$params['menu']['alt'][] = new ElggMenuItem($i, "Page $i", "#");

 }

 $params['menu']['default'][2]->setSelected(true);

 

-$m = new ElggMenuItem(10, "Child", "$url#");

+$m = new ElggMenuItem(10, "Child", "#");

 $m->setParent($params['menu']['default'][1]);

 $params['menu']['default'][1]->addChild($m);

 ?>

diff --git a/mod/developers/views/default/theme_preview/navigation/pagination.php b/mod/developers/views/default/theme_preview/navigation/pagination.php
deleted file mode 100644
index 90ae48edf..000000000
--- a/mod/developers/views/default/theme_preview/navigation/pagination.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php

-$params = array(

-	'count' => 1000,

-	'limit' => 10,

-	'offset' => 230,

-);

-

-echo elgg_view('navigation/pagination', $params);
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/navigation/site.php b/mod/developers/views/default/theme_preview/navigation/site.php
index df8dc1b70..329036b80 100644
--- a/mod/developers/views/default/theme_preview/navigation/site.php
+++ b/mod/developers/views/default/theme_preview/navigation/site.php
@@ -4,7 +4,7 @@ $params = array();
 $params['menu'] = array();

 $params['menu']['default'] = array();

 for ($i=1; $i<=5; $i++) {

-	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "$url#");

+	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "#");

 }

 $params['menu']['default'][2]->setSelected(true);

 ?>

diff --git a/mod/developers/views/default/theme_preview/navigation/tabs.php b/mod/developers/views/default/theme_preview/navigation/tabs.php
index b2638bb37..81fe4e669 100644
--- a/mod/developers/views/default/theme_preview/navigation/tabs.php
+++ b/mod/developers/views/default/theme_preview/navigation/tabs.php
@@ -1,9 +1,9 @@
 <?php

 $params = array(

 	'tabs' => array(

-		array('title' => 'First', 'url' => "$url#"),

-		array('title' => 'Second', 'url' => "$url#", 'selected' => true),

-		array('title' => 'Third', 'url' => "$url#"),

+		array('title' => 'First', 'url' => "#"),

+		array('title' => 'Second', 'url' => "#", 'selected' => true),

+		array('title' => 'Third', 'url' => "#"),

 	)

 );

 

diff --git a/mod/developers/views/default/theme_preview/typography.php b/mod/developers/views/default/theme_preview/typography.php
index 6662a9a46..7a6328cf9 100644
--- a/mod/developers/views/default/theme_preview/typography.php
+++ b/mod/developers/views/default/theme_preview/typography.php
@@ -5,6 +5,8 @@
 
 echo elgg_view_module('info', "Headings", elgg_view('theme_preview/typography/headings'));
 
+echo elgg_view_module('info', "Fonts", elgg_view('theme_preview/typography/fonts'));
+
 echo elgg_view_module('info', "Paragraph", elgg_view('theme_preview/typography/paragraph'));
 
 echo elgg_view_module('info', "Misc", elgg_view('theme_preview/typography/misc'));
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/typography/fonts.php b/mod/developers/views/default/theme_preview/typography/fonts.php
new file mode 100644
index 000000000..dd3c53f00
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/typography/fonts.php
@@ -0,0 +1,7 @@
+<ul>
+	<li>Lorem ipsum dolor sit amet (body)</li>
+	<li><span class="elgg-text-help" style="display: inline;">Lorem ipsum dolor sit amet</span> (.elgg-text-help)</li>
+	<li><span class="elgg-quiet">Lorem ipsum dolor sit amet</span> (.elgg-quiet)</li>
+	<li><span class="elgg-loud">Lorem ipsum dolor sit amet</span> (.elgg-loud)</li>
+	<li><span class="elgg-monospace">Lorem ipsum dolor sit amet</span> (.elgg-monospace)</li>
+</ul>
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/typography/headings.php b/mod/developers/views/default/theme_preview/typography/headings.php
deleted file mode 100644
index 1eb96c75c..000000000
--- a/mod/developers/views/default/theme_preview/typography/headings.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<h1>Level 1 heading</h1>

-<h2>Level 2 heading</h2>

-<h3>Level 3 heading</h3>

-<h4>Level 4 heading</h4>

-<h5>Level 5 heading</h5>

-<h6>Level 6 heading</h6>
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/typography/misc.php b/mod/developers/views/default/theme_preview/typography/misc.php
deleted file mode 100644
index 93a279c36..000000000
--- a/mod/developers/views/default/theme_preview/typography/misc.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<ul>

-	<li>I am <a href="?abc123">the a tag</a> example</li>

-	<li>I am <abbr title="test">the abbr tag</abbr> example</li>

-	<li>I am <acronym>the acronym tag</acronym> example</li>

-	<li>I am <b>the b tag</b> example</li>

-	<li>I am <code>the code tag</code> example</li>

-	<li>I am <del>the del tag</del> example</li>

-	<li>I am <em>the em tag</em> example</li>

-	<li>I am <i>the i tag</i> example</li>

-	<li>I am <strong>the strong tag</strong> example</li>

-</ul>

-<blockquote><p>Paragraph inside Blockquote: <?php echo $ipsum; ?></p></blockquote>

-<pre>

-	<strong>Preformated:</strong>Testing one row

-	and another

-</pre>

diff --git a/mod/developers/views/default/theme_preview/typography/paragraph.php b/mod/developers/views/default/theme_preview/typography/paragraph.php
deleted file mode 100644
index 54d548f46..000000000
--- a/mod/developers/views/default/theme_preview/typography/paragraph.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<p>Lorem ipsum dolor sit amet, <a href="#" title="test link">test link</a>

-adipiscing elit. Nullam dignissim convallis est. Quisque aliquam. Donec

-faucibus. Nunc iaculis suscipit dui. Nam sit amet sem. Aliquam libero

-nisi, imperdiet at, tincidunt nec, gravida vehicula, nisl. Praesent

-mattis, massa quis luctus <strong>strong</strong>, turpis mi volutpat justo, eu

-volutpat enim diam eget metus. Maecenas ornare tortor. Donec sed tellus

-eget sapien fringilla nonummy. Mauris a ante. Suspendisse quam sem,

-consequat at, commodo vitae, feugiat in, nunc. Morbi imperdiet augue

-quis tellus.</p>

-

-<p>Lorem ipsum dolor sit amet, <em>emphasis</em> consectetuer

-adipiscing elit. Nullam dignissim convallis est. Quisque aliquam. Donec

-faucibus. Nunc iaculis suscipit dui. Nam sit amet sem. Aliquam libero

-nisi, imperdiet at, tincidunt nec, gravida vehicula, nisl. Praesent

-mattis, massa quis luctus fermentum, turpis mi volutpat justo, eu

-volutpat enim diam eget metus. Maecenas ornare tortor. Donec sed tellus

-eget sapien fringilla nonummy. Mauris a ante. Suspendisse quam sem,

-consequat at, commodo vitae, feugiat in, nunc. Morbi imperdiet augue

-quis tellus.</p>
\ No newline at end of file