Merge tag '1.8.8' of git://github.com/Elgg/Elgg into lorea-preprod

Elgg 1.8.8 release

Conflicts:
	js/lib/languages.js

6 files changed, 22 insertions, 42 deletions

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'),
+));