Merge remote branch 'origin/1.0.x' into 1.0.x
This commit is contained in:
Evan Prodromou
commit
5976a8542b
@ -22,7 +22,7 @@
|
||||
* @category Applications
|
||||
* @package StatusNet
|
||||
* @author Zach Copley <zach@status.net>
|
||||
* @copyright 2008-2009 StatusNet, Inc.
|
||||
* @copyright 2008-2011 StatusNet, Inc.
|
||||
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
|
||||
* @link http://status.net/
|
||||
*/
|
||||
@ -290,7 +290,13 @@ class NewApplicationAction extends OwnerDesignAction
|
||||
$app->query('ROLLBACK');
|
||||
}
|
||||
|
||||
$app->uploadLogo();
|
||||
try {
|
||||
$app->uploadLogo();
|
||||
} catch (Exception $e) {
|
||||
$app->query('ROLLBACK');
|
||||
$this->showForm(_('Invalid image.'));
|
||||
return;
|
||||
}
|
||||
|
||||
$app->query('COMMIT');
|
||||
|
||||
|
||||
BIN
favicon.ico
BIN
favicon.ico
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.4 KiB |
90
js/util.js
90
js/util.js
@ -424,6 +424,7 @@ var SN = { // StatusNet
|
||||
.fadeIn(2500);
|
||||
SN.U.NoticeWithAttachment($('#'+notice.id));
|
||||
SN.U.NoticeReplyTo($('#'+notice.id));
|
||||
SN.U.switchInputFormTab("placeholder");
|
||||
}
|
||||
} else {
|
||||
// Not on a timeline that this belongs on?
|
||||
@ -599,7 +600,7 @@ var SN = { // StatusNet
|
||||
nextStep();
|
||||
} else {
|
||||
// Remove placeholder if any
|
||||
$('li.notice-reply-placeholder').remove();
|
||||
list.find('li.notice-reply-placeholder').remove();
|
||||
|
||||
// Create the reply form entry at the end
|
||||
var replyItem = $('li.notice-reply', list);
|
||||
@ -638,10 +639,12 @@ var SN = { // StatusNet
|
||||
var placeholder = $('<li class="notice-reply-placeholder">' +
|
||||
'<input class="placeholder">' +
|
||||
'</li>');
|
||||
placeholder.click(function() {
|
||||
SN.U.NoticeInlineReplyTrigger(notice);
|
||||
});
|
||||
placeholder.find('input').val(SN.msg('reply_placeholder'));
|
||||
placeholder.find('input')
|
||||
.val(SN.msg('reply_placeholder'))
|
||||
.focus(function() {
|
||||
SN.U.NoticeInlineReplyTrigger(notice);
|
||||
return false;
|
||||
});
|
||||
list.append(placeholder);
|
||||
},
|
||||
|
||||
@ -1015,8 +1018,7 @@ var SN = { // StatusNet
|
||||
}
|
||||
|
||||
var NGW = form.find('.notice_data-geo_wrap');
|
||||
var geocodeURL = NGW.attr('title');
|
||||
NGW.removeAttr('title');
|
||||
var geocodeURL = NGW.attr('data-api');
|
||||
|
||||
label
|
||||
.attr('title', label.text());
|
||||
@ -1116,6 +1118,7 @@ var SN = { // StatusNet
|
||||
wrapper = $('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">×</button><div class="geo_status"></div></div>');
|
||||
wrapper.find('button.close').click(function() {
|
||||
form.find('[name=notice_data-geo]').removeAttr('checked').change();
|
||||
return false;
|
||||
});
|
||||
form.append(wrapper);
|
||||
}
|
||||
@ -1287,10 +1290,22 @@ var SN = { // StatusNet
|
||||
switchInputFormTab: function(tag) {
|
||||
// The one that's current isn't current anymore
|
||||
$('.input_form_nav_tab.current').removeClass('current');
|
||||
$('#input_form_nav_'+tag).addClass('current');
|
||||
if (tag == 'placeholder') {
|
||||
// Hack: when showing the placeholder, mark the tab
|
||||
// as current for 'Status'.
|
||||
$('#input_form_nav_status').addClass('current');
|
||||
} else {
|
||||
$('#input_form_nav_'+tag).addClass('current');
|
||||
}
|
||||
|
||||
$('.input_form.current').removeClass('current');
|
||||
$('#input_form_'+tag).addClass('current');
|
||||
$('#input_form_'+tag)
|
||||
.addClass('current')
|
||||
.find('.ajax-notice').each(function() {
|
||||
var form = $(this);
|
||||
SN.Init.NoticeFormSetup(form);
|
||||
})
|
||||
.find('textarea:first').focus();
|
||||
}
|
||||
},
|
||||
|
||||
@ -1305,9 +1320,49 @@ var SN = { // StatusNet
|
||||
*/
|
||||
NoticeForm: function() {
|
||||
if ($('body.user_in').length > 0) {
|
||||
$('.ajax-notice').each(function() {
|
||||
var form = $(this);
|
||||
SN.Init.NoticeFormSetup(form);
|
||||
// SN.Init.NoticeFormSetup() will get run
|
||||
// when forms get displayed for the first time...
|
||||
|
||||
// Hack to initialize the placeholder at top
|
||||
$('#input_form_placeholder input.placeholder').focus(function() {
|
||||
SN.U.switchInputFormTab("status");
|
||||
});
|
||||
|
||||
// Make inline reply forms self-close when clicking out.
|
||||
$('body').bind('click', function(e) {
|
||||
var currentForm = $('#content .input_forms div.current');
|
||||
if (currentForm.length > 0) {
|
||||
if ($('#content .input_forms').has(e.target).length == 0) {
|
||||
// If all fields are empty, switch back to the placeholder.
|
||||
var fields = currentForm.find('textarea, input[type=text], input[type=""]');
|
||||
var anything = false;
|
||||
fields.each(function() {
|
||||
anything = anything || $(this).val();
|
||||
});
|
||||
if (!anything) {
|
||||
SN.U.switchInputFormTab("placeholder");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var openReplies = $('li.notice-reply');
|
||||
if (openReplies.length > 0) {
|
||||
var target = $(e.target);
|
||||
openReplies.each(function() {
|
||||
// Did we click outside this one?
|
||||
var replyItem = $(this);
|
||||
if (replyItem.has(e.target).length == 0) {
|
||||
var textarea = replyItem.find('.notice_data-text:first');
|
||||
var cur = $.trim(textarea.val());
|
||||
// Only close if there's been no edit.
|
||||
if (cur == '' || cur == textarea.data('initialText')) {
|
||||
var parentNotice = replyItem.closest('li.notice');
|
||||
replyItem.remove();
|
||||
SN.U.NoticeInlineReplyPlaceholder(parentNotice);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
@ -1320,10 +1375,13 @@ var SN = { // StatusNet
|
||||
* @param {jQuery} form
|
||||
*/
|
||||
NoticeFormSetup: function(form) {
|
||||
SN.U.NoticeLocationAttach(form);
|
||||
SN.U.FormNoticeXHR(form);
|
||||
SN.U.FormNoticeEnhancements(form);
|
||||
SN.U.NoticeDataAttach(form);
|
||||
if (!form.data('NoticeFormSetup')) {
|
||||
SN.U.NoticeLocationAttach(form);
|
||||
SN.U.FormNoticeXHR(form);
|
||||
SN.U.FormNoticeEnhancements(form);
|
||||
SN.U.NoticeDataAttach(form);
|
||||
form.data('NoticeFormSetup', true);
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
|
||||
2
js/util.min.js
vendored
2
js/util.min.js
vendored
File diff suppressed because one or more lines are too long
@ -602,9 +602,11 @@ class Action extends HTMLOutputter // lawsuit
|
||||
'class' => 'input_form_nav_tab');
|
||||
|
||||
if ($tag == 'status') {
|
||||
// We're actually showing the placeholder form,
|
||||
// but we special-case the 'Status' tab as if
|
||||
// it were a small version of it.
|
||||
$attrs['class'] .= ' current';
|
||||
}
|
||||
|
||||
$this->elementStart('li', $attrs);
|
||||
|
||||
$this->element('a',
|
||||
@ -615,15 +617,18 @@ class Action extends HTMLOutputter // lawsuit
|
||||
|
||||
$this->elementEnd('ul');
|
||||
|
||||
$attrs = array('class' => 'input_form current',
|
||||
'id' => 'input_form_placeholder');
|
||||
$this->elementStart('div', $attrs);
|
||||
$form = new NoticePlaceholderForm($this);
|
||||
$form->show();
|
||||
$this->elementEnd('div');
|
||||
|
||||
foreach ($tabs as $tag => $title) {
|
||||
|
||||
$attrs = array('class' => 'input_form',
|
||||
'id' => 'input_form_'.$tag);
|
||||
|
||||
if ($tag == 'status') {
|
||||
$attrs['class'] .= ' current';
|
||||
}
|
||||
|
||||
$this->elementStart('div', $attrs);
|
||||
|
||||
$form = null;
|
||||
|
||||
@ -309,7 +309,8 @@ abstract class MicroAppPlugin extends Plugin
|
||||
'is_local' => Notice::REMOTE_OMB,
|
||||
'source' => 'ostatus');
|
||||
|
||||
$this->saveNoticeFromActivity($activity, $actor);
|
||||
// $actor is an ostatus_profile
|
||||
$this->saveNoticeFromActivity($activity, $actor->localProfile(), $options);
|
||||
|
||||
return false;
|
||||
}
|
||||
@ -365,7 +366,8 @@ abstract class MicroAppPlugin extends Plugin
|
||||
'is_local' => Notice::REMOTE_OMB,
|
||||
'source' => 'ostatus');
|
||||
|
||||
$this->saveNoticeFromActivity($activity, $actor, $options);
|
||||
// $actor is an ostatus_profile
|
||||
$this->saveNoticeFromActivity($activity, $actor->localProfile(), $options);
|
||||
|
||||
return false;
|
||||
}
|
||||
@ -389,6 +391,7 @@ abstract class MicroAppPlugin extends Plugin
|
||||
|
||||
$options = array('source' => 'atompub');
|
||||
|
||||
// $user->getProfile() is a Profile
|
||||
$this->saveNoticeFromActivity($activity,
|
||||
$user->getProfile(),
|
||||
$options);
|
||||
@ -421,6 +424,7 @@ abstract class MicroAppPlugin extends Plugin
|
||||
'url' => $object->link,
|
||||
'source' => 'restore');
|
||||
|
||||
// $user->getProfile() is a Profile
|
||||
$saved = $this->saveNoticeFromActivity($activity,
|
||||
$user->getProfile(),
|
||||
$options);
|
||||
|
||||
@ -208,7 +208,7 @@ class NoticeForm extends Form
|
||||
$this->out->hidden('notice_data-location_ns', empty($this->location_ns) ? (empty($this->profile->location_ns) ? null : $this->profile->location_ns) : $this->location_ns, 'location_ns');
|
||||
|
||||
$this->out->elementStart('div', array('class' => 'notice_data-geo_wrap',
|
||||
'title' => common_local_url('geocode')));
|
||||
'data-api' => common_local_url('geocode')));
|
||||
|
||||
// @fixme checkbox method allows no way to change the id without changing the name
|
||||
//$this->out->checkbox('notice_data-geo', _('Share my location'), true);
|
||||
|
||||
60
lib/noticeplaceholderform.php
Normal file
60
lib/noticeplaceholderform.php
Normal file
@ -0,0 +1,60 @@
|
||||
<?php
|
||||
/**
|
||||
* StatusNet, the distributed open-source microblogging tool
|
||||
*
|
||||
* Form for posting a notice
|
||||
*
|
||||
* 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 Form
|
||||
* @package StatusNet
|
||||
* @author Brion Vibber <brion@status.net>
|
||||
* @copyright 2011 StatusNet, Inc.
|
||||
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
|
||||
* @link http://status.net/
|
||||
*/
|
||||
|
||||
if (!defined('STATUSNET') && !defined('LACONICA')) {
|
||||
exit(1);
|
||||
}
|
||||
|
||||
require_once INSTALLDIR.'/lib/form.php';
|
||||
|
||||
/**
|
||||
* Placeholder form for posting a notice
|
||||
*
|
||||
* Frequently-used form for posting a notice
|
||||
*
|
||||
* @category Form
|
||||
* @package StatusNet
|
||||
* @author Brion Vibber <brion@status.net>
|
||||
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
|
||||
* @link http://status.net/
|
||||
*
|
||||
* @see HTMLOutputter
|
||||
*/
|
||||
class NoticePlaceholderForm extends Widget
|
||||
{
|
||||
function show()
|
||||
{
|
||||
// Similar to that for inline replies, but not quite!
|
||||
$placeholder = _('Update your status...');
|
||||
$this->out->elementStart('div', 'form_notice_placeholder');
|
||||
$this->out->element('input', array('class' => 'placeholder',
|
||||
'value' => $placeholder));
|
||||
$this->out->elementEnd('div');
|
||||
}
|
||||
}
|
||||
@ -187,18 +187,6 @@ class UserdirectoryAction extends Action
|
||||
$this->elementEnd('div');
|
||||
}
|
||||
|
||||
/**
|
||||
* Local navigation
|
||||
*
|
||||
* This page is part of the public group, so show that.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
function showLocalNav()
|
||||
{
|
||||
$nav = new PublicGroupNav($this);
|
||||
$nav->show();
|
||||
}
|
||||
|
||||
/**
|
||||
* Content area
|
||||
|
||||
@ -128,8 +128,8 @@ class AlphaNav extends Widget
|
||||
$current = $this->action->arg('filter');
|
||||
|
||||
// Highlight the selected filter. If there is no selected
|
||||
// filter, highlight the first filter in the list
|
||||
if (!isset($current) && $i == 0
|
||||
// filter, highlight the last filter in the list (all)
|
||||
if (!isset($current) && $i == ($size - 1)
|
||||
|| $current === strtolower($filter)) {
|
||||
$classes .= 'current ';
|
||||
}
|
||||
|
||||
@ -47,6 +47,7 @@ class Poll extends Managed_DataObject
|
||||
{
|
||||
public $__table = 'poll'; // table name
|
||||
public $id; // char(36) primary key not null -> UUID
|
||||
public $uri;
|
||||
public $profile_id; // int -> profile.id
|
||||
public $question; // text
|
||||
public $options; // text; newline(?)-delimited
|
||||
@ -127,6 +128,23 @@ class Poll extends Managed_DataObject
|
||||
return explode("\n", $this->options);
|
||||
}
|
||||
|
||||
/**
|
||||
* Is this a valid selection index?
|
||||
*
|
||||
* @param numeric $selection (1-based)
|
||||
* @return boolean
|
||||
*/
|
||||
function isValidSelection($selection)
|
||||
{
|
||||
if ($selection != intval($selection)) {
|
||||
return false;
|
||||
}
|
||||
if ($selection < 1 || $selection > count($this->getOptions())) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
function getNotice()
|
||||
{
|
||||
return Notice::staticGet('uri', $this->uri);
|
||||
|
||||
@ -47,7 +47,10 @@ if (!defined('STATUSNET')) {
|
||||
class PollPlugin extends MicroAppPlugin
|
||||
{
|
||||
const VERSION = '0.1';
|
||||
const POLL_OBJECT = 'http://apinamespace.org/activitystreams/object/poll';
|
||||
|
||||
// @fixme which domain should we use for these namespaces?
|
||||
const POLL_OBJECT = 'http://apinamespace.org/activitystreams/object/poll';
|
||||
const POLL_RESPONSE_OBJECT = 'http://apinamespace.org/activitystreams/object/poll-response';
|
||||
|
||||
/**
|
||||
* Database schema setup
|
||||
@ -124,8 +127,15 @@ class PollPlugin extends MicroAppPlugin
|
||||
function onRouterInitialized($m)
|
||||
{
|
||||
$m->connect('main/poll/new',
|
||||
array('action' => 'newpoll'),
|
||||
array('id' => '[0-9]+'));
|
||||
array('action' => 'newpoll'));
|
||||
|
||||
$m->connect('main/poll/:id',
|
||||
array('action' => 'showpoll'),
|
||||
array('id' => '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'));
|
||||
|
||||
$m->connect('main/poll/response/:id',
|
||||
array('action' => 'showpollresponse'),
|
||||
array('id' => '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'));
|
||||
|
||||
$m->connect('main/poll/:id/respond',
|
||||
array('action' => 'respondpoll'),
|
||||
@ -155,7 +165,7 @@ class PollPlugin extends MicroAppPlugin
|
||||
|
||||
function types()
|
||||
{
|
||||
return array(self::POLL_OBJECT);
|
||||
return array(self::POLL_OBJECT, self::POLL_RESPONSE_OBJECT);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -190,17 +200,124 @@ class PollPlugin extends MicroAppPlugin
|
||||
function saveNoticeFromActivity($activity, $profile, $options=array())
|
||||
{
|
||||
// @fixme
|
||||
common_log(LOG_DEBUG, "XXX activity: " . var_export($activity, true));
|
||||
common_log(LOG_DEBUG, "XXX profile: " . var_export($profile, true));
|
||||
common_log(LOG_DEBUG, "XXX options: " . var_export($options, true));
|
||||
|
||||
// Ok for now, we can grab stuff from the XML entry directly.
|
||||
// This won't work when reading from JSON source
|
||||
if ($activity->entry) {
|
||||
$pollElements = $activity->entry->getElementsByTagNameNS(self::POLL_OBJECT, 'poll');
|
||||
$responseElements = $activity->entry->getElementsByTagNameNS(self::POLL_OBJECT, 'response');
|
||||
if ($pollElements->length) {
|
||||
$data = $pollElements->item(0);
|
||||
$question = $data->getAttribute('question');
|
||||
$opts = array();
|
||||
foreach ($data->attributes as $node) {
|
||||
$name = $node->nodeName;
|
||||
if (substr($name, 0, 6) == 'option') {
|
||||
$n = intval(substr($name, 6));
|
||||
if ($n > 0) {
|
||||
$opts[$n - 1] = $node->nodeValue;
|
||||
}
|
||||
}
|
||||
}
|
||||
common_log(LOG_DEBUG, "YYY question: $question");
|
||||
common_log(LOG_DEBUG, "YYY opts: " . var_export($opts, true));
|
||||
try {
|
||||
$notice = Poll::saveNew($profile, $question, $opts, $options);
|
||||
common_log(LOG_DEBUG, "YYY ok: " . $notice->id);
|
||||
return $notice;
|
||||
} catch (Exception $e) {
|
||||
common_log(LOG_DEBUG, "YYY fail: " . $e->getMessage());
|
||||
}
|
||||
} else if ($responseElements->length) {
|
||||
$data = $responseElements->item(0);
|
||||
$pollUri = $data->getAttribute('poll');
|
||||
$selection = intval($data->getAttribute('selection'));
|
||||
|
||||
if (!$pollUri) {
|
||||
throw new Exception('Invalid poll response: no poll reference.');
|
||||
}
|
||||
$poll = Poll::staticGet('uri', $pollUri);
|
||||
if (!$poll) {
|
||||
throw new Exception('Invalid poll response: poll is unknown.');
|
||||
}
|
||||
try {
|
||||
$notice = Poll_response::saveNew($profile, $poll, $selection, $options);
|
||||
common_log(LOG_DEBUG, "YYY response ok: " . $notice->id);
|
||||
return $notice;
|
||||
} catch (Exception $e) {
|
||||
common_log(LOG_DEBUG, "YYY response fail: " . $e->getMessage());
|
||||
}
|
||||
} else {
|
||||
common_log(LOG_DEBUG, "YYY no poll data");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function activityObjectFromNotice($notice)
|
||||
{
|
||||
assert($this->isMyNotice($notice));
|
||||
|
||||
switch ($notice->object_type) {
|
||||
case self::POLL_OBJECT:
|
||||
return $this->activityObjectFromNoticePoll($notice);
|
||||
case self::POLL_RESPONSE_OBJECT:
|
||||
return $this->activityObjectFromNoticePollResponse($notice);
|
||||
default:
|
||||
throw new Exception('Unexpected type for poll plugin: ' . $notice->object_type);
|
||||
}
|
||||
}
|
||||
|
||||
function activityObjectFromNoticePollResponse($notice)
|
||||
{
|
||||
$object = new ActivityObject();
|
||||
$object->id = $notice->uri;
|
||||
$object->type = self::POLL_OBJECT;
|
||||
$object->title = 'Poll title';
|
||||
$object->summary = 'Poll summary';
|
||||
$object->title = $notice->content;
|
||||
$object->summary = $notice->content;
|
||||
$object->link = $notice->bestUrl();
|
||||
|
||||
$response = Poll_response::getByNotice($notice);
|
||||
if (!$response) {
|
||||
common_log(LOG_DEBUG, "QQQ notice uri: $notice->uri");
|
||||
} else {
|
||||
$poll = $response->getPoll();
|
||||
/**
|
||||
* For the moment, using a kind of icky-looking schema that happens to
|
||||
* work with out code for generating both Atom and JSON forms, though
|
||||
* I don't like it:
|
||||
*
|
||||
* <poll:response xmlns:poll="http://apinamespace.org/activitystreams/object/poll"
|
||||
* poll="http://..../poll/...."
|
||||
* selection="3" />
|
||||
*
|
||||
* "poll:response": {
|
||||
* "xmlns:poll": http://apinamespace.org/activitystreams/object/poll
|
||||
* "uri": "http://..../poll/...."
|
||||
* "selection": 3
|
||||
* }
|
||||
*
|
||||
*/
|
||||
// @fixme there's no way to specify an XML node tree here, like <poll><option/><option/></poll>
|
||||
// @fixme there's no way to specify a JSON array or multi-level tree unless you break the XML attribs
|
||||
// @fixme XML node contents don't get shown in JSON
|
||||
$data = array('xmlns:poll' => self::POLL_OBJECT,
|
||||
'poll' => $poll->uri,
|
||||
'selection' => intval($response->selection));
|
||||
$object->extra[] = array('poll:response', $data, '');
|
||||
}
|
||||
return $object;
|
||||
}
|
||||
|
||||
function activityObjectFromNoticePoll($notice)
|
||||
{
|
||||
$object = new ActivityObject();
|
||||
$object->id = $notice->uri;
|
||||
$object->type = self::POLL_RESPONSE_OBJECT;
|
||||
$object->title = $notice->content;
|
||||
$object->summary = $notice->content;
|
||||
$object->link = $notice->bestUrl();
|
||||
|
||||
$poll = Poll::getByNotice($notice);
|
||||
@ -218,7 +335,7 @@ class PollPlugin extends MicroAppPlugin
|
||||
* option2="Option two"
|
||||
* option3="Option three"></poll:data>
|
||||
*
|
||||
* "poll:data": {
|
||||
* "poll:response": {
|
||||
* "xmlns:poll": http://apinamespace.org/activitystreams/object/poll
|
||||
* "question": "Who wants a poll question?"
|
||||
* "option1": "Option one"
|
||||
@ -235,7 +352,7 @@ class PollPlugin extends MicroAppPlugin
|
||||
foreach ($poll->getOptions() as $i => $opt) {
|
||||
$data['option' . ($i + 1)] = $opt;
|
||||
}
|
||||
$object->extra[] = array('poll:data', $data, '');
|
||||
$object->extra[] = array('poll:poll', $data, '');
|
||||
return $object;
|
||||
}
|
||||
|
||||
@ -245,6 +362,18 @@ class PollPlugin extends MicroAppPlugin
|
||||
* and Bookmark plugin for if that's right.
|
||||
*/
|
||||
function showNotice($notice, $out)
|
||||
{
|
||||
switch ($notice->object_type) {
|
||||
case self::POLL_OBJECT:
|
||||
return $this->showNoticePoll($notice, $out);
|
||||
case self::POLL_RESPONSE_OBJECT:
|
||||
return $this->showNoticePollResponse($notice, $out);
|
||||
default:
|
||||
throw new Exception('Unexpected type for poll plugin: ' . $notice->object_type);
|
||||
}
|
||||
}
|
||||
|
||||
function showNoticePoll($notice, $out)
|
||||
{
|
||||
$user = common_current_user();
|
||||
|
||||
@ -275,6 +404,18 @@ class PollPlugin extends MicroAppPlugin
|
||||
$out->elementStart('div', array('class' => 'entry-content'));
|
||||
}
|
||||
|
||||
function showNoticePollResponse($notice, $out)
|
||||
{
|
||||
$user = common_current_user();
|
||||
|
||||
// @hack we want regular rendering, then just add stuff after that
|
||||
$nli = new NoticeListItem($notice, $out);
|
||||
$nli->showNotice();
|
||||
|
||||
// @fixme
|
||||
$out->elementStart('div', array('class' => 'entry-content'));
|
||||
}
|
||||
|
||||
function entryForm($out)
|
||||
{
|
||||
return new NewPollForm($out);
|
||||
|
||||
@ -46,7 +46,8 @@ if (!defined('STATUSNET')) {
|
||||
class Poll_response extends Managed_DataObject
|
||||
{
|
||||
public $__table = 'poll_response'; // table name
|
||||
public $poll_id; // char(36) primary key not null -> UUID
|
||||
public $id; // char(36) primary key not null -> UUID
|
||||
public $poll_id; // char(36) -> poll.id UUID
|
||||
public $profile_id; // int -> profile.id
|
||||
public $selection; // int -> choice #
|
||||
public $created; // datetime
|
||||
@ -94,12 +95,16 @@ class Poll_response extends Managed_DataObject
|
||||
return array(
|
||||
'description' => 'Record of responses to polls',
|
||||
'fields' => array(
|
||||
'poll_id' => array('type' => 'char', 'length' => 36, 'not null' => true, 'description' => 'UUID'),
|
||||
'id' => array('type' => 'char', 'length' => 36, 'not null' => true, 'description' => 'UUID of the response'),
|
||||
'uri' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'UUID to the response notice'),
|
||||
'poll_id' => array('type' => 'char', 'length' => 36, 'not null' => true, 'description' => 'UUID of poll being responded to'),
|
||||
'profile_id' => array('type' => 'int'),
|
||||
'selection' => array('type' => 'int'),
|
||||
'created' => array('type' => 'datetime', 'not null' => true),
|
||||
),
|
||||
'primary key' => array('id'),
|
||||
'unique keys' => array(
|
||||
'poll_uri_key' => array('uri'),
|
||||
'poll_response_poll_id_profile_id_key' => array('poll_id', 'profile_id'),
|
||||
),
|
||||
'indexes' => array(
|
||||
@ -107,4 +112,115 @@ class Poll_response extends Managed_DataObject
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a poll response based on a notice
|
||||
*
|
||||
* @param Notice $notice Notice to check for
|
||||
*
|
||||
* @return Poll_response found response or null
|
||||
*/
|
||||
|
||||
function getByNotice($notice)
|
||||
{
|
||||
return self::staticGet('uri', $notice->uri);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the notice that belongs to this response...
|
||||
*
|
||||
* @return Notice
|
||||
*/
|
||||
function getNotice()
|
||||
{
|
||||
return Notice::staticGet('uri', $this->uri);
|
||||
}
|
||||
|
||||
function bestUrl()
|
||||
{
|
||||
return $this->getNotice()->bestUrl();
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @return Poll
|
||||
*/
|
||||
function getPoll()
|
||||
{
|
||||
return Poll::staticGet('id', $this->poll_id);
|
||||
}
|
||||
/**
|
||||
* Save a new poll notice
|
||||
*
|
||||
* @param Profile $profile
|
||||
* @param Poll $poll the poll being responded to
|
||||
* @param int $selection (1-based)
|
||||
* @param array $opts (poll responses)
|
||||
*
|
||||
* @return Notice saved notice
|
||||
*/
|
||||
|
||||
static function saveNew($profile, $poll, $selection, $options=null)
|
||||
{
|
||||
if (empty($options)) {
|
||||
$options = array();
|
||||
}
|
||||
|
||||
if (!$poll->isValidSelection($selection)) {
|
||||
throw new ClientException(_m('Invalid poll selection.'));
|
||||
}
|
||||
$opts = $poll->getOptions();
|
||||
$answer = $opts[$selection - 1];
|
||||
|
||||
$pr = new Poll_response();
|
||||
$pr->id = UUID::gen();
|
||||
$pr->profile_id = $profile->id;
|
||||
$pr->poll_id = $poll->id;
|
||||
$pr->selection = $selection;
|
||||
|
||||
if (array_key_exists('created', $options)) {
|
||||
$pr->created = $options['created'];
|
||||
} else {
|
||||
$pr->created = common_sql_now();
|
||||
}
|
||||
|
||||
if (array_key_exists('uri', $options)) {
|
||||
$pr->uri = $options['uri'];
|
||||
} else {
|
||||
$pr->uri = common_local_url('showpollresponse',
|
||||
array('id' => $pr->id));
|
||||
}
|
||||
|
||||
common_log(LOG_DEBUG, "Saving poll response: $pr->id $pr->uri");
|
||||
$pr->insert();
|
||||
|
||||
$content = sprintf(_m('voted for "%s"'),
|
||||
$answer);
|
||||
$rendered = sprintf(_m('voted for “<a href="%s">%s</a>”'),
|
||||
htmlspecialchars($poll->uri),
|
||||
htmlspecialchars($answer));
|
||||
|
||||
$tags = array();
|
||||
$replies = array();
|
||||
|
||||
$options = array_merge(array('urls' => array(),
|
||||
'rendered' => $rendered,
|
||||
'tags' => $tags,
|
||||
'replies' => $replies,
|
||||
'reply_to' => $poll->getNotice()->id,
|
||||
'object_type' => PollPlugin::POLL_RESPONSE_OBJECT),
|
||||
$options);
|
||||
|
||||
if (!array_key_exists('uri', $options)) {
|
||||
$options['uri'] = $pr->uri;
|
||||
}
|
||||
|
||||
$saved = Notice::saveNew($profile->id,
|
||||
$content,
|
||||
array_key_exists('source', $options) ?
|
||||
$options['source'] : 'web',
|
||||
$options);
|
||||
|
||||
return $saved;
|
||||
}
|
||||
}
|
||||
|
||||
@ -75,6 +75,9 @@ class RespondPollAction extends Action
|
||||
function prepare($argarray)
|
||||
{
|
||||
parent::prepare($argarray);
|
||||
if ($this->boolean('ajax')) {
|
||||
StatusNet::setApi(true);
|
||||
}
|
||||
|
||||
$this->user = common_current_user();
|
||||
|
||||
@ -132,20 +135,16 @@ class RespondPollAction extends Action
|
||||
function respondPoll()
|
||||
{
|
||||
try {
|
||||
$response = new Poll_response();
|
||||
$response->poll_id = $this->poll->id;
|
||||
$response->profile_id = $this->user->id;
|
||||
$response->selection = $this->selection;
|
||||
$response->created = common_sql_now();
|
||||
$response->insert();
|
||||
|
||||
$notice = Poll_response::saveNew($this->user->getProfile(),
|
||||
$this->poll,
|
||||
$this->selection);
|
||||
} catch (ClientException $ce) {
|
||||
$this->error = $ce->getMessage();
|
||||
$this->showPage();
|
||||
return;
|
||||
}
|
||||
|
||||
if ($this->arg('ajax')) {
|
||||
if ($this->boolean('ajax')) {
|
||||
header('Content-Type: text/xml;charset=utf-8');
|
||||
$this->xw->startDocument('1.0', 'UTF-8');
|
||||
$this->elementStart('html');
|
||||
|
||||
2
theme/neo/README
Normal file
2
theme/neo/README
Normal file
@ -0,0 +1,2 @@
|
||||
Default avatars are modified from an image by Francesco 'Architetto' Rollandin.
|
||||
http://www.openclipart.org/detail/34957
|
||||
@ -13,11 +13,19 @@
|
||||
body {
|
||||
background-color: #C6C8CC;
|
||||
background-image: url(../images/bg.png);
|
||||
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
font-size: 82%;
|
||||
font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
font-size: 14px;
|
||||
line-height: 1.6;
|
||||
color: #222;
|
||||
}
|
||||
|
||||
input, textarea, select, option {
|
||||
font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
font-size: 1em;
|
||||
}
|
||||
|
||||
a {color: #3e3e8c;}
|
||||
a:hover {color: blue;}
|
||||
|
||||
h1 {font-size: 1.6em;}
|
||||
h2 {font-size: 1.6em;}
|
||||
@ -27,59 +35,48 @@ h5 {font-size: 1.2em;}
|
||||
h6 {font-size: 1em;}
|
||||
|
||||
#wrap {
|
||||
width: 930px;
|
||||
width: 960px;
|
||||
margin: 0px auto;
|
||||
padding: 0px 15px 10px 15px;
|
||||
background-color: #fff;
|
||||
border-left: 10px solid #E0E0E0;
|
||||
border-right: 10px solid #E0E0E0;
|
||||
background: #fff url('../images/brdr_black_dot.png') repeat-x 0px 10px;
|
||||
border-left: 10px solid #fff;
|
||||
border-right: 10px solid #fff;
|
||||
padding-top: 10px;
|
||||
}
|
||||
|
||||
#header {
|
||||
width: 940px;
|
||||
width: 960px;
|
||||
padding: 0px;
|
||||
padding-top: 50px;
|
||||
padding-top: 12px;
|
||||
}
|
||||
|
||||
address {
|
||||
float: left;
|
||||
margin-right: 20px;
|
||||
margin-top: 0px;
|
||||
}
|
||||
|
||||
.poweredby {
|
||||
background: url(../images/sn-tiny.png) no-repeat top left;
|
||||
height: 40px;
|
||||
font-size: 0.8em;
|
||||
color: #fff;
|
||||
line-height: 42px;
|
||||
padding-left: 50px;
|
||||
position: absolute;
|
||||
top: 6px;
|
||||
left: 0;
|
||||
position: relative;
|
||||
top: 1px;
|
||||
left: 2px;
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
height: 24px;
|
||||
width: 148px;
|
||||
z-index: 99;
|
||||
font-style: normal;
|
||||
}
|
||||
|
||||
.poweredby a {
|
||||
color: #fff !important;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
#site_nav_global_primary {
|
||||
display: block;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
z-index: 98;
|
||||
background-color: #364A84;
|
||||
width: 960px;
|
||||
margin-left: -15px;
|
||||
margin-top: 0px;
|
||||
top: 10px;
|
||||
right: 0;
|
||||
width: 800px;
|
||||
margin: 0px;
|
||||
height: 24px;
|
||||
line-height: 20px;
|
||||
border-top: 10px solid #fff;
|
||||
border-bottom: 1px solid #fff;
|
||||
-webkit-border-top-right-radius: 6px;
|
||||
-moz-border-radius-topright: 6px;
|
||||
border-top-right-radius: 6px;
|
||||
background: #364A84;
|
||||
background: -moz-linear-gradient(top, #516499 , #364a84);
|
||||
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#516499), color-stop(100%,#364a84));
|
||||
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#516499', endColorstr='#364a84',GradientType=0 ); /* XXX move all to ie.css */
|
||||
}
|
||||
|
||||
#site_nav_global_primary ul {
|
||||
@ -91,13 +88,13 @@ address {
|
||||
}
|
||||
|
||||
#site_nav_global_primary li:last-child {
|
||||
margin-right: 16px;
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
||||
#site_nav_global_primary a {
|
||||
color: #fff !important;
|
||||
text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
|
||||
padding: 2px 12px 2px 12px;
|
||||
padding: 2px 10px 2px 10px;
|
||||
height: 20px;
|
||||
display: block;
|
||||
float: left;
|
||||
@ -137,92 +134,40 @@ address {
|
||||
color: #3e3e8c;
|
||||
}
|
||||
|
||||
.form_notice {
|
||||
float: left;
|
||||
margin-top: 0px;
|
||||
width: 510px;
|
||||
padding: 10px;
|
||||
-webkit-border-radius: 6px;
|
||||
-moz-border-radius: 6px;
|
||||
border-radius: 6px;
|
||||
background: #cdd1dd;
|
||||
}
|
||||
|
||||
.form_notice fieldset {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.form_notice textarea {
|
||||
width: 378px;
|
||||
height: 54px;
|
||||
-webkit-border-radius: 6px;
|
||||
-moz-border-radius: 6px;
|
||||
border-radius: 6px;
|
||||
}
|
||||
|
||||
.form_notice label.notice_data-attach {
|
||||
top: 27px;
|
||||
right: 86px;
|
||||
}
|
||||
|
||||
.form_notice #notice_data-geo_wrap label,
|
||||
.form_notice #notice_data-geo_wrap input {
|
||||
top: 52px;
|
||||
right: 86px;
|
||||
}
|
||||
|
||||
.form_notice #notice_action-submit {
|
||||
font-size: 0.9em;
|
||||
top: 80px;
|
||||
right: -2px;
|
||||
height: 2.4em;
|
||||
width: 106px;
|
||||
}
|
||||
|
||||
.form_notice .error,
|
||||
.form_notice .success,
|
||||
.form_notice .notice-status {
|
||||
width: 341px;
|
||||
}
|
||||
|
||||
.form_notice .error {
|
||||
margin-left: 0px;
|
||||
}
|
||||
|
||||
#core {
|
||||
clear: both;
|
||||
margin: 0px;
|
||||
width: 930px;
|
||||
margin-left: 0px;
|
||||
margin-top: 8px;
|
||||
}
|
||||
|
||||
#content {
|
||||
width: 530px;
|
||||
margin-right: 0px;
|
||||
padding-left: 30px;
|
||||
padding-right: 30px;
|
||||
width: 960px;
|
||||
border-top: 5px solid #FB6104;
|
||||
}
|
||||
|
||||
#site_nav_local_views {
|
||||
display: block;
|
||||
float: left;
|
||||
width: 130px;
|
||||
margin-top: 5px;
|
||||
width: 138px;
|
||||
margin-top: 0px;
|
||||
padding: 10px;
|
||||
padding-top: 22px;
|
||||
background-color: #ececf2;
|
||||
border-left: 1px solid #d8dae6;
|
||||
border-right: 1px solid #d8dae6;
|
||||
min-height: 800px; /* XXX set up equal column heights! */
|
||||
}
|
||||
|
||||
#site_nav_local_views H3 {
|
||||
border-bottom: 3px solid #A6ADBF;
|
||||
color: #A6ADBF;
|
||||
margin-bottom: 10px;
|
||||
padding-bottom: 6px;
|
||||
background: url('../images/brdr_black_dot.png') repeat-x bottom left;
|
||||
color: #7a7c87;
|
||||
font-size: 1.1em;
|
||||
letter-spacing: 2px;
|
||||
margin-bottom: 10px;
|
||||
text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
|
||||
text-transform: uppercase;
|
||||
}
|
||||
|
||||
#site_nav_local_views li {
|
||||
display: block;
|
||||
margin: 0px 0px 6px 0px;
|
||||
margin: 0px 0px 8px 0px;
|
||||
}
|
||||
|
||||
#site_nav_local_views li ul {
|
||||
@ -230,52 +175,217 @@ address {
|
||||
}
|
||||
|
||||
#site_nav_local_views a {
|
||||
padding: 2px 0px 2px 10px;
|
||||
display: block;
|
||||
-webkit-border-radius: 6px;
|
||||
-moz-border-radius: 6px;
|
||||
border-radius: 6px;
|
||||
padding: 0px 0px 1px 10px;
|
||||
-webkit-border-radius: 4px;
|
||||
-moz-border-radius: 4px;
|
||||
border-radius: 4px;
|
||||
text-transform: uppercase;
|
||||
text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
|
||||
}
|
||||
|
||||
#site_nav_local_views a:hover {
|
||||
background: #8e98b4 !important;
|
||||
color: #fff !important;
|
||||
#site_nav_local_views a:hover, #site_nav_local_views .current a {
|
||||
color: #fff;
|
||||
text-decoration: none;
|
||||
text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
|
||||
background: #364a84;
|
||||
background: -moz-linear-gradient(top, #7b8dbb , #364a84);
|
||||
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7b8dbb), color-stop(100%,#364a84));
|
||||
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7b8dbb', endColorstr='#364a84',GradientType=0 );
|
||||
}
|
||||
|
||||
#site_nav_local_views .current a {
|
||||
text-decoration: none;
|
||||
background: #8e98b4 !important;
|
||||
color: #fff !important;
|
||||
text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
|
||||
#content {
|
||||
width: 520px;
|
||||
margin-right: 0px;
|
||||
padding: 20px;
|
||||
}
|
||||
|
||||
/* Input forms */
|
||||
|
||||
.input_forms {
|
||||
float: left;
|
||||
position: relative;
|
||||
top: -20px;
|
||||
left: -20px;
|
||||
padding: 18px 20px 0px 20px;
|
||||
background: #fafafa url('../images/brdr_black_dot.png') repeat-x bottom left;
|
||||
}
|
||||
|
||||
#input_form_nav {
|
||||
float: left;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
#input_form_nav li a {
|
||||
display: block;
|
||||
float: left;
|
||||
padding: 0px 10px 1px 10px;
|
||||
margin-right: 10px;
|
||||
-webkit-border-radius: 4px;
|
||||
-moz-border-radius: 4px;
|
||||
border-radius: 4px;
|
||||
border: 1px solid #ECECF2;
|
||||
font-weight: bold;
|
||||
line-height: 1.4em;
|
||||
text-shadow: 0px 1px 0px rgba(255, 255, 255, 0.9);
|
||||
background: #ececf2;
|
||||
background: -moz-linear-gradient(top, #fff , #ececf2);
|
||||
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#fff), color-stop(100%,#ececf2));
|
||||
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fff', endColorstr='#ececf2',GradientType=0 );
|
||||
}
|
||||
|
||||
#input_form_nav li:hover a, #input_form_nav li.current a {
|
||||
color: #fff;
|
||||
text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
|
||||
border: 1px solid #ececf2;
|
||||
background: #364a84;
|
||||
background: -moz-linear-gradient(top, #7b8dbb , #364a84);
|
||||
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7b8dbb), color-stop(100%,#364a84));
|
||||
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7b8dbb', endColorstr='#364a84',GradientType=0 );
|
||||
}
|
||||
|
||||
.input_form_nav_tab a, .input_form_nav_tab.current {
|
||||
text-decoration: none !important; /* XXX cf rebase */
|
||||
}
|
||||
|
||||
.input_form {
|
||||
position: relative;
|
||||
float: left;
|
||||
width: 520px;
|
||||
padding-bottom: 15px;
|
||||
}
|
||||
|
||||
#input_form_status {
|
||||
padding-bottom: 45px;
|
||||
}
|
||||
|
||||
.form_notice {
|
||||
padding: 0px;
|
||||
background: none;
|
||||
}
|
||||
|
||||
.form_notice fieldset {
|
||||
width: auto;
|
||||
position: static;
|
||||
}
|
||||
|
||||
.form_notice #notice_data-text-label {
|
||||
display: none; /* XXX move into input with js */
|
||||
}
|
||||
|
||||
.form_notice textarea,
|
||||
.form_notice_placeholder .placeholder {
|
||||
width: 473px;
|
||||
}
|
||||
.form_notice textarea {
|
||||
height: 42px;
|
||||
padding: 6px 10px 18px 10px;
|
||||
border: 1px solid #a6a6a6;
|
||||
-webkit-border-radius: 4px;
|
||||
-moz-border-radius: 4px;
|
||||
border-radius: 4px;
|
||||
box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
|
||||
-moz-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
|
||||
-webkit-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
|
||||
z-index: 97;
|
||||
font-size: 1.2em;
|
||||
}
|
||||
|
||||
.form_notice label.notice_data-attach {
|
||||
top: 0px;
|
||||
right: 0px;
|
||||
z-index: 96;
|
||||
}
|
||||
|
||||
.form_notice .notice_data-geo_wrap label,
|
||||
.form_notice .notice_data-geo_wrap input {
|
||||
top: 26px;
|
||||
right: 0px;
|
||||
z-index: 99;
|
||||
}
|
||||
|
||||
.form_notice .count {
|
||||
position: absolute;
|
||||
top: 50px;
|
||||
right: 35px;
|
||||
font-size: 0.8em;
|
||||
height: 1em;
|
||||
z-index: 99;
|
||||
}
|
||||
|
||||
.form_notice #notice_action-submit {
|
||||
position: absolute;
|
||||
top: 100%;
|
||||
left: 0px;
|
||||
margin-top: -44px;
|
||||
float: left;
|
||||
width: 90px;
|
||||
padding: 0px;
|
||||
z-index: 99;
|
||||
}
|
||||
|
||||
.form_notice .error,
|
||||
.form_notice .success,
|
||||
.form_notice .notice-status {
|
||||
width: 478px;
|
||||
position: relative;
|
||||
top: 0px;
|
||||
float: none;
|
||||
clear: none;
|
||||
margin-left: 0px;
|
||||
margin-top: 5px;
|
||||
padding: 5px 5px 5px 10px;
|
||||
border: 1px solid #ccc;
|
||||
}
|
||||
|
||||
.form_notice .error {
|
||||
border: 1px solid #d05858;
|
||||
}
|
||||
|
||||
.form_notice .attach-status code {
|
||||
font-size: 1em;
|
||||
}
|
||||
|
||||
.input_form fieldset {
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
}
|
||||
|
||||
.input_form fieldset fieldset {
|
||||
margin-bottom: 10px !important;
|
||||
}
|
||||
|
||||
#aside_primary {
|
||||
background: none;
|
||||
width: 210px;
|
||||
padding-top: 0px;
|
||||
margin-top: 5px;
|
||||
width: 218px;
|
||||
padding: 10px;
|
||||
padding-top: 22px;
|
||||
margin-top: 0px;
|
||||
background-color: #ececf2;
|
||||
border-left: 1px solid #d8dae6;
|
||||
border-right: 1px solid #d8dae6;
|
||||
min-height: 800px; /* XXX set up equal column heights! */
|
||||
}
|
||||
|
||||
#aside_primary .section {
|
||||
width: 100%;
|
||||
margin-left: 0px;
|
||||
margin-right: 0px;
|
||||
font-size: 0.88em;
|
||||
}
|
||||
|
||||
#aside_primary h2 {
|
||||
border-bottom: 3px solid #A6ADBF;
|
||||
color: #A6ADBF;
|
||||
font-size: 1.1em;
|
||||
letter-spacing: 2px;
|
||||
margin-bottom: 10px;
|
||||
padding-bottom: 6px;
|
||||
background: url('../images/brdr_black_dot.png') repeat-x bottom left;
|
||||
color: #7a7c87;
|
||||
font-size: 1.25em;
|
||||
letter-spacing: 2px;
|
||||
text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
|
||||
text-transform: uppercase;
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.section ul.entities {
|
||||
width: 290px;
|
||||
width: 220px;
|
||||
}
|
||||
|
||||
.section .entities li {
|
||||
@ -286,8 +396,8 @@ address {
|
||||
|
||||
#popular_notices .avatar {
|
||||
position: relative;
|
||||
top: 2px;
|
||||
margin-bottom: 4px;
|
||||
top: 4px;
|
||||
margin-bottom: 6px;
|
||||
}
|
||||
|
||||
#aside_primary td {
|
||||
@ -310,7 +420,7 @@ address {
|
||||
color: #A6ADBF;
|
||||
font-size: 1.4em;
|
||||
letter-spacing: 4px;
|
||||
text-transform: uppercase;
|
||||
text-transform: none;
|
||||
}
|
||||
|
||||
#notices_primary {
|
||||
@ -323,17 +433,17 @@ address {
|
||||
}
|
||||
|
||||
.notice {
|
||||
line-height: 1.35em;
|
||||
line-height: 1.36em;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
#content .notice .author .photo {
|
||||
left: 0px;
|
||||
top: 6px;
|
||||
top: 9px;
|
||||
}
|
||||
|
||||
#content .notice .entry-title {
|
||||
min-height: 34px;
|
||||
min-height: 35px;
|
||||
}
|
||||
|
||||
#showstream .notice .entry-title {
|
||||
@ -345,7 +455,7 @@ address {
|
||||
}
|
||||
|
||||
.notice div.entry-content {
|
||||
font-size: 0.9em;
|
||||
font-size: 0.88em;
|
||||
line-height: 1.2em;
|
||||
margin-top: 6px;
|
||||
opacity: 0.6;
|
||||
@ -371,6 +481,103 @@ div.entry-content a.response:after {
|
||||
margin-top: 4px;
|
||||
}
|
||||
|
||||
.threaded-replies {
|
||||
clear: both;
|
||||
float: left;
|
||||
width: 458px;
|
||||
margin-left: 59px;
|
||||
margin-top: 10px;
|
||||
padding-right: 2px;
|
||||
border-left: 3px solid #ECECF2;
|
||||
background: #fafafa;
|
||||
font-size: 1em;
|
||||
}
|
||||
|
||||
#content .notice .threaded-replies .notice {
|
||||
padding-bottom: 14px;
|
||||
padding-top: 5px;
|
||||
border-bottom: 2px dotted #eee;
|
||||
line-height: 1.36em;
|
||||
margin-top: 0px;
|
||||
margin-bottom: 0px;
|
||||
margin-left: 10px;
|
||||
background: none;
|
||||
}
|
||||
|
||||
#content .notice .threaded-replies .entry-title {
|
||||
min-height: 1px;
|
||||
}
|
||||
|
||||
#content .threaded-replies .notice .author .photo {
|
||||
height: 24px;
|
||||
width: 24px;
|
||||
top: 14px;
|
||||
box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
|
||||
-moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
|
||||
-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
|
||||
}
|
||||
|
||||
#content .notice .threaded-replies .notice .entry-title {
|
||||
margin: 2px 7px 0px 35px;
|
||||
}
|
||||
|
||||
#content .notice .threaded-replies .notice div.entry-content {
|
||||
clear:left;
|
||||
float:left;
|
||||
margin-left: 35px;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
.threaded-replies li {
|
||||
list-style-type: none;
|
||||
}
|
||||
|
||||
.threaded-replies .notice-reply-comments {
|
||||
margin: 2px 0px 4px 10px;
|
||||
}
|
||||
|
||||
.threaded-replies .placeholder {
|
||||
margin: 10px;
|
||||
width: 426px;
|
||||
}
|
||||
|
||||
.threaded-replies .notice-reply {
|
||||
clear: left;
|
||||
position: relative;
|
||||
padding: 10px;
|
||||
padding-bottom: 44px;
|
||||
}
|
||||
|
||||
.threaded-replies .form_notice textarea {
|
||||
width: 385px;
|
||||
}
|
||||
|
||||
.threaded-replies .form_notice label.notice_data-attach {
|
||||
top: 10px;
|
||||
right: 10px;
|
||||
}
|
||||
|
||||
.threaded-replies .form_notice .notice_data-geo_wrap label,
|
||||
.threaded-replies .form_notice .notice_data-geo_wrap input {
|
||||
top: 36px;
|
||||
right: 10px;
|
||||
}
|
||||
|
||||
.threaded-replies .form_notice .count {
|
||||
top: 60px;
|
||||
right: 50px;
|
||||
}
|
||||
|
||||
.threaded-replies .form_notice #notice_action-submit {
|
||||
left: 10px;
|
||||
}
|
||||
|
||||
.threaded-replies .form_notice .error,
|
||||
.threaded-replies .form_notice .success,
|
||||
.threaded-replies .form_notice .notice-status {
|
||||
width: 390px;
|
||||
}
|
||||
|
||||
.pagination {
|
||||
height: 1.2em;
|
||||
}
|
||||
@ -382,14 +589,10 @@ div.entry-content a.response:after {
|
||||
|
||||
.entity_profile {
|
||||
float: left;
|
||||
width: 435px;
|
||||
width: 360px;
|
||||
margin-top: 4px;
|
||||
}
|
||||
|
||||
td.entity_profile { /* cf directory table */
|
||||
width: auto;
|
||||
}
|
||||
|
||||
.entity_profile .entity_depiction {
|
||||
margin-top: 4px;
|
||||
}
|
||||
@ -453,7 +656,7 @@ td.entity_profile { /* cf directory table */
|
||||
top: -3px;
|
||||
}
|
||||
|
||||
.pagination {
|
||||
#pagination {
|
||||
height: 1.2em;
|
||||
padding-bottom: 12px;
|
||||
-webkit-border-radius: 6px;
|
||||
@ -493,29 +696,29 @@ td.entity_profile { /* cf directory table */
|
||||
}
|
||||
|
||||
.form_notice input.submit, .form_settings input.submit, .form_settings input.cancel {
|
||||
border-radius: 3px;
|
||||
-moz-border-radius: 3px;
|
||||
-webkit-border-radius: 3px;
|
||||
text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
|
||||
height: 1.9em;
|
||||
padding: 0px 10px;
|
||||
color:#fff;
|
||||
font-weight: normal;
|
||||
font-size: 1em;
|
||||
height: 2.2em;
|
||||
padding-left: 1em;
|
||||
padding-right: 1em;
|
||||
background: #7080aa;
|
||||
background: -moz-linear-gradient(top, #7b8dbb , #7080aa);
|
||||
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7b8dbb), color-stop(100%,#7080aa));
|
||||
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7b8dbb', endColorstr='#7080aa',GradientType=0 );
|
||||
border-width: 1px;
|
||||
font-weight: bold;
|
||||
text-transform: uppercase;
|
||||
font-size: 1.2em;
|
||||
text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2);
|
||||
border: 1px solid #d7621c;
|
||||
border-radius: 4px;
|
||||
-moz-border-radius: 4px;
|
||||
-webkit-border-radius: 4px;
|
||||
background: #FB6104;
|
||||
background: -moz-linear-gradient(top, #ff9d63 , #FB6104);
|
||||
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ff9d63), color-stop(100%,#FB6104));
|
||||
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ff9d63', endColorstr='#FB6104',GradientType=0 );
|
||||
}
|
||||
|
||||
.form_notice input.submit:hover, .form_settings input.submit:hover, .form_settings input.cancel:hover {
|
||||
text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.8);
|
||||
background: #7b8dbb;
|
||||
background: -moz-linear-gradient(top, #7080aa , #7b8dbb);
|
||||
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7080aa), color-stop(100%,#7b8dbb));
|
||||
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7080aa', endColorstr='#7b8dbb',GradientType=0 );
|
||||
text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.6);
|
||||
background: #ff9d63;
|
||||
background: -moz-linear-gradient(top, #FB6104 , #fc8035);
|
||||
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#FB6104), color-stop(100%,#fc8035));
|
||||
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FB6104', endColorstr='#fc8035',GradientType=0 );
|
||||
}
|
||||
|
||||
.form_settings input#settings_design_reset, .form_settings input.cancel {
|
||||
@ -825,4 +1028,63 @@ ul.bookmark-tags a:hover {
|
||||
margin-right: 0px;
|
||||
}
|
||||
|
||||
/* Directory specific styles */
|
||||
|
||||
td.entity_profile {
|
||||
width: auto;
|
||||
}
|
||||
|
||||
#user_directory {
|
||||
position: relative;
|
||||
top: -20px;
|
||||
}
|
||||
|
||||
div#user_directory div.alpha_nav > a {
|
||||
border-left: 1px solid #ccc !important;
|
||||
padding-left: 3.5px !important;
|
||||
padding-right: 4px !important;
|
||||
margin-right: 0px;
|
||||
float: left;
|
||||
line-height: 1.4em;
|
||||
}
|
||||
|
||||
div#user_directory div.alpha_nav > a.first {
|
||||
border-left: none !important;
|
||||
}
|
||||
|
||||
div#user_directory div.alpha_nav a.current {
|
||||
background-color: #ECECF2 !important;
|
||||
}
|
||||
|
||||
table.profile_list {
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
.profile_list th#created {
|
||||
width: 100px;
|
||||
}
|
||||
|
||||
.profile_list th#subscriptions {
|
||||
width: 120px;
|
||||
}
|
||||
|
||||
table.profile_list tr.alt {
|
||||
background-color: #fafafa !important;
|
||||
}
|
||||
|
||||
.profile_list .entity_actions {
|
||||
width: 30px;
|
||||
height: 26px;
|
||||
margin-right: 5px;
|
||||
}
|
||||
|
||||
.profile_list .entity_actions input {
|
||||
width: 26px;
|
||||
height: 26px;
|
||||
display: block;
|
||||
overflow: hidden;
|
||||
font-size: 0em;
|
||||
}
|
||||
|
||||
|
||||
}/*end of @media screen, projection, tv*/
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 857 B After Width: | Height: | Size: 1000 B |
Binary file not shown.
|
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 6.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 2.5 KiB |
BIN
theme/neo/images/brdr_black_dot.png
Normal file
BIN
theme/neo/images/brdr_black_dot.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 115 B |
BIN
theme/neo/images/brdr_white_dot.png
Normal file
BIN
theme/neo/images/brdr_white_dot.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 114 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 12 KiB |
@ -1 +1,2 @@
|
||||
external[]="http://fonts.googleapis.com/css?family=Lato:100,100italic,300,300italic,400,400italic,700,700italic,900,900italic"
|
||||
include=rebase
|
||||
|
||||
@ -928,7 +928,7 @@ outline:none;
|
||||
text-indent:-9999px;
|
||||
}
|
||||
|
||||
.pagination {
|
||||
#pagination {
|
||||
background-color: #f2f2f2;
|
||||
clear: left;
|
||||
margin-top: 20px;
|
||||
@ -936,19 +936,15 @@ text-indent:-9999px;
|
||||
height: 1em;
|
||||
}
|
||||
|
||||
.pagination dt {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.pagination li {
|
||||
#pagination li {
|
||||
display: inline;
|
||||
}
|
||||
|
||||
.pagination .nav_prev {
|
||||
#pagination .nav_prev {
|
||||
float: left;
|
||||
}
|
||||
|
||||
.pagination .nav_next {
|
||||
#pagination .nav_next {
|
||||
float: right;
|
||||
}
|
||||
|
||||
@ -1737,7 +1733,7 @@ body.realtime-popup {
|
||||
right: 70px;
|
||||
}
|
||||
|
||||
.realtime-popup .form_notice .notice_data-geo_wrap label, .form_notice .notice_data-geo_wrap input {
|
||||
.realtime-popup .form_notice .notice_data-geo_wrap label, .realtime-popup .form_notice .notice_data-geo_wrap input {
|
||||
right: 2px;
|
||||
}
|
||||
|
||||
@ -1763,8 +1759,8 @@ body.realtime-popup {
|
||||
.notice-options .notice_delete,
|
||||
.notice-options form.form_repeat input.submit,
|
||||
#new_group a,
|
||||
.pagination .nav_prev a,
|
||||
.pagination .nav_next a,
|
||||
#pagination .nav_prev a,
|
||||
#pagination .nav_next a,
|
||||
button.close,
|
||||
.form_group_leave input.submit,
|
||||
.form_user_unsubscribe input.submit,
|
||||
@ -1940,12 +1936,12 @@ background-position:0 -1054px;
|
||||
background-position: 0 -1846px;
|
||||
}
|
||||
|
||||
.pagination .nav_prev a {
|
||||
#pagination .nav_prev a {
|
||||
padding-top: 8px;
|
||||
padding-left: 25px;
|
||||
background-position:0 -187px;
|
||||
}
|
||||
.pagination .nav_next a {
|
||||
#pagination .nav_next a {
|
||||
padding-top: 9px;
|
||||
padding-right: 25px;
|
||||
background-position: 115% -252px;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user