Skip to content

Commit

Permalink
Merge branch '1.8'
Browse files Browse the repository at this point in the history
  • Loading branch information
cash committed Mar 10, 2013
2 parents ce9d2b7 + 42c52d5 commit f879c9d
Show file tree
Hide file tree
Showing 21 changed files with 340 additions and 340 deletions.
26 changes: 13 additions & 13 deletions js/lib/ui.river.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
elgg.provide('elgg.ui.river');

elgg.ui.river.init = function() {
$('#elgg-river-selector').change(function() {
var url = window.location.href;
if (window.location.search.length) {
url = url.substring(0, url.indexOf('?'));
}
url += '?' + $(this).val();
elgg.forward(url);
});
};

elgg.provide('elgg.ui.river');

elgg.ui.river.init = function() {
$('#elgg-river-selector').change(function() {
var url = window.location.href;
if (window.location.search.length) {
url = url.substring(0, url.indexOf('?'));
}
url += '?' + $(this).val();
elgg.forward(url);
});
};

elgg.register_hook_handler('init', 'system', elgg.ui.river.init);
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?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");
<?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");
38 changes: 19 additions & 19 deletions mod/developers/views/default/theme_preview/components/list.php
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<?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)));
<?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)));
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<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>
<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>
22 changes: 11 additions & 11 deletions mod/developers/views/default/theme_preview/components/table.php
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<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 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>
72 changes: 36 additions & 36 deletions mod/developers/views/default/theme_preview/icons/avatars.php
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
<?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>
<?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>
120 changes: 60 additions & 60 deletions mod/developers/views/default/theme_preview/icons/sprites.php
Original file line number Diff line number Diff line change
@@ -1,61 +1,61 @@
<?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>";
}
?>
<?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>
44 changes: 22 additions & 22 deletions mod/developers/views/default/theme_preview/modules/modules.php
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<?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>
<?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>
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php
elgg_push_breadcrumb('First', "#");
elgg_push_breadcrumb('Second', "#");
elgg_push_breadcrumb('Third');

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

elgg_pop_breadcrumb();
elgg_pop_breadcrumb();
elgg_pop_breadcrumb();
<?php
elgg_push_breadcrumb('First', "#");
elgg_push_breadcrumb('Second', "#");
elgg_push_breadcrumb('Third');

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

elgg_pop_breadcrumb();
elgg_pop_breadcrumb();
elgg_pop_breadcrumb();
Loading

0 comments on commit f879c9d

Please sign in to comment.