Public tabs - added instructions for 'Featured' and 'Favorited'; removed notice input...

darcs-hash:20081120214557-7b5ce-df1993ee7a761d109e9346d9817ead147d015962.gz

diff --git a/actions/favorited.php b/actions/favorited.php
index ba41cbc3dde6500c39f695550669c141b48b5dce..081c13df8d4501311ecb5b6bfd3be7e9bb67094c 100644 (file)
--- 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 01071912d66168ea38731a791d2a1bcc47922f59..d5cfd06f51df502cd01ac0e9184b57f876a3d93d 100644 (file)
--- 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