eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of /var/www/trunk

Browse Source
This commit is contained in:
Robin Millette
2009-01-22 08:02:40 +00:00
parent e272adb321 a330bdac62
commit f871f52624
5 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
actions/nudge.php
View File

@@ -42,6 +42,7 @@ require_once INSTALLDIR.'/lib/mail.php';
* @package Laconica * @package Laconica
* @author Evan Prodromou <evan@controlyourself.ca> * @author Evan Prodromou <evan@controlyourself.ca>
* @author Robin Millette <millette@controlyourself.ca> * @author Robin Millette <millette@controlyourself.ca>
* @author Sarven Capadisli <csarven@controlyourself.ca>
* @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
* @link http://laconi.ca/ * @link http://laconi.ca/
*/ */
@@ -93,7 +94,7 @@ class NudgeAction extends Action
$this->element('title', null, _('Nudge sent')); $this->element('title', null, _('Nudge sent'));
$this->elementEnd('head'); $this->elementEnd('head');
$this->elementStart('body'); $this->elementStart('body');
common_nudge_response(); $this->element('p', array('id' => 'nudge_response'), _('Nudge sent!'));
$this->elementEnd('body'); $this->elementEnd('body');
$this->elementEnd('html'); $this->elementEnd('html');
} else { } else {

20
js/util.js
View File

@@ -108,16 +108,16 @@ $(document).ready(function(){
$("form.form_group_join").each(addAjaxHidden); $("form.form_group_join").each(addAjaxHidden);
$("form.form_group_leave").each(addAjaxHidden); $("form.form_group_leave").each(addAjaxHidden);
$("#nudge").ajaxForm ({ dataType: 'xml', $("#form_user_nudge").ajaxForm ({ dataType: 'xml',
beforeSubmit: function(xml) { $("form#nudge input[type=submit]").attr("disabled", "disabled"); beforeSubmit: function(xml) { $("#form_user_nudge input[type=submit]").attr("disabled", "disabled");
$("form#nudge input[type=submit]").addClass("disabled"); $("#form_user_nudge input[type=submit]").addClass("disabled");
}, },
success: function(xml) { $("#nudge").replaceWith(document._importNode($("#nudge_response", xml).get(0),true)); success: function(xml) { $("#form_user_nudge").replaceWith(document._importNode($("#nudge_response", xml).get(0),true));
$("#nudge input[type=submit]").removeAttr("disabled"); $("#form_user_nudge input[type=submit]").removeAttr("disabled");
$("#nudge input[type=submit]").removeClass("disabled"); $("#form_user_nudge input[type=submit]").removeClass("disabled");
} }
}); });
$("#nudge").each(addAjaxHidden); $("#form_user_nudge").each(addAjaxHidden);
var Subscribe = { dataType: 'xml', var Subscribe = { dataType: 'xml',
beforeSubmit: function(formData, jqForm, options) { $(".form_user_subscribe input[type=submit]").attr("disabled", "disabled"); beforeSubmit: function(formData, jqForm, options) { $(".form_user_subscribe input[type=submit]").attr("disabled", "disabled");

5
lib/util.php
View File

@@ -1660,11 +1660,6 @@ function common_session_token()
return $_SESSION['token']; return $_SESSION['token'];
} }
function common_nudge_response()
{
common_element('p', array('id' => 'nudge_response'), _('Nudge sent!'));
}
function common_cache_key($extra) function common_cache_key($extra)
{ {
return 'laconica:' . common_keyize(common_config('site', 'name')) . ':' . $extra; return 'laconica:' . common_keyize(common_config('site', 'name')) . ':' . $extra;

22
theme/base/css/display.css
View File

@@ -17,8 +17,8 @@ width:1004px;
width:71.714em; width:71.714em;
} }
h1,h2,h3,h4,h5,h6 { h1,h2,h3,h4,h5,h6 {
text-transform:uppercase; text-transform:uppercase;
margin-bottom:7px; margin-bottom:7px;
} }
h1 { h1 {
font-size:1.4em; font-size:1.4em;
@@ -34,8 +34,6 @@ h6 { font-size:0.9em; }
caption { caption {
font-weight:bold; font-weight:bold;
} }
.opened { display: block !important;}
.closed { display: none !important;}
legend { legend {
font-weight:bold; font-weight:bold;
@@ -56,6 +54,7 @@ border-radius:4px;
-moz-border-radius:4px; -moz-border-radius:4px;
-webkit-border-radius:4px; -webkit-border-radius:4px;
} }
input.submit { input.submit {
font-weight:bold; font-weight:bold;
} }
@@ -79,9 +78,6 @@ form label {
font-weight:bold; font-weight:bold;
/*margin:0 0 11px 0;*/ /*margin:0 0 11px 0;*/
} }
form ul li input {
}
input.checkbox { input.checkbox {
position:relative; position:relative;
top:2px; top:2px;
@@ -465,7 +461,7 @@ padding:1px 2px;
} }
#form_notice #notice_data-attach_view { #form_notice #notice_data-attach_view {
/*position:absolute;*/ position:absolute;
top:25px; top:25px;
right:30px; right:30px;
margin-left:4px; margin-left:4px;
@@ -614,10 +610,10 @@ text-align:left;
cursor:pointer; cursor:pointer;
width:100%; width:100%;
} }
.entity_actions a { .entity_actions a,
#entity_nudge p {
text-decoration:none; text-decoration:none;
font-weight:bold; font-weight:bold;
width:100%;
display:block; display:block;
} }
@@ -626,12 +622,14 @@ display:block;
.form_user_block input.submit, .form_user_block input.submit,
.form_user_unblock input.submit, .form_user_unblock input.submit,
#entity_send-a-message a, #entity_send-a-message a,
.form_user_nudge input.submit { .form_user_nudge input.submit,
#entity_nudge p {
border:0; border:0;
padding-left:20px; padding-left:20px;
} }
#entity_send-a-message a { #entity_send-a-message a,
#entity_nudge p {
padding:4px 4px 4px 23px; padding:4px 4px 4px 23px;
} }

8
theme/identica/css/display.css
View File

@@ -22,6 +22,7 @@ input, textarea, select {
border-color:#aaa; border-color:#aaa;
} }
input.submit, input.submit,
#form_notice.warning #notice_text-count, #form_notice.warning #notice_text-count,
#nav_register a, #nav_register a,
@@ -43,7 +44,8 @@ div.notice-options input,
.form_user_block input.submit, .form_user_block input.submit,
.form_user_unblock input.submit, .form_user_unblock input.submit,
#entity_send-a-message a, #entity_send-a-message a,
.form_user_nudge input.submit { .form_user_nudge input.submit,
#entity_nudge p {
color:#002E6E; color:#002E6E;
} }
@@ -135,7 +137,8 @@ background-image:url(../../base/images/icons/icon_vcard.gif);
#entity_send-a-message a, #entity_send-a-message a,
.form_user_nudge input.submit, .form_user_nudge input.submit,
.form_user_block input.submit, .form_user_block input.submit,
.form_user_unblock input.submit { .form_user_unblock input.submit,
#entity_nudge p {
background-position: 0 40%; background-position: 0 40%;
background-repeat: no-repeat; background-repeat: no-repeat;
background-color:transparent; background-color:transparent;
@@ -152,6 +155,7 @@ background-color:#97BFD1;
#entity_send-a-message a { #entity_send-a-message a {
background-image:url(../images/icons/twotone/green/quote.gif); background-image:url(../images/icons/twotone/green/quote.gif);
} }
#entity_nudge p,
.form_user_nudge input.submit { .form_user_nudge input.submit {
background-image:url(../images/icons/twotone/green/mail.gif); background-image:url(../images/icons/twotone/green/mail.gif);
} }