GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch '0.8.x' into userdesign 

* 0.8.x:
  Moved url handling to its proper place, from newnotice to Notice.php
  Removed more dead code.
  Brought back borders for content, navigation, aside_primary but
  Minor margin value change
  More contrast for tabs
  UI updates:
This commit is contained in:
Zach Copley 2009-06-16 22:24:11 -07:00
parent d1ae3176b6 befbfc9c73
commit 3d6e30d205
7 changed files with 79 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
actions/attachment.php
View File

@ -98,48 +98,6 @@ class AttachmentAction extends Action
return $a->title();
}
/**
* Last-modified date for page
*
* When was the content of this page last modified? Based on notice,
* profile, avatar.
*
* @return int last-modified date as unix timestamp
*/
/*
function lastModified()
{
return max(strtotime($this->notice->created),
strtotime($this->profile->modified),
($this->avatar) ? strtotime($this->avatar->modified) : 0);
}
*/
/**
* An entity tag for this page
*
* Shows the ETag for the page, based on the notice ID and timestamps
* for the notice, profile, and avatar. It's weak, since we change
* the date text "one hour ago", etc.
*
* @return string etag
*/
/*
function etag()
{
$avtime = ($this->avatar) ?
strtotime($this->avatar->modified) : 0;
return 'W/"' . implode(':', array($this->arg('action'),
common_language(),
$this->notice->id,
strtotime($this->notice->created),
strtotime($this->profile->modified),
$avtime)) . '"';
}
*/
/**
* Handle input
*

41
actions/attachment_ajax.php
View File

@ -74,46 +74,5 @@ class Attachment_ajaxAction extends AttachmentAction
}
$this->elementEnd('div');
}
/**
* Last-modified date for page
*
* When was the content of this page last modified? Based on notice,
* profile, avatar.
*
* @return int last-modified date as unix timestamp
*/
/*
function lastModified()
{
return max(strtotime($this->notice->created),
strtotime($this->profile->modified),
($this->avatar) ? strtotime($this->avatar->modified) : 0);
}
*/
/**
* An entity tag for this page
*
* Shows the ETag for the page, based on the notice ID and timestamps
* for the notice, profile, and avatar. It's weak, since we change
* the date text "one hour ago", etc.
*
* @return string etag
*/
/*
function etag()
{
$avtime = ($this->avatar) ?
strtotime($this->avatar->modified) : 0;
return 'W/"' . implode(':', array($this->arg('action'),
common_language(),
$this->notice->id,
strtotime($this->notice->created),
strtotime($this->profile->modified),
$avtime)) . '"';
}
*/
}

19
actions/newnotice.php
View File

@ -231,7 +231,6 @@ class NewnoticeAction extends Action
if (isset($mimetype)) {
$this->storeFile($notice, $mimetype);
}
$this->saveUrls($notice);
common_broadcast_notice($notice);
if ($this->boolean('ajax')) {
@ -284,24 +283,6 @@ class NewnoticeAction extends Action
}
}
/** save all urls in the notice to the db
*
* follow redirects and save all available file information
* (mimetype, date, size, oembed, etc.)
*
* @param class $notice Notice to pull URLs from
*
* @return void
*/
function saveUrls($notice, $uploaded = null) {
common_replace_urls_callback($notice->content, array($this, 'saveUrl'), $notice->id);
}
function saveUrl($data) {
list($url, $notice_id) = $data;
$zzz = File::processNew($url, $notice_id);
}
/**
* Show an Ajax-y error message
*

19
classes/Notice.php
View File

@ -217,6 +217,7 @@ class Notice extends Memcached_DataObject
$notice->addToInboxes();
$notice->saveGroups();
$notice->saveUrls();
$notice->query('COMMIT');
@ -231,6 +232,24 @@ class Notice extends Memcached_DataObject
return $notice;
}
/** save all urls in the notice to the db
*
* follow redirects and save all available file information
* (mimetype, date, size, oembed, etc.)
*
* @param class $notice Notice to pull URLs from
*
* @return void
*/
function saveUrls() {
common_replace_urls_callback($this->content, array($this, 'saveUrl'), $this->id);
}
function saveUrl($data) {
list($url, $notice_id) = $data;
File::processNew($url, $notice_id);
}
static function checkDupes($profile_id, $content) {
$profile = Profile::staticGet($profile_id);
if (!$profile) {

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

@ -314,7 +314,6 @@ padding:4px 11px;
border-width:1px;
border-style:solid;
border-bottom:0;
text-shadow: 2px 2px 2px #ddd;
font-weight:bold;
}
#site_nav_local_views .nav {
@ -404,8 +403,8 @@ border-radius:7px;
-moz-border-radius-topleft:0;
-webkit-border-radius:7px;
-webkit-border-top-left-radius:0;
border-style:solid;
border-width:1px;
border-style:solid;
}
#shownotice #content {
min-height:0;
@ -421,7 +420,7 @@ float:left;
width:27.917%;
min-height:259px;
float:left;
margin-left:0.385%;
margin-left:0.5%;
padding:1.795%;
border-radius:7px;
-moz-border-radius:7px;
@ -477,7 +476,6 @@ height:16px;
#form_notice #notice_data-attach {
left:183px;
padding:0;
height:16px;
}
#form_notice .form_note {

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

@ -19,7 +19,7 @@ font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
font-size:1em;
}
address {
margin-right:7.18%;
margin-right:7.2%;
}
input, textarea, select, option {
@ -27,7 +27,7 @@ font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
}
input, textarea, select,
.entity_remote_subscribe {
border-color:#aaa;
border-color:#AAAAAA;
}
#filter_tags ul li {
border-color:#C3D6DF;
@ -47,10 +47,13 @@ background-color:#A9BF4F;
input:focus, textarea:focus, select:focus,
#form_notice.warning #notice_data-text {
border-color:#A9BF4F;
box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
}
input.submit,
.entity_remote_subscribe {
color:#fff;
color:#FFFFFF;
}
a,
@ -79,10 +82,10 @@ background-color:#CEE1E9;
}
#notice_text-count {
color:#333;
color:#333333;
}
#form_notice.warning #notice_text-count {
color:#000;
color:#000000;
}
#form_notice label[for=notice_data-attach] {
background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%;
@ -92,27 +95,38 @@ opacity:0;
}
#form_notice.processing #notice_action-submit {
background:#fff url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
cursor:wait;
text-indent:-9999px;
}
#content {
box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
-moz-box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
-webkit-box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
}
#content,
#site_nav_local_views a,
#aside_primary {
border-color:#fff;
border-color:transparent;
}
#content,
#site_nav_local_views .current a {
background-color:#fff;
background-color:#FFFFFF;
}
#site_nav_local_views a {
background-color:rgba(255, 255, 255, 0.2);
background-color:rgba(194, 194, 194, 0.5);
box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
-moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
-webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
}
#site_nav_local_views a:hover {
background-color:rgba(255, 255, 255, 0.7);
}
#site_nav_local_views .current a {
text-shadow: rgba(194,194,194,0.5) 1px 1px 1px;
}
.error {
background-color:#F7E8E8;
@ -123,8 +137,8 @@ background-color:#EFF3DC;
#anon_notice {
background-color:#C3D6DF;
color:#fff;
border-color:#fff;
color:#FFFFFF;
border-color:#FFFFFF;
}
#showstream #anon_notice {
@ -162,7 +176,7 @@ background-color:transparent;
.form_user_subscribe input.submit,
.form_user_unsubscribe input.submit {
background-color:#A9BF4F;
color:#fff;
color:#FFFFFF;
}
.form_user_unsubscribe input.submit,
.form_group_leave input.submit,
@ -214,7 +228,7 @@ background:transparent url(../../base/images/icons/twotone/green/trash.gif) no-r
.notices div.entry-content,
.notices div.notice-options,
.notices li.hover .notices div.entry-content,
.notices li.hover .notices div.notice-options {
.notices li.hover .notices div.notice-options {
opacity:0.4;
}
.notices li.hover div.entry-content,
@ -222,14 +236,14 @@ opacity:0.4;
opacity:1;
}
div.entry-content {
color:#333;
color:#333333;
}
div.notice-options a,
div.notice-options input {
font-family:sans-serif;
}
.notices li.hover {
background-color:#fcfcfc;
background-color:#FCFCFC;
}
.notices .notices {

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

@ -19,7 +19,7 @@ font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
font-size:1em;
}
address {
margin-right:7.18%;
margin-right:7.2%;
}
input, textarea, select, option {
@ -27,10 +27,10 @@ font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
}
input, textarea, select,
.entity_remote_subscribe {
border-color:#aaa;
border-color:#AAAAAA;
}
#filter_tags ul li {
border-color:#ddd;
border-color:#DDDDDD;
}
.form_settings input.form_action-primary {
@ -47,10 +47,13 @@ background-color:#9BB43E;
input:focus, textarea:focus, select:focus,
#form_notice.warning #notice_data-text {
border-color:#9BB43E;
box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
}
input.submit,
.entity_remote_subscribe {
color:#fff;
color:#FFFFFF;
}
a,
@ -79,10 +82,10 @@ background-color:#CEE1E9;
}
#notice_text-count {
color:#333;
color:#333333;
}
#form_notice.warning #notice_text-count {
color:#000;
color:#000000;
}
#form_notice label[for=notice_data-attach] {
background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%;
@ -92,27 +95,38 @@ opacity:0;
}
#form_notice.processing #notice_action-submit {
background:#fff url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
cursor:wait;
text-indent:-9999px;
}
#content {
box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
-moz-box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
-webkit-box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
}
#content,
#site_nav_local_views a,
#aside_primary {
border-color:#fff;
border-color:transparent;
}
#content,
#site_nav_local_views .current a {
background-color:#fff;
background-color:#FFFFFF;
}
#site_nav_local_views a {
background-color:rgba(135, 180, 200, 0.3);
background-color:rgba(194, 194, 194, 0.5);
box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
-moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
-webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
}
#site_nav_local_views a:hover {
background-color:rgba(255, 255, 255, 0.7);
}
#site_nav_local_views .current a {
text-shadow: rgba(194,194,194,0.5) 1px 1px 1px;
}
.error {
background-color:#F7E8E8;
@ -123,8 +137,8 @@ background-color:#EFF3DC;
#anon_notice {
background-color:#87B4C8;
color:#fff;
border-color:#fff;
color:#FFFFFF;
border-color:#FFFFFF;
}
#showstream #anon_notice {
@ -162,7 +176,7 @@ background-color:transparent;
.form_user_subscribe input.submit,
.form_user_unsubscribe input.submit {
background-color:#9BB43E;
color:#fff;
color:#FFFFFF;
}
.form_user_unsubscribe input.submit,
.form_group_leave input.submit,
@ -222,14 +236,14 @@ opacity:0.4;
opacity:1;
}
div.entry-content {
color:#333;
color:#333333;
}
div.notice-options a,
div.notice-options input {
font-family:sans-serif;
}
.notices li.hover {
background-color:#fcfcfc;
background-color:#FCFCFC;
}
.notices .notices {