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

Elgg 1.8.8 release

Conflicts:
	js/lib/languages.js

2 files changed, 0 insertions, 87 deletions

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>