diff options
Diffstat (limited to 'mod')
45 files changed, 55 insertions, 554 deletions
diff --git a/mod/admins b/mod/admins new file mode 160000 +Subproject 9e9c8853c055999e61d3e4b5cdfad2f8b100aba diff --git a/mod/audio_html5 b/mod/audio_html5 new file mode 160000 +Subproject fdc3e162bb551ef0b5f961cef9ec838a38f672a diff --git a/mod/custom_index_widgets b/mod/custom_index_widgets new file mode 160000 +Subproject 5bfffd40e5649baed964c2fe7b6c7cb5e6a1257 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/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/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/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/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/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 diff --git a/mod/dokuwiki b/mod/dokuwiki new file mode 160000 +Subproject 9e83610ec1836cbbd27e7584732ff5d21d95186 diff --git a/mod/elggpg b/mod/elggpg new file mode 160000 +Subproject c0361b9ad60cbb23bf0678df1d61053998ca348 diff --git a/mod/etherpad b/mod/etherpad new file mode 160000 +Subproject ba948befea5b739722f976d5fcffb370748d65e diff --git a/mod/file/start.php b/mod/file/start.php index 172042332..cc777d260 100644 --- a/mod/file/start.php +++ b/mod/file/start.php @@ -200,13 +200,9 @@ function file_notify_message($hook, $entity_type, $returnvalue, $params) { if (($entity instanceof ElggEntity) && ($entity->getSubtype() == 'file')) { $descr = $entity->description; $title = $entity->title; + $url = elgg_get_site_url() . "view/" . $entity->guid; $owner = $entity->getOwnerEntity(); - return elgg_echo('file:notification', array( - $owner->name, - $title, - $descr, - $entity->getURL() - )); + return $owner->name . ' ' . elgg_echo("file:via") . ': ' . $entity->title . "\n\n" . $descr . "\n\n" . $entity->getURL(); } return null; } @@ -237,6 +233,10 @@ function file_owner_block_menu($hook, $type, $return, $params) { * @return string The overall type */ function file_get_simple_type($mimetype) { + + if ($simpletype = elgg_trigger_plugin_hook('file:simpletype', $mimetype, null, null)) { + return $simpletype; + } switch ($mimetype) { case "application/msword": @@ -410,4 +410,4 @@ function file_icon_url_override($hook, $type, $returnvalue, $params) { $url = elgg_trigger_plugin_hook('file:icon:url', 'override', $params, $url); return $url; } -}
\ No newline at end of file +} diff --git a/mod/friendrequest b/mod/friendrequest new file mode 160000 +Subproject 5acba1ab8c4fac37dccf33cc47bcab61a96f5cb diff --git a/mod/gifts b/mod/gifts new file mode 160000 +Subproject 74c059ded697a014d5786ba087776dbf06914ef diff --git a/mod/group_alias b/mod/group_alias new file mode 160000 +Subproject 910c57a28e0248024bcb85359bb5a3b72e31ca6 diff --git a/mod/group_operators b/mod/group_operators new file mode 160000 +Subproject 65f5a354fa140dc7df43460905dc564d4323579 diff --git a/mod/identica b/mod/identica new file mode 160000 +Subproject 3e3ee5e9a79534ecacb686ff9b207881e557d05 diff --git a/mod/infinite_scroll b/mod/infinite_scroll new file mode 160000 +Subproject 0b5e837358e3bc0e23261b414509383a0eb617f diff --git a/mod/languages b/mod/languages new file mode 160000 +Subproject 8dd7c9244bd10144b77b8f7a6ce2ce9db7bd46c diff --git a/mod/magic_topbar b/mod/magic_topbar new file mode 160000 +Subproject 0fdca8adb73fe9e2b5be69c00c15760c8fba336 diff --git a/mod/minify b/mod/minify new file mode 160000 +Subproject 594901859d5afc1fa364322428bd7a6d5c6a3f9 diff --git a/mod/online b/mod/online new file mode 160000 +Subproject af055124997d7346872647332237810e4aee5f6 diff --git a/mod/opensearch b/mod/opensearch new file mode 160000 +Subproject fdb19865380ee01989c97b48a3e505c1350512a diff --git a/mod/powered b/mod/powered new file mode 160000 +Subproject 76a03d73554d1d328d83a42d62774601d4f0795 diff --git a/mod/registrationterms b/mod/registrationterms new file mode 160000 +Subproject 08957cc28b07076c0dbc2ade3a3ed73e5a74493 diff --git a/mod/relatedgroups b/mod/relatedgroups new file mode 160000 +Subproject b0d7f86355c34c13fe366fea5f6bdaf81175e4c diff --git a/mod/simple_faq b/mod/simple_faq new file mode 160000 +Subproject b3a038c8ac7db28d5cd47a7ae870f722c24e592 diff --git a/mod/spotlight b/mod/spotlight new file mode 160000 +Subproject 4a552ade05f48b9b1052f70f0f6e57704a2f46d diff --git a/mod/subgroups b/mod/subgroups new file mode 160000 +Subproject 142e0ceed906d16f0c8ad79bc39db8c40871c62 diff --git a/mod/suicide b/mod/suicide new file mode 160000 +Subproject 162a741a8e3c0142ced466e3cc47d309a87b686 diff --git a/mod/translation_editor b/mod/translation_editor new file mode 160000 +Subproject 416e8aa510bb31574b70c16817f054e2111b5b9 diff --git a/mod/videolist b/mod/videolist new file mode 160000 +Subproject d2b3600e49bfac698042e39e6b6ac79124b1080 |