summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2008-11-20 16:45:57 -0500
committerZach Copley <zach@controlyourself.ca>2008-11-20 16:45:57 -0500
commit41f29ab662a5587b1505303ff6d39efb4b6b77c9 (patch)
treeb0d6f50bcee76ff9f50689614b7eeb38bc613f6e
parent04381435a8ea42033556660df254dfaa9417f4d8 (diff)
Public tabs - added instructions for 'Featured' and 'Favorited'; removed notice input boxes
darcs-hash:20081120214557-7b5ce-df1993ee7a761d109e9346d9817ead147d015962.gz
-rw-r--r--actions/favorited.php15
-rw-r--r--actions/featured.php17
2 files changed, 20 insertions, 12 deletions
diff --git a/actions/favorited.php b/actions/favorited.php
index ba41cbc3d..081c13df8 100644
--- a/actions/favorited.php
+++ b/actions/favorited.php
@@ -38,15 +38,14 @@ class FavoritedAction extends StreamAction {
}
function show_top() {
- if (common_logged_in()) {
- common_notice_form('public');
- }
-
+ $instr = $this->get_instructions();
+ $output = common_markup_to_html($instr);
+ common_element_start('div', 'instructions');
+ common_raw($output);
+ common_element_end('div');
$this->public_views_menu();
}
- // XXX Need to make RSS stream
-
function show_header() {
common_element('link', array('rel' => 'alternate',
'href' => common_local_url('favoritedrss'),
@@ -54,6 +53,10 @@ class FavoritedAction extends StreamAction {
'title' => _('Favorited Stream Feed')));
}
+ function get_instructions() {
+ return _('Showing most favorited notices from the last week');
+ }
+
function show_notices($page) {
// XXX: Make dropoff configurable like tags?
diff --git a/actions/featured.php b/actions/featured.php
index 01071912d..d5cfd06f5 100644
--- a/actions/featured.php
+++ b/actions/featured.php
@@ -10,11 +10,11 @@
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
if (!defined('LACONICA')) { exit(1); }
@@ -38,13 +38,18 @@ class FeaturedAction extends StreamAction {
}
function show_top() {
- if (common_logged_in()) {
- common_notice_form('public');
- }
-
+ $instr = $this->get_instructions();
+ $output = common_markup_to_html($instr);
+ common_element_start('div', 'instructions');
+ common_raw($output);
+ common_element_end('div');
$this->public_views_menu();
}
+ function get_instructions() {
+ return _('Featured users');
+ }
+
function show_header() {
// XXX need to make the RSS feed for this