Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Milan
diaspora
Commits
376d4036
Commit
376d4036
authored
Nov 23, 2010
by
danielvincent
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
made publisher semi-hidden on home page
parent
709e3484
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
101 additions
and
55 deletions
+101
-55
app/views/aspects/index.html.haml
app/views/aspects/index.html.haml
+1
-1
app/views/shared/_publisher.haml
app/views/shared/_publisher.haml
+62
-49
public/images/icons/monotone_chat_talk.png
public/images/icons/monotone_chat_talk.png
+0
-0
public/images/icons/monotone_pen_write.png
public/images/icons/monotone_pen_write.png
+0
-0
public/stylesheets/sass/application.sass
public/stylesheets/sass/application.sass
+38
-5
No files found.
app/views/aspects/index.html.haml
View file @
376d4036
...
...
@@ -4,7 +4,7 @@
.span-24.last
%h2
{
:style
=>
"position:relative;"
}
=
t
(
'_home'
)
=
current_user
.
real_name
.right
%span
.description
=
current_user
.
diaspora_handle
...
...
app/views/shared/_publisher.haml
View file @
376d4036
...
...
@@ -5,63 +5,76 @@
-
content_for
:head
do
:javascript
$
(
"
div.public_toggle input
"
).
live
(
"
click
"
,
function
(
evt
){
if
(
$
(
this
).
attr
(
'
checked
'
)
==
true
){
$
(
"
.question_mark
"
).
click
();
};
});
$
(
"
#publisher textarea, #publisher input
"
).
live
(
"
focus
"
,
function
(
evt
){
$
(
"
#publisher .options_and_submit
"
).
fadeIn
(
50
);
});
$
(
document
).
ready
(
function
(){
$
(
"
div.public_toggle input
"
).
live
(
"
click
"
,
function
(
evt
){
if
(
$
(
this
).
attr
(
'
checked
'
)
==
true
){
$
(
"
.question_mark
"
).
click
();
};
});
$
(
"
#publisher textarea, #publisher input
"
).
live
(
"
focus
"
,
function
(
evt
){
$
(
"
#publisher .options_and_submit
"
).
fadeIn
(
50
);
});
$
(
"
#publisher form
"
).
live
(
"
submit
"
,
function
(
evt
){
$
(
"
#photodropzone
"
).
find
(
'
li
'
).
remove
();
$
(
"
#publisher .options_and_submit
"
).
hide
();
$
(
"
#publisher form
"
).
live
(
"
submit
"
,
function
(
evt
){
$
(
"
#photodropzone
"
).
find
(
'
li
'
).
remove
();
$
(
"
#publisher .options_and_submit
"
).
hide
();
});
$
(
"
#content_creation_button
"
).
bind
(
"
click
"
,
function
(
evt
){
$
(
"
#publisher
"
).
find
(
"
.content_creation
"
).
show
();
$
(
"
#publisher
"
).
find
(
"
textarea
"
).
focus
();
});
});
#publisher
=
owner_image_link
=
form_for
(
StatusMessage
.
new
,
:remote
=>
true
)
do
|
status
|
%ul
#photodropzone
=
status
.
error_messages
#file-upload
.button
=
t
(
'.add_photos'
)
-
if
aspect
==
:all
#content_creation_button
=
image_tag
'icons/monotone_chat_talk.png'
,
:id
=>
'share_bubble'
%h4
share across all of your aspects
.content_creation
{
:style
=>
(
"display:none;"
if
aspect
==
:all
)}
=
form_for
(
StatusMessage
.
new
,
:remote
=>
true
)
do
|
status
|
%ul
#photodropzone
=
status
.
error_messages
#file-upload
.button
=
t
(
'.add_photos'
)
%p
%params
=
status
.
label
:message
,
t
(
'.post_a_message_to'
,
:aspect
=>
(
aspect
==
:all
?
t
(
'.all_contacts'
)
:
aspect
))
=
status
.
text_area
:message
,
:rows
=>
2
,
:value
=>
params
[
:prefill
]
%p
%params
-
unless
aspect
==
:all
=
status
.
label
:message
,
t
(
'.post_a_message_to'
,
:aspect
=>
(
aspect
==
:all
?
t
(
'.all_contacts'
)
:
aspect
))
=
status
.
text_area
:message
,
:rows
=>
2
,
:value
=>
params
[
:prefill
]
=
status
.
hidden_field
:to
,
:value
=>
(
aspect
==
:all
?
aspect
:
aspect
.
id
)
=
status
.
hidden_field
:to
,
:value
=>
(
aspect
==
:all
?
aspect
:
aspect
.
id
)
.options_and_submit
.options_and_submit
.right
#fileInfo
=
image_tag
'ajax-loader.gif'
,
:class
=>
'hidden'
,
:id
=>
"publisher_spinner"
-
if
aspect
==
:all
=
status
.
submit
t
(
'.share'
),
:title
=>
t
(
'.share_with_all'
),
:disable_with
=>
t
(
'.posting'
)
-
else
=
status
.
submit
t
(
'.share'
),
:title
=>
t
(
'.share_with'
,
:aspect
=>
aspect
),
:disable_with
=>
t
(
'.posting'
)
.right
#fileInfo
=
image_tag
'ajax-loader.gif'
,
:class
=>
'hidden'
,
:id
=>
"publisher_spinner"
-
if
aspect
==
:all
=
status
.
submit
t
(
'.share'
),
:title
=>
t
(
'.share_with_all'
),
:disable_with
=>
t
(
'.posting'
)
-
else
=
status
.
submit
t
(
'.share'
),
:title
=>
t
(
'.share_with'
,
:aspect
=>
aspect
),
:disable_with
=>
t
(
'.posting'
)
-
if
aspect
==
:all
.public_toggle
%p
.checkbox_select
=
status
.
check_box
(
:public
,
{},
true
,
false
)
=
status
.
label
:public
,
"make public"
=
link_to
(
image_tag
"social_media_logos/feed-16x16.png"
,
:title
=>
"RSS"
),
current_user
.
public_url
-
if
current_user
.
services
-
for
service
in
current_user
.
services
=
image_tag
"social_media_logos/
#{
service
.
provider
}
-16x16.png"
,
:title
=>
service
.
provider
=
link_to
'(?)'
,
"#question_mark_pane"
,
:class
=>
'question_mark'
,
:style
=>
"display:none;"
.fancybox_content
#question_mark_pane
=
render
'shared/public_explain'
#publisher_photo_upload
=
render
'photos/new_photo'
,
:aspect_id
=>
(
aspect
==
:all
?
aspect
:
aspect
.
id
)
.public_toggle
%p
.checkbox_select
=
status
.
check_box
(
:public
,
{},
true
,
false
)
=
status
.
label
:public
,
"make public"
=
link_to
(
image_tag
"social_media_logos/feed-16x16.png"
,
:title
=>
"RSS"
),
current_user
.
public_url
-
if
current_user
.
services
-
for
service
in
current_user
.
services
=
image_tag
"social_media_logos/
#{
service
.
provider
}
-16x16.png"
,
:title
=>
service
.
provider
=
link_to
'(?)'
,
"#question_mark_pane"
,
:class
=>
'question_mark'
,
:style
=>
"display:none;"
.fancybox_content
#question_mark_pane
=
render
'shared/public_explain'
#publisher_photo_upload
=
render
'photos/new_photo'
,
:aspect_id
=>
(
aspect
==
:all
?
aspect
:
aspect
.
id
)
public/images/icons/monotone_chat_talk.png
0 → 100644
View file @
376d4036
542 Bytes
public/images/icons/monotone_pen_write.png
0 → 100644
View file @
376d4036
719 Bytes
public/stylesheets/sass/application.sass
View file @
376d4036
...
...
@@ -806,14 +806,15 @@ label
#publisher
:
background
:
color
#eee
:
color
#999
:
position
relative
:
min-height
53px
:
margin
:
bottom
10px
:
top
0
:
padding
12px
:
top
0
:
top
1px
:
top
0
:
border
...
...
@@ -830,8 +831,6 @@ label
form
:
position
relative
:
margin
:
left
65px
:
top
0
ul
...
...
@@ -848,7 +847,7 @@ label
input
[
type
=
'text'
],
textarea
:
width
4
0
0px
:
width
4
6
0px
:
margin
0
.options_and_submit
...
...
@@ -873,6 +872,40 @@ label
#fileInfo
:
display
inline
.content_creation
:
margin
:
top
12px
#content_creation_button
:
padding
10px
:
left
5px
:
top
15px
:
bottom
5px
:
position
relative
:
background
:
color
#eee
:
margin
:
bottom
-12px
&
:hover
:
cursor
pointer
h4
:
margin
:
left
40px
:
font
:weight
bold
:
text-shadow
0
1px
0
#fff
#share_bubble
:
height
40px
:
width
40px
:
display
inline
:
position
absolute
:
top
5px
#image_picker
:
margin
:
top
5px
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment