Added @override keyword at some actions and views

diff --git a/views/default/output/friendlytime.php b/views/default/output/friendlytime.php
index b752b74ce826dde1c4e50d5dc001e480ca8567e5..dc9699fba88d7f61dddd63b236a8753232dddcc8 100644 (file)
--- 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 a6d6bf6e1c1214c589d08a7417d06e60e8179d21..e1180e8515e4d187fa808bb0a78bff5e8b956adb 100644 (file)
--- 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 491f691f43d1223f82e0af69497af188363bbbc1..7a74a045981c8e7adc764da1579f4e871ac025ba 100644 (file)
--- 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 a56b373b49b9e192e69beb543d63b4dba0e5bf61..6736fe3ab6913cf1f84f784482d371dad4cc0281 100644 (file)
--- 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 ded2cea9a4cde914afb01dab1392898b37f35771..f1e120d52d5bf2687882fcb21f438c17cdbaf742 100644 (file)
--- 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 e7951c4ff1addb4fcb3710271aa5cf5abfb9dc76..47254934e58d009772e603a2d71de8be239821b0 100644 (file)
--- 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 fc7f0f6d2f7d7f793486515fbf138a8792768fb5..3a234c162ff8361fbab984702efc15aea2e76e32 100644 (file)
--- 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 f9975d3e481201ae101b80f5f40803c9be25d563..683ba346839d5268a94e2f55712a75b65378ec03 100644 (file)
--- 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 61d6fed0ef63d8bf979ed7bd42547514f5f29911..e5e063b51975e689f5f47119d0861b0acb998fa2 100644 (file)
--- 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 b2660a155f26a21f3e66413768c9196dbc74820e..929547424d15bef0b18ab79f3d23ae8fcbae0a54 100644 (file)
--- 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 77c901d8cd01fc47b266a198ff1565d8d8f78e02..1075ea811d9caa1a3c556b07b87c9945676e828e 100644 (file)
--- 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 c1ea40705fe4a49b3cbef8361d14fef1339c1a5e..9d0ed5e91f71e677e038f47c36ba4ce17ab2eb6e 100644 (file)
--- 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)) {