From 60ac9bc6fda74278d98890a2c26f3834acad8222 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Wed, 27 May 2009 19:43:43 +0000
Subject: Bunch of UI fixes/improvements for attachments (hover, overlay,
notice view, clip)
---
theme/base/css/display.css | 67 ++++++++++++++++++++++++++++++++++++----------
1 file changed, 53 insertions(+), 14 deletions(-)
(limited to 'theme/base/css')
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 9bc1417b1..16c9e3c00 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -855,20 +855,6 @@ display:inline-block;
text-transform:lowercase;
}
-.notice .attachment {
-position:relative;
-}
-.notice .attachment img {
-position:absolute;
-top:18px;
-left:0;
-z-index:99;
-}
-#shownotice .notice .attachment img {
-position:static;
-}
-
-
.notice-options {
position:relative;
font-size:0.95em;
@@ -936,6 +922,59 @@ padding:0;
}
+.notice .attachment {
+position:relative;
+padding-left:16px;
+}
+#attachments .attachment {
+padding-left:0;
+}
+.notice .attachment img {
+position:absolute;
+top:18px;
+left:0;
+z-index:99;
+}
+#shownotice .notice .attachment img {
+position:static;
+}
+
+#attachments {
+clear:both;
+float:left;
+width:100%;
+margin-top:18px;
+}
+#attachments dt {
+font-weight:bold;
+font-size:1.3em;
+margin-bottom:4px;
+}
+
+#attachments li {
+margin-bottom:18px;
+list-style-type:decimal;
+float:left;
+clear:both;
+}
+
+#jOverlayContent,
+#jOverlayContent #content {
+width: auto !important;
+}
+#jOverlayContent .external span {
+display:block;
+margin-bottom:11px;
+}
+#jOverlayContent button {
+position:absolute;
+top:0;
+right:0;
+padding:3px 4px;
+font-weight:bold;
+}
+
+
#usergroups #new_group {
float: left;
margin-right: 2em;
--
cgit v1.2.3-54-g00ecf
From b87aa46b3f26909ec538ee675c8d7a51d49cbaf2 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Fri, 29 May 2009 00:07:18 +0000
Subject: Updated max-width for attachment overlay heading
---
theme/base/css/display.css | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
(limited to 'theme/base/css')
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 16c9e3c00..e3c499a5e 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -959,7 +959,8 @@ clear:both;
}
#jOverlayContent,
-#jOverlayContent #content {
+#jOverlayContent #content,
+#jOverlayContent #content_inner {
width: auto !important;
}
#jOverlayContent .external span {
@@ -973,7 +974,14 @@ right:0;
padding:3px 4px;
font-weight:bold;
}
-
+#jOverlayContent h1 {
+max-width:475px;
+}
+#jOverlayContent #content {
+border-radius:7px;
+-moz-border-radius:7px;
+-webkit-border-radius:7px;
+}
#usergroups #new_group {
float: left;
--
cgit v1.2.3-54-g00ecf
From f56f2f52e74ec3d0037bc33f9bbcee170e982d49 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Sat, 30 May 2009 19:42:15 +0000
Subject: Some cross-browser updates for conversation UI
---
js/util.js | 2 +-
theme/base/css/display.css | 12 ++++++++++--
theme/base/css/ie.css | 6 ++++++
3 files changed, 17 insertions(+), 3 deletions(-)
(limited to 'theme/base/css')
diff --git a/js/util.js b/js/util.js
index d5697e880..c710ae839 100644
--- a/js/util.js
+++ b/js/util.js
@@ -261,7 +261,7 @@ function NoticeAttachments() {
url : '',
color : '#000',
opacity : '0.6',
- zIndex : '9999',
+ zIndex : 99,
center : true,
imgLoading : $('address .url')[0].href+'theme/base/images/illustrations/illu_progress_loading-01.gif',
bgClickToClose : true,
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index e3c499a5e..5ad4217cd 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -951,7 +951,7 @@ font-size:1.3em;
margin-bottom:4px;
}
-#attachments li {
+#attachments ol li {
margin-bottom:18px;
list-style-type:decimal;
float:left;
@@ -962,6 +962,11 @@ clear:both;
#jOverlayContent #content,
#jOverlayContent #content_inner {
width: auto !important;
+margin-bottom:0;
+}
+#jOverlayContent #content {
+padding:11px;
+min-height:auto;
}
#jOverlayContent .external span {
display:block;
@@ -971,8 +976,11 @@ margin-bottom:11px;
position:absolute;
top:0;
right:0;
-padding:3px 4px;
+width:29px;
+height:29px;
+text-align:center;
font-weight:bold;
+padding:0;
}
#jOverlayContent h1 {
max-width:475px;
diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css
index 5d8bea8ae..df0388a5a 100644
--- a/theme/base/css/ie.css
+++ b/theme/base/css/ie.css
@@ -30,3 +30,9 @@ margin-right:4px;
.entity_profile {
width:64%;
}
+#jOverlayContent .notice * {
+z-index:1;
+}
+#jOverlayContent .notice .attachment img {
+z-index:9999;
+}
--
cgit v1.2.3-54-g00ecf
From 6981a708aedf9d28d5396aedf8ef64188c2545bb Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Sat, 30 May 2009 19:43:31 +0000
Subject: Cross-browser update for Design form labels
---
theme/base/css/display.css | 1 +
1 file changed, 1 insertion(+)
(limited to 'theme/base/css')
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 5ad4217cd..7d495c539 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1237,6 +1237,7 @@ width:33%;
}
#settings_design_color .form_data label {
float:none;
+display:block;
}
#settings_design_color .form_data .swatch {
padding:11px;
--
cgit v1.2.3-54-g00ecf
From c5d105f186484fdeaa3d5a14aba9920fdef58c7c Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Mon, 1 Jun 2009 17:12:41 +0000
Subject: Fixed z-index for IE7 on attachment thumbnail
---
theme/base/css/ie.css | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
(limited to 'theme/base/css')
diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css
index df0388a5a..8183fee67 100644
--- a/theme/base/css/ie.css
+++ b/theme/base/css/ie.css
@@ -30,9 +30,12 @@ margin-right:4px;
.entity_profile {
width:64%;
}
-#jOverlayContent .notice * {
+.notice {
z-index:1;
}
-#jOverlayContent .notice .attachment img {
+.notice:hover {
z-index:9999;
}
+.notice .thumbnail img {
+z-index:9999;
+}
\ No newline at end of file
--
cgit v1.2.3-54-g00ecf
From b708b81065b4adc46026e570d8e2cb9d37bc24af Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Fri, 5 Jun 2009 00:00:04 -0400
Subject: Init notice_data-attach UI for form_notice
---
js/util.js | 11 -----------
lib/noticeform.php | 1 -
theme/base/css/display.css | 16 ++++++++++++++++
theme/identica/css/display.css | 7 +++++++
4 files changed, 23 insertions(+), 12 deletions(-)
(limited to 'theme/base/css')
diff --git a/js/util.js b/js/util.js
index bffbf916f..b712ba8e2 100644
--- a/js/util.js
+++ b/js/util.js
@@ -17,17 +17,6 @@
*/
$(document).ready(function(){
- $('input#notice_data-attach').toggle();
- $('label[for=notice_data-attach]').text('Upload a file as an attachment?');
- $('label[for=notice_data-attach]').click(function () {
- if ('Upload a file as an attachment?' == $(this).text()) {
- $(this).text('Upload: ');
- $('input#notice_data-attach').slideDown('fast');
- } else {
- $('input#notice_data-attach').slideUp('fast', function() {$('label[for=notice_data-attach]').text('Upload a file as an attachment?');});
- }
- });
-
// count character on keyup
function counter(event){
var maxLength = 140;
diff --git a/lib/noticeform.php b/lib/noticeform.php
index 805cd56b1..5a6c7cf38 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -148,7 +148,6 @@ class NoticeForm extends Form
$this->out->element('dd', array('id' => 'notice_text-count'),
'140');
$this->out->elementEnd('dl');
- $this->out->element('br', array('style' => 'clear:both'));
$this->out->element('label', array('for' => 'notice_data-attach'), _('Attach'));
$this->out->element('input', array('id' => 'notice_data-attach',
'type' => 'file',
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 7d495c539..7eea54eb2 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -452,6 +452,22 @@ float:left;
font-size:1.3em;
margin-bottom:7px;
}
+#form_notice label[for=notice_data-attach] {
+text-indent:-9999px;
+display:block;
+}
+#form_notice label[for=notice_data-attach],
+#form_notice #notice_data-attach {
+position:absolute;
+top:25px;
+right:49px;
+width:16px;
+height:16px;
+cursor:pointer;
+}
+#form_notice #notice_data-attach {
+text-indent:-279px;
+}
#form_notice #notice_submit label {
display:none;
}
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 1f1298737..8a03a4d77 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -82,6 +82,13 @@ color:#333;
#form_notice.warning #notice_text-count {
color:#000;
}
+#form_notice label[for=notice_data-attach] {
+background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%;
+}
+#form_notice #notice_data-attach {
+opacity:0;
+}
+
#form_notice.processing #notice_action-submit {
background:#fff url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
cursor:wait;
--
cgit v1.2.3-54-g00ecf
From 3aebd847e72e929f05e5d217e037b3ccc9169306 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Tue, 9 Jun 2009 17:34:33 +0000
Subject: Added title and minor CSS cleanup to notice attach
---
lib/noticeform.php | 3 ++-
theme/base/css/display.css | 1 -
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'theme/base/css')
diff --git a/lib/noticeform.php b/lib/noticeform.php
index 5a6c7cf38..5d7cf194e 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -151,7 +151,8 @@ class NoticeForm extends Form
$this->out->element('label', array('for' => 'notice_data-attach'), _('Attach'));
$this->out->element('input', array('id' => 'notice_data-attach',
'type' => 'file',
- 'name' => 'attach'));
+ 'name' => 'attach',
+ 'title' => _('Attach a file')));
if ($this->action) {
$this->out->hidden('notice_return-to', $this->action, 'returnto');
}
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 7eea54eb2..dc275e19f 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -454,7 +454,6 @@ margin-bottom:7px;
}
#form_notice label[for=notice_data-attach] {
text-indent:-9999px;
-display:block;
}
#form_notice label[for=notice_data-attach],
#form_notice #notice_data-attach {
--
cgit v1.2.3-54-g00ecf