Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
diaspora
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Milan
diaspora
Commits
b283f5c5
Commit
b283f5c5
authored
Nov 22, 2010
by
maxwell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pulling back needed partial
parent
08aaccbd
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
14 deletions
+19
-14
app/views/requests/_new_request_with_aspect_to_person.haml
app/views/requests/_new_request_with_aspect_to_person.haml
+7
-4
config/locales/diaspora/en.yml
config/locales/diaspora/en.yml
+2
-1
public/javascripts/view.js
public/javascripts/view.js
+2
-2
public/javascripts/web-socket-receiver.js
public/javascripts/web-socket-receiver.js
+8
-7
No files found.
app/views/requests/_new_request_with_aspect_to_person.haml
View file @
b283f5c5
...
...
@@ -2,7 +2,10 @@
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
=
form_for
Request
.
new
,
:remote
=>
true
do
|
request
|
=
request
.
hidden_field
:into
,
:value
=>
"changeme"
=
request
.
hidden_field
:to
,
:value
=>
destination_handle
=
request
.
submit
'+'
,
:class
=>
'add'
,
:disable_with
=>
"Sending"
%div
{
:id
=>
destination_handle
}
=
form_for
Request
.
new
,
:remote
=>
true
do
|
request
|
=
request
.
hidden_field
:into
,
:value
=>
"changeme"
=
request
.
hidden_field
:to
,
:value
=>
destination_handle
=
request
.
submit
'+'
,
:class
=>
'add'
,
:disable_with
=>
"Sending"
.message.hidden
%i
=
t
(
'requests.new_request_to_person.sent'
)
config/locales/diaspora/en.yml
View file @
b283f5c5
...
...
@@ -98,7 +98,8 @@ en:
enter_a_diaspora_username
:
"
Enter
a
Diaspora
username:"
your_diaspora_username_is
:
"
Your
Diaspora
username
is:
%{diaspora_handle}"
contact_username
:
"
Contact's
username"
create_request
:
"
Create
request"
create_request
:
"
Find
by
Diaspora
handle"
diaspora_handle
:
"
Diaspora
Handle"
invitations
:
invite_someone
:
"
Invite
someone"
invitations_left
:
"
(%{count}
left)"
...
...
public/javascripts/view.js
View file @
b283f5c5
...
...
@@ -37,7 +37,7 @@ $(document).ready(function(){
}
);
$
(
'
.new_request
'
).
submit
(
function
(){
$
(
'
.new_request
'
).
live
(
"
submit
"
,
function
(){
var
foo
=
$
(
this
).
parent
();
$
(
this
).
hide
();
foo
.
find
(
'
.message
'
).
removeClass
(
'
hidden
'
);
...
...
@@ -85,7 +85,7 @@ $(document).ready(function(){
$
(
'
.webfinger_form
'
).
submit
(
function
(
evt
){
form
=
$
(
evt
.
currentTarget
);
form
.
siblings
(
'
.spinn
er
'
).
show
();
form
.
siblings
(
'
#load
er
'
).
show
();
$
(
'
#request_result li:first
'
).
hide
();
});
...
...
public/javascripts/web-socket-receiver.js
View file @
b283f5c5
...
...
@@ -34,23 +34,24 @@ var WebSocketReceiver = {
}
}
},
processPerson
:
function
(
response
){
form
=
$
(
'
.webfinger_form:visible
'
);
form
.
siblings
(
'
.spinner
'
).
hide
();
result_ul
=
form
.
siblings
(
'
.webfinger_result
'
);
processPerson
:
function
(
response
){
form
=
$
(
'
.webfinger_form
'
);
form
.
siblings
(
'
#loader
'
).
hide
();
result_ul
=
form
.
siblings
(
'
#request_result
'
);
if
(
response
[
'
status
'
]
==
'
fail
'
){
result_ul
.
children
(
'
.error
'
).
show
();
result_ul
.
children
(
'
.webfinger_
error
'
).
text
(
response
[
'
response
'
]).
show
();
result_ul
.
siblings
(
'
.error
'
).
show
();
result_ul
.
find
(
'
.
error
'
).
text
(
response
[
'
response
'
]).
show
();
}
else
{
$
(
'
#people_stream
'
).
prepend
(
response
[
'
html
'
]).
slideDown
(
'
slow
'
,
function
(){});
var
first_li
=
result_ul
.
find
(
'
li:first
'
);
first_li
.
hide
()
first_li
.
after
(
response
[
'
html
'
]);
result_ul
.
find
(
"
[name='request[into]']
"
).
val
(
result_ul
.
attr
(
'
aspect_id
'
));
result_ul
.
children
(
'
:nth-child(2)
'
).
slideDown
(
'
fast
'
,
function
(){});
}
},
processNotification
:
function
(
html
){
$
(
'
#notification
'
).
html
(
html
).
fadeIn
(
200
).
delay
(
4000
).
fadeOut
(
200
,
function
(){
$
(
this
).
html
(
""
);});
},
...
...
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