aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2013-08-22 17:34:22 -0400
committerSem <sembrestels@riseup.net>2013-08-22 17:34:22 -0400
commit88733a24caee170acda071281eb4630bf5ef5794 (patch)
tree6a436697ba7cf1f2009900b5a88949cdc74ce0ca
parent8819bab8c0735c0ec428672fd36381c25823440b (diff)
downloadelgg-88733a24caee170acda071281eb4630bf5ef5794.tar.gz
elgg-88733a24caee170acda071281eb4630bf5ef5794.tar.bz2
Added @override keyword at some actions and views
-rw-r--r--views/default/output/friendlytime.php1
-rw-r--r--views/default/page/admin.php2
-rw-r--r--views/default/page/default.php2
-rw-r--r--views/default/page/elements/foot.php3
-rw-r--r--views/default/page/elements/footer.php1
-rw-r--r--views/default/page/elements/head.php1
-rw-r--r--views/default/page/elements/owner_block.php1
-rw-r--r--views/default/page/layouts/admin.php2
-rw-r--r--views/default/page/layouts/one_sidebar.php2
-rw-r--r--views/default/page/layouts/two_sidebar.php2
-rw-r--r--views/default/page/walled_garden.php2
-rw-r--r--views/default/search/search_box.php2
12 files changed, 21 insertions, 0 deletions
diff --git a/views/default/output/friendlytime.php b/views/default/output/friendlytime.php
index b752b74ce..dc9699fba 100644
--- a/views/default/output/friendlytime.php
+++ b/views/default/output/friendlytime.php
@@ -4,6 +4,7 @@
* Translates an epoch time into a human-readable time.
*
* @uses string $vars['time'] Unix-style epoch timestamp
+ * @override views/default/output/friendlytime.php
*/
$friendly_time = elgg_get_friendly_time($vars['time']);
diff --git a/views/default/page/admin.php b/views/default/page/admin.php
index a6d6bf6e1..e1180e851 100644
--- a/views/default/page/admin.php
+++ b/views/default/page/admin.php
@@ -8,6 +8,8 @@
* @uses $vars['title'] The page title
* @uses $vars['body'] The main content of the page
* @uses $vars['sysmessages'] A 2d array of various message registers, passed from system_messages()
+ *
+ * @override views/default/page/admin.php
*/
$notices_html = '';
diff --git a/views/default/page/default.php b/views/default/page/default.php
index 491f691f4..7a74a0459 100644
--- a/views/default/page/default.php
+++ b/views/default/page/default.php
@@ -9,6 +9,8 @@
* @uses $vars['title'] The page title
* @uses $vars['body'] The main content of the page
* @uses $vars['sysmessages'] A 2d array of various message registers, passed from system_messages()
+ *
+ * @override views/default/page/default.php
*/
// backward compatability support for plugins that are not using the new approach
diff --git a/views/default/page/elements/foot.php b/views/default/page/elements/foot.php
index a56b373b4..6736fe3ab 100644
--- a/views/default/page/elements/foot.php
+++ b/views/default/page/elements/foot.php
@@ -1,4 +1,7 @@
<?php
+/**
+ * @override views/default/page/elements/foot.php
+ */
echo elgg_view('footer/analytics');
diff --git a/views/default/page/elements/footer.php b/views/default/page/elements/footer.php
index ded2cea9a..f1e120d52 100644
--- a/views/default/page/elements/footer.php
+++ b/views/default/page/elements/footer.php
@@ -5,6 +5,7 @@
*
* @package Elgg
* @subpackage Core
+ * @override views/default/page/elements/footer.php
*
*/
diff --git a/views/default/page/elements/head.php b/views/default/page/elements/head.php
index e7951c4ff..47254934e 100644
--- a/views/default/page/elements/head.php
+++ b/views/default/page/elements/head.php
@@ -3,6 +3,7 @@
* The standard HTML head
*
* @uses $vars['title'] The page title
+ * @override views/default/page/elements/head.php
*/
// Set title
diff --git a/views/default/page/elements/owner_block.php b/views/default/page/elements/owner_block.php
index fc7f0f6d2..3a234c162 100644
--- a/views/default/page/elements/owner_block.php
+++ b/views/default/page/elements/owner_block.php
@@ -5,6 +5,7 @@
*
* @package Elgg
* @subpackage Core
+ * @override views/default/page/elements/owner_block.php
*
*/
diff --git a/views/default/page/layouts/admin.php b/views/default/page/layouts/admin.php
index f9975d3e4..683ba3468 100644
--- a/views/default/page/layouts/admin.php
+++ b/views/default/page/layouts/admin.php
@@ -8,6 +8,8 @@
* @uses $vars['content'] Content string
* @uses $vars['sidebar'] Optional sidebar content
* @uses $vars['title'] Title string
+ *
+ * @override views/default/page/layouts/admin.php
*/
?>
diff --git a/views/default/page/layouts/one_sidebar.php b/views/default/page/layouts/one_sidebar.php
index 61d6fed0e..e5e063b51 100644
--- a/views/default/page/layouts/one_sidebar.php
+++ b/views/default/page/layouts/one_sidebar.php
@@ -10,6 +10,8 @@
* @uses $vars['title'] Optional title for main content area
* @uses $vars['class'] Additional class to apply to layout
* @uses $vars['nav'] HTML of the page nav (override) (default: breadcrumbs)
+ *
+ * @override views/default/page/layouts/one_sidebar.php
*/
$class = 'elgg-layout elgg-layout-one-sidebar clearfix';
diff --git a/views/default/page/layouts/two_sidebar.php b/views/default/page/layouts/two_sidebar.php
index b2660a155..929547424 100644
--- a/views/default/page/layouts/two_sidebar.php
+++ b/views/default/page/layouts/two_sidebar.php
@@ -9,6 +9,8 @@
* @uses $vars['sidebar'] Optional content that is displayed in the sidebar
* @uses $vars['sidebar_alt'] Optional content that is displayed in the alternate sidebar
* @uses $vars['class'] Additional class to apply to layout
+ *
+ * @override views/default/page/layouts/two_sidebar.php
*/
$class = 'elgg-layout elgg-layout-two-sidebar clearfix';
diff --git a/views/default/page/walled_garden.php b/views/default/page/walled_garden.php
index 77c901d8c..1075ea811 100644
--- a/views/default/page/walled_garden.php
+++ b/views/default/page/walled_garden.php
@@ -3,6 +3,8 @@
* Walled garden page shell
*
* Used for the walled garden index page
+ *
+ * @override views/default/page/walled_garden.php
*/
// Set the content type
diff --git a/views/default/search/search_box.php b/views/default/search/search_box.php
index c1ea40705..9d0ed5e91 100644
--- a/views/default/search/search_box.php
+++ b/views/default/search/search_box.php
@@ -4,6 +4,8 @@
*
* @uses $vars['value'] Current search query
* @uses $vars['class'] Additional class
+ *
+ * @override mod/search/views/default/search/search_box.php
*/
if (array_key_exists('value', $vars)) {