Favor/Disfavor form @class

Created icon, and add style
JS selector change
Fixed return actions

diff --git a/actions/disfavor.php b/actions/disfavor.php
index fc36f7c75fab62e547233725a471363aad5e7849..3e3e4a5476d48e43743c3807cb07f5df20455fd5 100644 (file)
--- a/actions/disfavor.php
+++ b/actions/disfavor.php
@@ -69,7 +69,7 @@ class DisfavorAction extends Action
         $user->blowFavesCache();
 
         if ($this->boolean('ajax')) {
-            common_start_html('text/xml;charset=utf-8', true);
+            $this->startHTML('text/xml;charset=utf-8', true);
             $this->elementStart('head');
             $this->element('title', null, _('Add to favorites'));
             $this->elementEnd('head');

diff --git a/actions/favor.php b/actions/favor.php
index 8d751a7a97f65ca8e0427d309ededd61e49fdb5b..afda93cff29ae109c81a6e287ad797934f7d7814 100644 (file)
--- a/actions/favor.php
+++ b/actions/favor.php
@@ -68,7 +68,7 @@ class FavorAction extends Action
         $user->blowFavesCache();
         
         if ($this->boolean('ajax')) {
-            common_start_html('text/xml;charset=utf-8', true);
+            $this->startHTML('text/xml;charset=utf-8', true);
             $this->elementStart('head');
             $this->element('title', null, _('Disfavor favorite'));
             $this->elementEnd('head');

diff --git a/actions/login.php b/actions/login.php
index c213e2ab5ee35251b592dec0158ed5d5e0898daa..4e580d36071482c905f913f1c70dec0f084d823a 100644 (file)
--- a/actions/login.php
+++ b/actions/login.php
@@ -107,13 +107,13 @@ class LoginAction extends Action
 
     function showForm($error=null)
     {
-       $this->error = $error;
-       $this->showPage();
+        $this->error = $error;
+        $this->showPage();
     }
 
     function title()
     {
-       return _('Login');
+        return _('Login');
     }
 
     function showPageNotice()

diff --git a/js/util.js b/js/util.js
index 6fe4770756a9601c30302f72ec4429914938d975..0a03b86c23e2f8a53a264c4706e52dac4994baea 100644 (file)
--- a/js/util.js
+++ b/js/util.js
@@ -81,10 +81,10 @@ $(document).ready(function(){
                this.appendChild(ajax);
        }
 
-       $("form.favor").ajaxForm(favoptions);
-       $("form.disfavor").ajaxForm(disoptions);
-       $("form.favor").each(addAjaxHidden);
-       $("form.disfavor").each(addAjaxHidden);
+       $("form.form_favor").ajaxForm(favoptions);
+       $("form.form_disfavor").ajaxForm(disoptions);
+       $("form.form_favor").each(addAjaxHidden);
+       $("form.form_disfavor").each(addAjaxHidden);
 
        $("#nudge").ajaxForm ({ dataType: 'xml',
                                                        beforeSubmit: function(xml) { $("form#nudge input[type=submit]").attr("disabled", "disabled");

diff --git a/lib/disfavorform.php b/lib/disfavorform.php
index ffca0cd8bf24638e7380eeac725ad00869694582..d0c3b183290512137864b2d9876c13b391fa2a8a 100644 (file)
--- a/lib/disfavorform.php
+++ b/lib/disfavorform.php
@@ -88,7 +88,7 @@ class DisfavorForm extends Form
 
     function action()
     {
-        common_local_url('disfavor');
+        return common_local_url('disfavor');
     }
 
     /**
@@ -136,7 +136,7 @@ class DisfavorForm extends Form
 
     function formClass()
     {
-       return 'disfavor';
+        return 'form_disfavor';
     }
 
-}
\ No newline at end of file
+}

diff --git a/lib/favorform.php b/lib/favorform.php
index 37e13fb1c5b1883fe2c0292eac8768f09d8b0bd2..f3a7a97569019e0b635c4fdf1f1cf656826ff905 100644 (file)
--- a/lib/favorform.php
+++ b/lib/favorform.php
@@ -88,7 +88,7 @@ class FavorForm extends Form
 
     function action()
     {
-        common_local_url('favor');
+        return common_local_url('favor');
     }
 
     /**
@@ -148,6 +148,6 @@ class FavorForm extends Form
     
     function formClass()
     {
-       return 'notice_favorite';
+        return 'form_favor';
     }
 }

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 789eaee4ce86f3fca142158e2f81401215efac54..9146a2bf54d0b19a3bcddd2bc2a9ec5a148d4f0a 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -817,11 +817,13 @@ float:left;
 }
 .notice-options .notice_delete,
 .notice-options .notice_reply,
-.notice-options .notice_favorite {
+.notice-options .form_favor,
+.notice-options .form_disfavor {
 position:absolute;
 top:0;
 }
-.notice-options .notice_favorite {
+.notice-options .form_favor,
+.notice-options .form_disfavor {
 left:0;
 }
 .notice-options .notice_reply {
@@ -861,11 +863,11 @@ padding:2px 0 2px 10px;
 }
 
 .notice-options .notice_delete dt,
-.notice-options .notice_favorite legend {
+.notice-options .form_favor legend {
 display:none;
 }
 .notice-options .notice_delete fieldset,
-.notice-options .notice_favorite fieldset {
+.notice-options .form_favor fieldset {
 border:0;
 padding:0;
 }

diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index d3d28001a48339e65522492a1e0a2c934b5de975..832862551475da0f4846e91853d52a5f898e1de9 100644 (file)
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -62,7 +62,7 @@ border-color:#fff;
 background-color:rgba(255, 255, 255, 0.2);
 }
 #site_nav_local_views a:hover {
-background-color:rgba(255, 255, 255, 0.7);:
+background-color:rgba(255, 255, 255, 0.7);
 }
 
 
@@ -87,7 +87,7 @@ background-image:url(../../base/images/icons/icon_atom.jpg);
 }
 #export_data li a.foaf {
 background-image:url(../../base/images/icons/icon_foaf.gif);
-=}
+}
 #export_data li a.export_vcard {
 background-image:url(../../base/images/icons/icon_vcard.gif);
 }
@@ -173,9 +173,12 @@ background-color:transparent;
 .notice-options .notice_reply a {
 background:transparent url(../images/icons/twotone/green/reply.gif) no-repeat 0 45%;
 }
-.notice-options form.notice_favorite input.submit {
+.notice-options form.form_favor input.submit {
 background:transparent url(../images/icons/twotone/green/favourite.gif) no-repeat 0 45%;
 }
+.notice-options form.form_disfavor input.submit {
+background:transparent url(../images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%;
+}
 .notice-options .notice_delete a {
 background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%;
 }