From 8d442e6fc1364ea351a9b781e8173c1b679b7a91 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 4 Mar 2013 20:58:39 -0800 Subject: fix timeago (again), webfinger new spec implemented, some theme work --- view/theme/redbasic/css/style.css | 166 +------------------------------------- view/tpl/conv_item.tpl | 2 +- view/tpl/search_item.tpl | 2 +- view/tpl/smarty3/conv_item.tpl | 2 +- view/tpl/smarty3/search_item.tpl | 2 +- view/tpl/smarty3/wall_item.tpl | 2 +- view/tpl/smarty3/wall_thread.tpl | 2 +- view/tpl/wall_item.tpl | 2 +- view/tpl/wall_thread.tpl | 2 +- 9 files changed, 12 insertions(+), 170 deletions(-) (limited to 'view') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 2fa02a052..be715488a 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -419,22 +419,8 @@ footer { margin-bottom: 10px; } -.group-selected, .nets-selected, .fileas-selected, .categories-selected { - padding: 3px; - -moz-border-radius: 5px; - border-radius: 5px; - border: 1px solid #CCCCCC; - background: #F8F8F8; - font-weight: bold; -} - -.settings-widget .selected { - padding: 3px; - -moz-border-radius: 5px; - border-radius: 5px; - border: 1px solid #CCCCCC; - background: #F8F8F8; - font-weight: bold; +.group-selected, .nets-selected, .fileas-selected, .categories-selected, .settings-widget .selected { + color: #444444 !important; } .smalltext { @@ -513,62 +499,6 @@ footer { } -/* TODO - we don't use DFRN anymore. These probably have different names now. Check and clean up later */ - -input#dfrn-url { - float: left; - background: url(../img/friendika-16.png) no-repeat; - background-position: 2px center; - font-size: 17px; - padding-left: 21px; - height: 21px; - background-color: #FFFFFF; - color: #000000; - margin-bottom: 20px; -} - -#dfrn-url-label { - float: left; - width: 250px; -} - -#dfrn-request-url-end { - clear: both; -} - -#knowyouyes, #knowyouno { - float: left; -} - -#dfrn-request-knowyou-yes-wrapper, #dfrn-request-knowyou-no-wrapper { - - float: none; -} -#dfrn-request-knowyou-yes-label, #dfrn-request-knowyou-no-label { - float: left; - width: 75px; - margin-left: 50px; - margin-bottom: 7px; -} -#dfrn-request-knowyou-break, #dfrn-request-knowyou-end { - clear: both; - -} - -#dfrn-request-message-wrapper { - margin-bottom: 50px; -} -#dfrn-request-submit-wrapper { - clear: both; - margin-left: 50px; -} - -#dfrn-request-info-wrapper { - margin-left: 50px; -} - - - #cropimage-wrapper, #cropimage-preview-wrapper { float: left; padding: 30px; @@ -579,67 +509,7 @@ input#dfrn-url { clear: both; } -.intro-wrapper { - margin-top: 20px; -} - -.intro-fullname { - font-size: 1.1em; - font-weight: bold; - -} -.intro-desc { - margin-bottom: 20px; - font-weight: bold; -} - -.intro-note { - padding: 10px; -} - -.intro-end { - padding: 30px; -} - -.intro-form { - float: left; -} -.intro-approve-form { - clear: both; -} -.intro-approve-as-friend-end { - clear: both; -} -.intro-submit-approve, .intro-submit-ignore { - margin-right: 20px; -} -.intro-submit-approve { - margin-top: 15px; -} - -.intro-approve-as-friend-label, .intro-approve-as-fan-label { - float: left; - width: 100px; - margin-left: 20px; -} -.intro-approve-as-friend, .intro-approve-as-fan { - float: left; -} -.intro-form-end { - clear: both; -} -.intro-approve-as-friend-desc { - margin-top: 15px; -} -.intro-approve-as-end { - clear: both; - margin-bottom: 10px; -} -.intro-end { - clear: both; - margin-bottom: 30px; -} .aprofile dt { font-weight: bold; } @@ -677,29 +547,6 @@ input#dfrn-url { clear: both; } -#birthday-title { - float: left; - font-weight: bold; -} - -#birthday-adjust { - float: left; - font-size: 75%; - margin-left: 10px; -} - -#birthday-title-end { - clear: both; -} - -.birthday-list { - margin-left: 15px; -} - -#birthday-wrapper { - margin-bottom: 20px; -} - #profile-extra-links { clear: both; margin-top: 10px; @@ -1497,12 +1344,7 @@ input#dfrn-url { width: 200px; } -.fortune { - margin-top: 50px; - color: #4444FF; - font-weight: bold; - margin-bottom: 20px; -} + .directory-end { clear: both; @@ -1873,7 +1715,7 @@ tr.mceLast { list-style: none; } -.contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo, .group-selected, .nets-selected, .fileas-selected, .categories-selected { +.contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo { border-radius: 5px; -moz-border-radius: 5px; box-shadow: 4px 4px 3px 0 #444444; diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 0c0553639..aa2190f0f 100644 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -38,7 +38,7 @@
$item.name{{ if $item.owner_url }} $item.to $item.owner_name $item.vwall{{ endif }}
-
$item.ago
+
$item.localtime
$item.title
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index 304fca4d5..70c278cf4 100644 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -25,7 +25,7 @@
$item.name -
$item.ago{{ if $item.app }}$item.str_app{{ endif }}
+
$item.localtime{{ if $item.app }}$item.str_app{{ endif }}
diff --git a/view/tpl/smarty3/conv_item.tpl b/view/tpl/smarty3/conv_item.tpl index 37baa81bf..a03b79a90 100644 --- a/view/tpl/smarty3/conv_item.tpl +++ b/view/tpl/smarty3/conv_item.tpl @@ -43,7 +43,7 @@
{{$item.name}}{{if $item.owner_url}} {{$item.to}} {{$item.owner_name}} {{$item.vwall}}{{/if}}
-
{{$item.ago}}
+
{{$item.localtime}}
{{$item.title}}
diff --git a/view/tpl/smarty3/search_item.tpl b/view/tpl/smarty3/search_item.tpl index c889e227b..debc1d89d 100644 --- a/view/tpl/smarty3/search_item.tpl +++ b/view/tpl/smarty3/search_item.tpl @@ -30,7 +30,7 @@
{{$item.name}} -
{{$item.ago}}{{if $item.app}}{{$item.str_app}}{{/if}}
+
{{$item.localtime}}{{if $item.app}}{{$item.str_app}}{{/if}}
diff --git a/view/tpl/smarty3/wall_item.tpl b/view/tpl/smarty3/wall_item.tpl index 1ab1fbff0..6eea3cdfe 100644 --- a/view/tpl/smarty3/wall_item.tpl +++ b/view/tpl/smarty3/wall_item.tpl @@ -29,7 +29,7 @@
{{$item.name}} -
{{$item.ago}}{{if $item.app}}{{$item.str_app}}{{/if}}
+
{{$item.localtime}}{{if $item.app}}{{$item.str_app}}{{/if}}
diff --git a/view/tpl/smarty3/wall_thread.tpl b/view/tpl/smarty3/wall_thread.tpl index cab43cfcf..47a1e2a59 100644 --- a/view/tpl/smarty3/wall_thread.tpl +++ b/view/tpl/smarty3/wall_thread.tpl @@ -43,7 +43,7 @@
{{$item.name}}{{if $item.owner_url}} {{$item.to}} {{$item.owner_name}} {{$item.vwall}}{{/if}}
-
{{$item.ago}}
+
{{$item.localtime}}
{{$item.title}}
diff --git a/view/tpl/wall_item.tpl b/view/tpl/wall_item.tpl index e3b2eca0b..1e9874dc8 100644 --- a/view/tpl/wall_item.tpl +++ b/view/tpl/wall_item.tpl @@ -24,7 +24,7 @@
$item.name -
$item.ago{{ if $item.app }}$item.str_app{{ endif }}
+
$item.localtime{{ if $item.app }}$item.str_app{{ endif }}
diff --git a/view/tpl/wall_thread.tpl b/view/tpl/wall_thread.tpl index 9a02b2103..cfa63daec 100644 --- a/view/tpl/wall_thread.tpl +++ b/view/tpl/wall_thread.tpl @@ -38,7 +38,7 @@
$item.name{{ if $item.owner_url }} $item.to $item.owner_name $item.vwall{{ endif }}
-
$item.ago
+
$item.localtime
$item.title
-- cgit v1.2.3