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

Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x

Browse Source
This commit is contained in:
Sarven Capadisli 2009-05-20 20:18:58 -04:00
commit f4e01f1444
16 changed files with 149 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actions/deletenotice.php
View File

@ -112,8 +112,8 @@ class DeletenoticeAction extends DeleteAction
$this->hidden('token', common_session_token());
$this->hidden('notice', $this->trimmed('notice'));
$this->element('p', null, _('Are you sure you want to delete this notice?'));
$this->submit('form_action-yes', _('Yes'), 'submit form_action-primary', 'yes');
$this->submit('form_action-no', _('No'), 'submit form_action-secondary', 'no');
$this->submit('form_action-no', _('No'), 'submit form_action-primary', 'no', _("Do not delete this notice"));
$this->submit('form_action-yes', _('Yes'), 'submit form_action-secondary', 'yes', _('Delete this notice'));
$this->elementEnd('fieldset');
$this->elementEnd('form');
}

5
actions/designsettings.php
View File

@ -140,11 +140,12 @@ class DesignsettingsAction extends AccountSettingsAction
$this->elementEnd('ul');
$this->elementEnd('fieldset');
$this->submit('save', _('Save'));
$this->element('input', array('id' => 'settings_design_reset',
'type' => 'reset',
'value' => 'Reset',
'class' => 'form_action-secondary'));
'class' => 'submit form_action-primary',
'title' => _('Reset back to default')));
$this->submit('save', _('Save'), 'submit form_action-secondary', 'save', _('Save design'));
/*TODO: Check submitted form values:
json_encode(form values)

2
lib/searchaction.php
View File

@ -51,7 +51,7 @@ class SearchAction extends Action
*
* @return boolean true
*/
function isReadOnly()
function isReadOnly($args)
{
return true;
}

109
plugins/WikiHashtagsPlugin.php Normal file
View File

@ -0,0 +1,109 @@
<?php
/**
* Laconica, the distributed open-source microblogging tool
*
* Plugin to show WikiHashtags content in the sidebar
*
* PHP version 5
*
* LICENCE: This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* 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
* 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/>.
*
* @category Plugin
* @package Laconica
* @author Evan Prodromou <evan@controlyourself.ca>
* @copyright 2008 Control Yourself, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://laconi.ca/
*/
if (!defined('LACONICA')) {
exit(1);
}
define('WIKIHASHTAGSPLUGIN_VERSION', '0.1');
/**
* Plugin to use WikiHashtags
*
* @category Plugin
* @package Laconica
* @author Evan Prodromou <evan@controlyourself.ca>
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://laconi.ca/
*
* @see Event
*/
class WikiHashtagsPlugin extends Plugin
{
function __construct($code=null)
{
parent::__construct();
}
function onStartShowSections($action)
{
$name = $action->trimmed('action');
if ($name == 'tag') {
$taginput = $action->trimmed('tag');
$tag = common_canonical_tag($taginput);
if (!empty($tag)) {
$url = sprintf('http://hashtags.wikia.com/index.php?title=%s&action=render',
urlencode($tag));
$editurl = sprintf('http://hashtags.wikia.com/index.php?title=%s&action=edit',
urlencode($tag));
$context = stream_context_create(array('http' => array('method' => "GET",
'header' =>
"User-Agent: " . $this->userAgent())));
$html = @file_get_contents($url, false, $context);
$action->elementStart('div', array('id' => 'wikihashtags', 'class' => 'section'));
if (!empty($html)) {
$action->element('style', null,
"span.editsection { display: none }\n".
"table.toc { display: none }");
$action->raw($html);
$action->elementStart('p');
$action->element('a', array('href' => $editurl,
'title' => sprintf(_('Edit the article for #%s on WikiHashtags'), $tag)),
_('Edit'));
$action->element('a', array('href' => 'http://www.gnu.org/copyleft/fdl.html',
'title' => _('Shared under the terms of the GNU Free Documentation License'),
'rel' => 'license'),
'GNU FDL');
$action->elementEnd('p');
} else {
$action->element('a', array('href' => $editurl),
sprintf(_('Start the article for #%s on WikiHashtags'), $tag));
}
$action->elementEnd('div');
}
}
return true;
}
function userAgent()
{
return 'WikiHashtagsPlugin/'.WIKIHASHTAGSPLUGIN_VERSION .
' Laconica/' . LACONICA_VERSION;
}
}

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

@ -198,9 +198,11 @@ padding:0 7px;
}
.form_settings input.form_action-primary {
padding:0;
}
.form_settings input.form_action-secondary {
margin-left:29px;
padding:0;
}
#form_search .submit {

7
theme/biz/css/base.css
View File

@ -198,10 +198,13 @@ padding:0 7px;
}
.form_settings input.form_action-secondary {
margin-left:29px;
.form_settings input.form_action-primary {
padding:0;
}
.form_settings input.form_action-secondary {
margin-left:29px;
}
#form_search .submit {
margin-left:11px;

4
theme/biz/css/display.css
View File

@ -36,7 +36,7 @@ border-color:#aaa;
border-color:#ddd;
}
.form_settings input.form_action-secondary {
.form_settings input.form_action-primary {
background:none;
}
@ -65,7 +65,7 @@ div.notice-options input,
.entity_send-a-message a,
.form_user_nudge input.submit,
.entity_nudge p,
.form_settings input.form_action-secondary {
.form_settings input.form_action-primary {
color:#002E6E;
}

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

@ -199,9 +199,11 @@ padding:0 7px;
}
.form_settings input.form_action-primary {
padding:0;
}
.form_settings input.form_action-secondary {
margin-left:29px;
padding:0;
}
#form_search .submit {
@ -1267,7 +1269,7 @@ border-color:#aaa;
border-color:#ddd;
}
.form_settings input.form_action-secondary {
.form_settings input.form_action-primary {
background:none;
}
@ -1296,7 +1298,7 @@ div.notice-options input,
.entity_send-a-message a,
.form_user_nudge input.submit,
.entity_nudge p,
.form_settings input.form_action-secondary {
.form_settings input.form_action-primary {
color:#0084B4;
}

4
theme/default/css/display.css
View File

@ -33,7 +33,7 @@ border-color:#aaa;
border-color:#C3D6DF;
}
.form_settings input.form_action-secondary {
.form_settings input.form_action-primary {
background:none;
}
@ -60,7 +60,7 @@ div.notice-options input,
.entity_send-a-message a,
.form_user_nudge input.submit,
.entity_nudge p,
.form_settings input.form_action-secondary {
.form_settings input.form_action-primary {
color:#002E6E;
}

4
theme/h4ck3r/css/base.css
View File

@ -189,9 +189,11 @@ padding:0 7px;
}
.form_settings input.form_action-primary {
padding:0;
}
.form_settings input.form_action-secondary {
margin-left:29px;
padding:0;
}
#form_search .submit {

4
theme/h4ck3r/css/display.css
View File

@ -38,7 +38,7 @@ color:#ccc;
border-color:#ddd;
}
.form_settings input.form_action-secondary {
.form_settings input.form_action-primary {
background:none;
}
@ -65,7 +65,7 @@ div.notice-options input,
.entity_send-a-message a,
.form_user_nudge input.submit,
.entity_nudge p,
.form_settings input.form_action-secondary {
.form_settings input.form_action-primary {
color:#0f0;
}

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

@ -33,7 +33,7 @@ border-color:#aaa;
border-color:#ddd;
}
.form_settings input.form_action-secondary {
.form_settings input.form_action-primary {
background:none;
}
@ -60,7 +60,7 @@ div.notice-options input,
.entity_send-a-message a,
.form_user_nudge input.submit,
.entity_nudge p,
.form_settings input.form_action-secondary {
.form_settings input.form_action-primary {
color:#002E6E;
}

4
theme/otalk/css/base.css
View File

@ -198,9 +198,11 @@ padding:0 7px;
}
.form_settings input.form_action-primary {
padding:0;
}
.form_settings input.form_action-secondary {
margin-left:29px;
padding:0;
}
#form_search .submit {

4
theme/otalk/css/display.css
View File

@ -37,7 +37,7 @@ border-color:#aaa;
border-color:#ddd;
}
.form_settings input.form_action-secondary {
.form_settings input.form_action-primary {
background:none;
}
@ -64,7 +64,7 @@ div.notice-options input,
.entity_send-a-message a,
.form_user_nudge input.submit,
.entity_nudge p,
.form_settings input.form_action-secondary {
.form_settings input.form_action-primary {
color:#8F0000;
}

4
theme/pigeonthoughts/css/base.css
View File

@ -199,9 +199,11 @@ padding:0 7px;
}
.form_settings input.form_action-primary {
padding:0;
}
.form_settings input.form_action-secondary {
margin-left:29px;
padding:0;
}
#form_search .submit {

4
theme/pigeonthoughts/css/display.css
View File

@ -36,7 +36,7 @@ border-color:#aaa;
border-color:#ddd;
}
.form_settings input.form_action-secondary {
.form_settings input.form_action-primary {
background:none;
}
@ -63,7 +63,7 @@ div.notice-options input,
.entity_send-a-message a,
.form_user_nudge input.submit,
.entity_nudge p,
.form_settings input.form_action-secondary {
.form_settings input.form_action-primary {
color:#000;
}