Every occurrence of elgg-button-$type needs an elgg-button base class declaration...

git-svn-id: http://code.elgg.org/elgg/trunk@8444 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/mod/blog/lib/blog.php b/mod/blog/lib/blog.php
index 5287844ab98a7f67f72b68358c0444153674520e..4d5106bfb69e1ff4d3d40b01d96eaaf74f47c53b 100644 (file)
--- a/mod/blog/lib/blog.php
+++ b/mod/blog/lib/blog.php
@@ -93,7 +93,7 @@ function blog_get_page_content_list($container_guid = NULL) {
                                $params = array(
                                        'href' => $url,
                                        'text' => elgg_echo("blog:add"),
-                                       'class' => 'elgg-button-action',
+                                       'class' => 'elgg-button elgg-button-action',
                                );
                                $buttons = elgg_view('output/url', $params);
                                $return['buttons'] = $buttons;

diff --git a/mod/file/index.php b/mod/file/index.php
index 257dd8af859ff65334a21bd1ee778ffbf274b86a..de2e4640847223b76d4cded890890e40b51b24a9 100644 (file)
--- a/mod/file/index.php
+++ b/mod/file/index.php
@@ -34,7 +34,7 @@ if ($owner->guid == elgg_get_logged_in_user_guid()) {
                $vars = array(
                        'href' => $url,
                        'text' => elgg_echo("file:add"),
-                       'class' => 'elgg-button-action',
+                       'class' => 'elgg-button elgg-button-action',
                );
                $button = elgg_view('output/url', $vars);
                $params['buttons'] = $button;

diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php
index d3a5c7e41c77669bc2455a49c951ebfcfc0b36e3..a43f12cc59f8e8fc5e1449e7ec6b3cece4873da1 100644 (file)
--- a/mod/file/views/default/object/file.php
+++ b/mod/file/views/default/object/file.php
@@ -68,7 +68,7 @@ if ($full && !elgg_in_context('gallery')) {
        $download = elgg_view('output/url', array(
                'href' => "mod/file/download.php?file_guid=$file->guid",
                'text' => elgg_echo("file:download"),
-               'class' => 'elgg-button-action',
+               'class' => 'elgg-button elgg-button-action',
        ));
 
        $header = elgg_view_title($file->title);

diff --git a/mod/groups/views/default/groups/invitationrequests.php b/mod/groups/views/default/groups/invitationrequests.php
index 77dabaac2da688954e440b3c998e4f4d83d59644..2ede81bc510d5cf9f6252c8ce18c7ac2852e6a24 100644 (file)
--- a/mod/groups/views/default/groups/invitationrequests.php
+++ b/mod/groups/views/default/groups/invitationrequests.php
@@ -20,7 +20,7 @@ if (!empty($vars['invitations']) && is_array($vars['invitations'])) {
                        <div class="elgg-body">
                        <a href="<?php echo $url; ?>" class="elgg-button elgg-button-submit"><?php echo elgg_echo('accept'); ?></a>
                        <?php           
-                               echo str_replace('<a', '<a class="elgg-button-action elgg-state-disabled" ', elgg_view('output/confirmlink',array(
+                               echo str_replace('<a', '<a class="elgg-button elgg-button-action elgg-state-disabled" ', elgg_view('output/confirmlink',array(
                                        'href' => "action/groups/killinvitation?user_guid={$user->getGUID()}&group_guid={$group->getGUID()}",
                                        'confirm' => elgg_echo('groups:invite:remove:check'),
                                        'text' => elgg_echo('delete'),

diff --git a/mod/groups/views/default/groups/membershiprequests.php b/mod/groups/views/default/groups/membershiprequests.php
index 8d4fe5c88c386af82ab000c7d59b6b011edd43ff..15ed3b258a85cdbaaaa51f8b8336222a1cc44db5 100644 (file)
--- a/mod/groups/views/default/groups/membershiprequests.php
+++ b/mod/groups/views/default/groups/membershiprequests.php
@@ -19,9 +19,9 @@
                                        $url = elgg_add_action_tokens_to_url(elgg_get_site_url()."action/groups/addtogroup?user_guid={$request->guid}&group_guid={$vars['entity']->guid}");
                                        ?>
                                        <div class="elgg-body">
-                                       <a href="<?php echo $url; ?>" class="elgg-button-submit"><?php echo elgg_echo('accept'); ?></a>
+                                       <a href="<?php echo $url; ?>" class="elgg-button elgg-button-submit"><?php echo elgg_echo('accept'); ?></a>
                                        <?php   
-                                       echo str_replace('<a', '<a class="elgg-button-action elgg-state-disabled" ', elgg_view('output/confirmlink',array(
+                                       echo str_replace('<a', '<a class="elgg-button elgg-button-cancel elgg-state-disabled" ', elgg_view('output/confirmlink',array(
                                                'href' => 'action/groups/killrequest?user_guid='.$request->guid.'&group_guid=' . $vars['entity']->guid,
                                                'confirm' => elgg_echo('groups:joinrequest:remove:check'),
                                                'text' => elgg_echo('delete'),

diff --git a/mod/messages/read.php b/mod/messages/read.php
index 83c7dccee4c713f5554282bb90f0f63f03198498..b830aa51cbdda864b2ed50a550a82c240a022393 100644 (file)
--- a/mod/messages/read.php
+++ b/mod/messages/read.php
@@ -40,7 +40,7 @@ if ($inbox) {
        if (elgg_get_logged_in_user_guid() == elgg_get_page_owner_guid()) {
                $buttons = elgg_view('output/url', array(
                        'text' => elgg_echo('messages:answer'),
-                       'class' => 'elgg-button-action',
+                       'class' => 'elgg-button elgg-button-action',
                        'id' => 'messages-show-reply',
                ));
        }

diff --git a/mod/messages/views/default/forms/messages/process.php b/mod/messages/views/default/forms/messages/process.php
index ce24360e70460aa1c0a68fc815601c3576bbd92b..5cdd01c1fb2f61d29aaa13528ecee3598ee63ab6 100644 (file)
--- a/mod/messages/views/default/forms/messages/process.php
+++ b/mod/messages/views/default/forms/messages/process.php
@@ -25,7 +25,7 @@ if ($vars['folder'] == "inbox") {
 
 echo elgg_view('input/button', array(
        'value' => elgg_echo('messages:toggle'),
-       'class' => 'elgg-button-cancel',
+       'class' => 'elgg-button elgg-button-cancel',
        'id' => 'messages-toggle',
 ));
 

diff --git a/mod/messages/views/default/object/messages.php b/mod/messages/views/default/object/messages.php
index 13b7ca35f6bfee946e6591083d0a13e315eec359..9e070455b3907f8bbbb9c592bbe240c1d01065cb 100644 (file)
--- a/mod/messages/views/default/object/messages.php
+++ b/mod/messages/views/default/object/messages.php
@@ -54,7 +54,7 @@ $subject_info .= elgg_view('output/url', array(
        'text' => $message->title,
 ));
 
-$delete_link = "<span class='elgg-button-delete'>" . elgg_view("output/confirmlink", array(
+$delete_link = "<span class='elgg-button elgg-button-delete'>" . elgg_view("output/confirmlink", array(
                                                'href' => "action/messages/delete?guid=" . $message->getGUID(),
                                                'text' => elgg_echo('delete'),
                                                'confirm' => elgg_echo('deleteconfirm'),

diff --git a/mod/pages/view.php b/mod/pages/view.php
index 3a323cc23c729847f102a1b6df960e469058ca0b..479ec1c932620a500cc9438fc97f422101608988 100644 (file)
--- a/mod/pages/view.php
+++ b/mod/pages/view.php
@@ -38,7 +38,7 @@ if ($page->canEdit()) {
        $buttons = elgg_view('output/url', array(
                        'text' => elgg_echo('pages:newchild'),
                        'href' => $url,
-                       'class' => 'elgg-button-action',
+                       'class' => 'elgg-button elgg-button-action',
                ));
 }
 

diff --git a/mod/profile/views/default/profile/owner_block.php b/mod/profile/views/default/profile/owner_block.php
index 81ba8a7bf380001ccef97ef1641a258c1e898b13..d257f03a82853a25ea95c6804bc0f31265725369 100755 (executable)
--- a/mod/profile/views/default/profile/owner_block.php
+++ b/mod/profile/views/default/profile/owner_block.php
@@ -28,7 +28,7 @@ $profile_actions = '';
 if (elgg_is_logged_in() && $actions) {
        $profile_actions = '<ul class="elgg-menu">';
        foreach ($actions as $action) {
-               $profile_actions .= '<li>' . $action->getLink(array('class' => 'elgg-button-action')) . '</li>';
+               $profile_actions .= '<li>' . $action->getLink(array('class' => 'elgg-button elgg-button-action')) . '</li>';
        }
        $profile_actions .= '</ul>';
 }

diff --git a/mod/reportedcontent/views/default/object/reported_content.php b/mod/reportedcontent/views/default/object/reported_content.php
index 16f9c877308669a653945e7f2c11232a32b4759d..9ac878ab4cc9b132f6fe8f7332c50795df9f4677 100644 (file)
--- a/mod/reportedcontent/views/default/object/reported_content.php
+++ b/mod/reportedcontent/views/default/object/reported_content.php
@@ -28,7 +28,7 @@ if ($report->state == 'archived') {
                        'href' => $archive_url,
                        'text' => elgg_echo('reportedcontent:archive'),
                        'is_action' => true,
-                       'class' => 'elgg-button-action',
+                       'class' => 'elgg-button elgg-button-action',
                );
                echo elgg_view('output/url', $params);
        }
@@ -36,7 +36,7 @@ if ($report->state == 'archived') {
                'href' => $delete_url,
                'text' => elgg_echo('reportedcontent:delete'),
                'is_action' => true,
-               'class' => 'elgg-button-action',
+               'class' => 'elgg-button elgg-button-action',
        );
        echo elgg_view('output/url', $params);
 ?>

diff --git a/mod/thewire/views/default/thewire/profile_status.php b/mod/thewire/views/default/thewire/profile_status.php
index 9ff0c4d59e575c31cee4abaeaa90f6099a00b2c2..33b05f479988eb023e7443394cfd4c88915e0c72 100644 (file)
--- a/mod/thewire/views/default/thewire/profile_status.php
+++ b/mod/thewire/views/default/thewire/profile_status.php
@@ -2,7 +2,7 @@
 /**
  * Latest wire post on profile page
  */
- 
+
 $owner = $vars['entity']->guid;
 $url_to_wire = elgg_get_site_url() . "pg/thewire/owner/" . $vars['entity']->username;
 
@@ -24,7 +24,7 @@ if ($latest_wire && count($latest_wire) > 0) {
        echo $content;
        if ($owner == elgg_get_logged_in_user_guid()) {
                $text = elgg_echo('thewire:update');
-               echo "<a class='elgg-button-action update small' href=\"{$url_to_wire}\">$text</a>";
+               echo "<a class='elgg-button elgg-button-action update small' href=\"{$url_to_wire}\">$text</a>";
        }
        echo $time;
        echo "</div></div>";

diff --git a/views/default/admin/plugins/advanced.php b/views/default/admin/plugins/advanced.php
index 8b12cd899a8e2b4ba2f1464204f9e98572d3bbed..229c21f963cedee80af51eef603ac89c44ae0304 100644 (file)
--- a/views/default/admin/plugins/advanced.php
+++ b/views/default/admin/plugins/advanced.php
@@ -49,7 +49,7 @@ $category_dropdown = elgg_view('input/dropdown', array(
 
 $category_button = elgg_view('input/submit', array(
        'value' => elgg_echo('filter'),
-       'class' => 'elgg-button-action'
+       'class' => 'elgg-button elgg-button-action'
 ));
 
 $category_form = elgg_view('input/form', array(
@@ -64,8 +64,8 @@ if (!isset($show_category) || empty($show_category)) {
        $deactivate_url = elgg_add_action_tokens_to_url($deactivate_url);
 
        $buttons = "<div class=\"mbl\">";
-       $buttons .= "<a class='elgg-button-action' href=\"$activate_url\">" . elgg_echo('admin:plugins:activate_all') . '</a> ';
-       $buttons .=     "<a class='elgg-button-cancel' href=\"$deactivate_url\">" . elgg_echo('admin:plugins:deactivate_all') . '</a> ';
+       $buttons .= "<a class='elgg-button elgg-button-action' href=\"$activate_url\">" . elgg_echo('admin:plugins:activate_all') . '</a> ';
+       $buttons .=     "<a class='elgg-button elgg-button-cancel' href=\"$deactivate_url\">" . elgg_echo('admin:plugins:deactivate_all') . '</a> ';
        $buttons .= "</div>";
 } else {
        $buttons = '';

diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php
index f5408abbd4fcfa444dcb259f27089f2e16f3029e..c55c04c7870ce773e3d31fce0aa10b990d8ca0bb 100644 (file)
--- a/views/default/annotation/generic_comment.php
+++ b/views/default/annotation/generic_comment.php
@@ -42,7 +42,7 @@ if ($full_view) {
                                                        'text' => elgg_echo('delete'),
                                                        'confirm' => elgg_echo('deleteconfirm')
                                                ));
-               $delete_button = "<span class=\"elgg-button-delete\">$delete_button</span>";
+               $delete_button = "<span class=\"elgg-button elgg-button-delete\">$delete_button</span>";
        }
 
        $comment_text = elgg_view("output/longtext", array("value" => $comment->value));

diff --git a/views/default/annotation/likes.php b/views/default/annotation/likes.php
index 459afce6106978bddbc10ac28dee81ef7c80b8cf..2ca129840a4d1eba30cd95d9bba25f6a5b19e602 100644 (file)
--- a/views/default/annotation/likes.php
+++ b/views/default/annotation/likes.php
@@ -32,7 +32,7 @@ if ($like->canEdit()) {
                                                'text' => elgg_echo('delete'),
                                                'confirm' => elgg_echo('deleteconfirm')
                                        ));
-       $delete_button = "<span class=\"elgg-button-delete\">$delete_button</span>";
+       $delete_button = "<span class=\"elgg-button elgg-button-delete\">$delete_button</span>";
 }
 
 $body = <<<HTML

diff --git a/views/default/core/account/login_dropdown.php b/views/default/core/account/login_dropdown.php
index d188364c07e8c1ce87dee523b75d424e91987642..06a9a15fbdcca8fe17c6c6ceca5a39b6e13495f3 100644 (file)
--- a/views/default/core/account/login_dropdown.php
+++ b/views/default/core/account/login_dropdown.php
@@ -17,8 +17,12 @@ if (elgg_get_config('https_login')) {
 $body = elgg_view_form('login', array('action' => "{$login_url}action/login"), array('returntoreferer' => TRUE));
 ?>
 <div id="login-dropdown">
-       <a href="<?php echo $vars['url']; ?>pg/login" class="elgg-toggler elgg-toggles-login-dropdown-box elgg-button-dropdown">
-               <?php echo elgg_echo('login') ?>
-       </a>
-       <?php echo elgg_view_module('dropdown', '', $body, array('id' => 'login-dropdown-box')); ?>
+       <?php 
+               echo elgg_view('output/url', array(
+                       'href' => 'pg/login',
+                       'text' => elgg_echo('login'),
+                       'class' => "elgg-button elgg-button-dropdown elgg-toggler elgg-toggles-login-dropdown-box",
+               )); 
+               echo elgg_view_module('dropdown', '', $body, array('id' => 'login-dropdown-box')); 
+       ?>
 </div>
\ No newline at end of file

diff --git a/views/default/core/friends/picker.php b/views/default/core/friends/picker.php
index c17a484f31e986be77b4282a268779b89460a461..2df452958b84699fdadd4b0ae07d4c3849f58ff2 100644 (file)
--- a/views/default/core/friends/picker.php
+++ b/views/default/core/friends/picker.php
@@ -270,8 +270,8 @@ if ($formtarget) {
 ?>
        <div class="clearfix"></div>
        <div class="friendspicker-savebuttons">
-               <input type="submit" class="elgg-button-submit" value="<?php echo elgg_echo('save'); ?>" />
-               <input type="button" class="elgg-button-cancel" value="<?php echo elgg_echo('cancel'); ?>" onclick="$('a.collectionmembers<?php echo $friendspicker; ?>').click();" />
+               <input type="submit" class="elgg-button elgg-button-submit" value="<?php echo elgg_echo('save'); ?>" />
+               <input type="button" class="elgg-button elgg-button-cancel" value="<?php echo elgg_echo('cancel'); ?>" onclick="$('a.collectionmembers<?php echo $friendspicker; ?>').click();" />
        <br /></div>
        </form>
 

diff --git a/views/default/forms/profile/fields/reset.php b/views/default/forms/profile/fields/reset.php
index deb2d48efd80358d64f6add5ec9f43502bddf6e9..57dc00e8546405b5eff5d81befab26109aa235cf 100644 (file)
--- a/views/default/forms/profile/fields/reset.php
+++ b/views/default/forms/profile/fields/reset.php
@@ -5,6 +5,6 @@
 
 $params = array(
        'value' => elgg_echo('profile:resetdefault'),
-       'class' => 'elgg-button-action elgg-state-disabled',
+       'class' => 'elgg-button elgg-button-action elgg-state-disabled',
 );
 echo elgg_view('input/submit', $params);

diff --git a/views/default/input/button.php b/views/default/input/button.php
index 52a85ace686e884aacdb41d5575ce2f9292b424b..b1a884c778a0b358524bd0b7057bdb504b87e48e 100644 (file)
--- a/views/default/input/button.php
+++ b/views/default/input/button.php
@@ -6,11 +6,13 @@
  * @subpackage Core
  *
  * @uses $vars['src'] Src of an image
+ * 
+ * @todo Handle classes better
  */
 
 $defaults = array(
        'type' => 'button',
-       'class' => 'elgg-button-submit',
+       'class' => 'elgg-button elgg-button-action',
 );
 
 $vars = array_merge($defaults, $vars);

diff --git a/views/default/object/plugin/advanced.php b/views/default/object/plugin/advanced.php
index f6a760af4b6b1b0e93b0ae18cbebad8ef022d943..f4b3b6fbc45f9f3d3cdde80fdc9fbf239660d0a4 100644 (file)
--- a/views/default/object/plugin/advanced.php
+++ b/views/default/object/plugin/advanced.php
@@ -104,7 +104,7 @@ if ($can_activate) {
        $action_button = elgg_view('output/url', array(
                'text'          => elgg_echo('admin:plugins:cannot_activate'),
                'disabled'      => 'disabled',
-               'class'         => "elgg-button-action elgg-state-disabled"
+               'class'         => "elgg-button elgg-button-action elgg-state-disabled"
        ));
 }
 

diff --git a/views/default/page/layouts/content/header.php b/views/default/page/layouts/content/header.php
index 7a3ab1ae97d14653b7fe9fcf666743ebea4426b2..2a694c28fa87f48938f739cd61e9d978e173403f 100644 (file)
--- a/views/default/page/layouts/content/header.php
+++ b/views/default/page/layouts/content/header.php
@@ -36,7 +36,7 @@ if ($context) {
                        $params = array(
                                'href' => $new_link = elgg_normalize_url($new_link),
                                'text' => elgg_echo("$context:add"),
-                               'class' => 'elgg-button-action',
+                               'class' => 'elgg-button elgg-button-action',
                        );
                        $buttons = elgg_view('output/url', $params);
                }

diff --git a/views/default/page/layouts/widgets/add_button.php b/views/default/page/layouts/widgets/add_button.php
index 23c0b99eeee7c13e787ea43b75e5d1790cc55f7e..cfcbcc9989ab61e1f8e6c31949f5af8faea33087 100644 (file)
--- a/views/default/page/layouts/widgets/add_button.php
+++ b/views/default/page/layouts/widgets/add_button.php
@@ -4,7 +4,7 @@
  */
 ?>
 <div class="elgg-widget-add-control">
-       <a class="elgg-button-action elgg-toggler elgg-toggles-widgets-add-panel">
+       <a class="elgg-button elgg-button-action elgg-toggler elgg-toggles-widgets-add-panel">
                <?php echo elgg_echo('widgets:add'); ?>
        </a>
 </div>