From b88a452c6b90b8ee1aafe4f2a4f1bd905f767893 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sat, 31 Mar 2012 03:56:06 -0400 Subject: theme fixes; fix qcomment (finally) Signed-off-by: Simon L'nu --- view/theme/dispy-dark/comment_item.tpl | 13 +++++---- view/theme/dispy-dark/style.css | 52 +++++++++++++++++++++++----------- view/theme/dispy/comment_item.tpl | 13 +++++---- view/theme/dispy/style.css | 52 +++++++++++++++++++++++----------- 4 files changed, 86 insertions(+), 44 deletions(-) (limited to 'view') diff --git a/view/theme/dispy-dark/comment_item.tpl b/view/theme/dispy-dark/comment_item.tpl index 85176732b..adf2772af 100644 --- a/view/theme/dispy-dark/comment_item.tpl +++ b/view/theme/dispy-dark/comment_item.tpl @@ -12,14 +12,15 @@
- {{ if $qcomment }} - diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 8a8fac662..23db84c2c 100755 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -194,6 +194,16 @@ aside { font-weight: bold; background: #3465a4 url('friendika-16.png') no-repeat 95% center; } +#wallmessage-link { + display: block; + color: #FFFFFF; + -webkit-border-radius: 5px ; + -moz-border-radius: 5px; + border-radius: 5px; + padding: 5px; + font-weight: bold; + background-color: #3465a4; +} /* section */ section { diff --git a/view/wallmessage.tpl b/view/wallmessage.tpl new file mode 100755 index 000000000..66b2bc3a0 --- /dev/null +++ b/view/wallmessage.tpl @@ -0,0 +1,32 @@ + +

$header

+ +

$subheader

+ +
+
+ +$parent + +
$to
+$recipname + +
$subject
+ + +
$yourmessage
+ + + +
+ + +
+ +
+
+
+
+
diff --git a/view/wallmsg-header.tpl b/view/wallmsg-header.tpl new file mode 100755 index 000000000..cb3922572 --- /dev/null +++ b/view/wallmsg-header.tpl @@ -0,0 +1,82 @@ + + + + + -- cgit v1.2.3 From bc283f7c5df4b848a6a96db07450af011f03c515 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 1 Apr 2012 03:37:41 -0700 Subject: qcomment overflow --- view/theme/duepuntozero/style.css | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'view') diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 23db84c2c..1f897f3b0 100755 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -2989,6 +2989,14 @@ div.jGrowl div.info { padding: 3px; margin-top: 15px; margin-left: 25px; + width: 125px; + overflow-y: auto; +} + + +.qcomment option { + width: 125px; + overflow-x: hidden; } .qcomment { -- cgit v1.2.3 From 15ba0ef5d0bbfed0174c9b9360ebf6f912c90e80 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sun, 1 Apr 2012 13:12:15 +0200 Subject: various bugfixes and css-fixes --- view/theme/diabook-aerith/jot.tpl | 2 +- view/theme/diabook-aerith/nav.tpl | 22 ++++++++++++---------- view/theme/diabook-aerith/theme.php | 5 ++++- view/theme/diabook-blue/nav.tpl | 22 ++++++++++++---------- view/theme/diabook-blue/theme.php | 5 ++++- view/theme/diabook-red/nav.tpl | 22 ++++++++++++---------- view/theme/diabook-red/theme.php | 5 ++++- view/theme/diabook/nav.tpl | 22 ++++++++++++---------- view/theme/diabook/photo-menu.jpg | Bin 0 -> 459 bytes view/theme/diabook/style.css | 2 +- view/theme/diabook/theme.php | 8 +++++++- 11 files changed, 69 insertions(+), 46 deletions(-) create mode 100755 view/theme/diabook/photo-menu.jpg (limited to 'view') diff --git a/view/theme/diabook-aerith/jot.tpl b/view/theme/diabook-aerith/jot.tpl index 5ef723d72..59066a19c 100755 --- a/view/theme/diabook-aerith/jot.tpl +++ b/view/theme/diabook-aerith/jot.tpl @@ -34,7 +34,7 @@
-
+
diff --git a/view/theme/diabook-aerith/nav.tpl b/view/theme/diabook-aerith/nav.tpl index c34436103..f84b902d5 100644 --- a/view/theme/diabook-aerith/nav.tpl +++ b/view/theme/diabook-aerith/nav.tpl @@ -11,16 +11,16 @@ {{ if $nav.network }} {{ endif }} {{ if $nav.contacts }}
- Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.org)

+ Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)

Account ID:
Password:

diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php index e9fe8e0f0..490010750 100755 --- a/view/theme/diabook-aerith/theme.php +++ b/view/theme/diabook-aerith/theme.php @@ -139,7 +139,8 @@ function diabook_aerith_community_info(){ //nav FIND FRIENDS if(local_user()) { $nv = array(); - $nv['directory'] = Array('directory', t('Directory'), "", ""); + $nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", ""); + $nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", ""); $nv['match'] = Array('match', t('Similar Interests'), "", ""); $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", ""); $nv['invite'] = Array('invite', t('Invite Friends'), "", ""); diff --git a/view/theme/diabook-blue/communityhome.tpl b/view/theme/diabook-blue/communityhome.tpl index cff75cd40..3b95b376e 100755 --- a/view/theme/diabook-blue/communityhome.tpl +++ b/view/theme/diabook-blue/communityhome.tpl @@ -34,6 +34,7 @@ {{ if $nv }}

Find Friends

$nv.directory.1
+$nv.global_directory.1
$nv.match.1
$nv.suggest.1
$nv.invite.1 diff --git a/view/theme/diabook-blue/fpostit/fpostit.php b/view/theme/diabook-blue/fpostit/fpostit.php index 65c43a2b9..4505c9946 100644 --- a/view/theme/diabook-blue/fpostit/fpostit.php +++ b/view/theme/diabook-blue/fpostit/fpostit.php @@ -113,12 +113,12 @@ function showForm($error, $content) { echo <<

- Friendika Bookmarklet

+ Friendica Bookmarklet
- Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.org)

+ Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)

Account ID:
Password:

diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php index 3d54ba9ef..891c13cbf 100755 --- a/view/theme/diabook-blue/theme.php +++ b/view/theme/diabook-blue/theme.php @@ -139,7 +139,8 @@ function diabook_blue_community_info(){ //nav FIND FRIENDS if(local_user()) { $nv = array(); - $nv['directory'] = Array('directory', t('Directory'), "", ""); + $nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", ""); + $nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", ""); $nv['match'] = Array('match', t('Similar Interests'), "", ""); $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", ""); $nv['invite'] = Array('invite', t('Invite Friends'), "", ""); diff --git a/view/theme/diabook-red/communityhome.tpl b/view/theme/diabook-red/communityhome.tpl index 326c766b2..91935a9d3 100755 --- a/view/theme/diabook-red/communityhome.tpl +++ b/view/theme/diabook-red/communityhome.tpl @@ -34,6 +34,7 @@ {{ if $nv }}

Find Friends

$nv.directory.1
+$nv.global_directory.1
$nv.match.1
$nv.suggest.1
$nv.invite.1 diff --git a/view/theme/diabook-red/fpostit/fpostit.php b/view/theme/diabook-red/fpostit/fpostit.php index 65c43a2b9..4505c9946 100644 --- a/view/theme/diabook-red/fpostit/fpostit.php +++ b/view/theme/diabook-red/fpostit/fpostit.php @@ -113,12 +113,12 @@ function showForm($error, $content) { echo <<

- Friendika Bookmarklet

+ Friendica Bookmarklet
- Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.org)

+ Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)

Account ID:
Password:

diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php index b091295b7..44a76a5e4 100755 --- a/view/theme/diabook-red/theme.php +++ b/view/theme/diabook-red/theme.php @@ -139,7 +139,8 @@ function diabook_red_community_info(){ //nav FIND FRIENDS if(local_user()) { $nv = array(); - $nv['directory'] = Array('directory', t('Directory'), "", ""); + $nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", ""); + $nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", ""); $nv['match'] = Array('match', t('Similar Interests'), "", ""); $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", ""); $nv['invite'] = Array('invite', t('Invite Friends'), "", ""); diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl index 91871a7b9..d344cad31 100755 --- a/view/theme/diabook/communityhome.tpl +++ b/view/theme/diabook/communityhome.tpl @@ -34,6 +34,7 @@ {{ if $nv }}

Find Friends

$nv.directory.1
+$nv.global_directory.1
$nv.match.1
$nv.suggest.1
$nv.invite.1 diff --git a/view/theme/diabook/fpostit/fpostit.php b/view/theme/diabook/fpostit/fpostit.php index 65c43a2b9..4505c9946 100644 --- a/view/theme/diabook/fpostit/fpostit.php +++ b/view/theme/diabook/fpostit/fpostit.php @@ -113,12 +113,12 @@ function showForm($error, $content) { echo <<

- Friendika Bookmarklet

+ Friendica Bookmarklet
- Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.org)

+ Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)

Account ID:
Password:

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 6ac64beda..d6ee57316 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -143,7 +143,8 @@ function diabook_community_info(){ //right_aside FIND FRIENDS if(local_user()) { $nv = array(); - $nv['directory'] = Array('directory', t('Directory'), "", ""); + $nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", ""); + $nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", ""); $nv['match'] = Array('match', t('Similar Interests'), "", ""); $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", ""); $nv['invite'] = Array('invite', t('Invite Friends'), "", ""); -- cgit v1.2.3 From 581b54c974a9b9a050a8a0b9a17a19bd41b1f2f5 Mon Sep 17 00:00:00 2001 From: Michael Johnston Date: Sun, 1 Apr 2012 21:28:31 -0400 Subject: allow users to set categories on their posts --- view/categories_widget.tpl | 13 +++++++++++++ view/jot.tpl | 1 + view/theme/darkzero/style.css | 8 ++++++-- view/theme/duepuntozero/style.css | 22 +++++++++++++--------- 4 files changed, 33 insertions(+), 11 deletions(-) create mode 100755 view/categories_widget.tpl (limited to 'view') diff --git a/view/categories_widget.tpl b/view/categories_widget.tpl new file mode 100755 index 000000000..061821beb --- /dev/null +++ b/view/categories_widget.tpl @@ -0,0 +1,13 @@ +
+
+

$title

+
$desc
+ + + +
diff --git a/view/jot.tpl b/view/jot.tpl index 5fe1f954e..91de628ac 100755 --- a/view/jot.tpl +++ b/view/jot.tpl @@ -15,6 +15,7 @@
+
diff --git a/view/theme/darkzero/style.css b/view/theme/darkzero/style.css index 3b395ff2a..12c7d3c25 100755 --- a/view/theme/darkzero/style.css +++ b/view/theme/darkzero/style.css @@ -76,17 +76,21 @@ input#dfrn-url { } -#jot-title { +#jot-title, #jot-category { background-color: #333333; border: 1px solid #333333; } #jot-title::-webkit-input-placeholder{ color: #555555!important;} #jot-title:-moz-placeholder{color: #555555!important;} +#jot-category::-webkit-input-placeholder{ color: #555555!important;} +#jot-category:-moz-placeholder{color: #555555!important;} #jot-title:hover, -#jot-title:focus { +#jot-title:focus, +#jot-category:hover, +#jot-category:focus { border: 1px solid #cccccc; } blockquote { diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 1f897f3b0..38c1fc5bd 100755 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -285,7 +285,7 @@ div.wall-item-content-wrapper.shiny { float: left; } -#jot-title { +#jot-title, #jot-category { border: 0px; margin: 0px; height: 20px; @@ -296,11 +296,15 @@ div.wall-item-content-wrapper.shiny { } #jot-title::-webkit-input-placeholder{font-weight: normal;} +#jot-category::-webkit-input-placeholder{font-weight: normal;} #jot-title:-moz-placeholder{font-weight: normal;} +#jot-category:-moz-placeholder{font-weight: normal;} #jot-title:hover, -#jot-title:focus { +#jot-title:focus, +#jot-category:hover, +#jot-category:focus { border: 1px solid #cccccc; } @@ -322,7 +326,7 @@ div.wall-item-content-wrapper.shiny { margin-bottom: 10px; } -.group-selected, .nets-selected, .fileas-selected { +.group-selected, .nets-selected, .fileas-selected, .categories-selected { padding: 3px; -moz-border-radius: 3px; border-radius: 3px; @@ -1881,11 +1885,11 @@ a.mail-list-link { margin-top: 10px; } -.nets-ul, .fileas-ul { +.nets-ul, .fileas-ul, .categories-ul { list-style-type: none; } -.nets-ul li, .fileas-ul li { +.nets-ul li, .fileas-ul li, .categories-ul li { margin-top: 10px; } @@ -1896,11 +1900,11 @@ a.mail-list-link { margin-left: 42px; } -.fileas-link { +.fileas-link, .categories-link { margin-left: 24px; } -.fileas-all { +.fileas-all, .categories-all { margin-left: 0px; } @@ -2628,12 +2632,12 @@ aside input[type='text'] { margin-top: 10px; } -.body-tag, .filesavetags { +.body-tag, .filesavetags, .categorytags { opacity: 0.5; filter:alpha(opacity=50); } -.body-tag:hover, .filesavetags:hover { +.body-tag:hover, .filesavetags:hover, .categorytags:hover { opacity: 1.0 !important; filter:alpha(opacity=100) !important; } -- cgit v1.2.3