Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
3b22f918
Commit
3b22f918
authored
Feb 23, 2018
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More work on the user profile modal
parent
0bd96bbc
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
33 additions
and
1 deletion
+33
-1
css/converse.css
css/converse.css
+3
-0
css/inverse.css
css/inverse.css
+3
-0
sass/_profile.scss
sass/_profile.scss
+5
-0
sass/converse/converse.scss
sass/converse/converse.scss
+1
-0
sass/inverse/inverse.scss
sass/inverse/inverse.scss
+1
-0
src/converse-profile.js
src/converse-profile.js
+1
-1
src/templates/profile_modal.html
src/templates/profile_modal.html
+19
-0
No files found.
css/converse.css
View file @
3b22f918
...
@@ -5115,6 +5115,9 @@ body.reset {
...
@@ -5115,6 +5115,9 @@ body.reset {
#conversejs
>
.row
{
#conversejs
>
.row
{
flex-direction
:
row-reverse
;
}
flex-direction
:
row-reverse
;
}
#conversejs
label
{
font-weight
:
bold
;
}
#converse-embedded-chat
.flyout
,
#converse-embedded-chat
.flyout
,
#conversejs
.flyout
{
#conversejs
.flyout
{
border-radius
:
4px
;
border-radius
:
4px
;
...
...
css/inverse.css
View file @
3b22f918
...
@@ -5171,6 +5171,9 @@ body {
...
@@ -5171,6 +5171,9 @@ body {
padding-right
:
1em
;
padding-right
:
1em
;
margin-right
:
1em
;
}
margin-right
:
1em
;
}
#conversejs
label
{
font-weight
:
bold
;
}
#converse-embedded-chat
.flyout
,
#converse-embedded-chat
.flyout
,
#conversejs
.flyout
{
#conversejs
.flyout
{
border-radius
:
4px
;
border-radius
:
4px
;
...
...
sass/_profile.scss
0 → 100644
View file @
3b22f918
#conversejs
{
label
{
font-weight
:
bold
;
}
}
sass/converse/converse.scss
View file @
3b22f918
...
@@ -41,6 +41,7 @@
...
@@ -41,6 +41,7 @@
}
}
@import
"../core"
;
@import
"../core"
;
@import
"core"
;
@import
"core"
;
@import
"../profile"
;
@import
"../chatbox"
;
@import
"../chatbox"
;
@import
"chatbox"
;
@import
"chatbox"
;
@import
"../controlbox"
;
@import
"../controlbox"
;
...
...
sass/inverse/inverse.scss
View file @
3b22f918
...
@@ -40,6 +40,7 @@
...
@@ -40,6 +40,7 @@
}
}
@import
"../core"
;
@import
"../core"
;
@import
"core"
;
@import
"core"
;
@import
"../profile"
;
@import
"../chatbox"
;
@import
"../chatbox"
;
@import
"chatbox"
;
@import
"chatbox"
;
@import
"../controlbox"
;
@import
"../controlbox"
;
...
...
src/converse-profile.js
View file @
3b22f918
...
@@ -46,7 +46,7 @@
...
@@ -46,7 +46,7 @@
toHTML
()
{
toHTML
()
{
return
tpl_profile_modal
(
_
.
extend
(
this
.
model
.
toJSON
(),
{
return
tpl_profile_modal
(
_
.
extend
(
this
.
model
.
toJSON
(),
{
'
heading_profile
'
:
__
(
'
Your
p
rofile
'
),
'
heading_profile
'
:
__
(
'
Your
P
rofile
'
),
'
label_close
'
:
__
(
'
Close
'
)
'
label_close
'
:
__
(
'
Close
'
)
}));
}));
},
},
...
...
src/templates/profile_modal.html
View file @
3b22f918
...
@@ -6,6 +6,25 @@
...
@@ -6,6 +6,25 @@
<button
type=
"button"
class=
"close"
data-dismiss=
"modal"
aria-label=
"{{{o.label_close}}}"
><span
aria-hidden=
"true"
>
×
</span></button>
<button
type=
"button"
class=
"close"
data-dismiss=
"modal"
aria-label=
"{{{o.label_close}}}"
><span
aria-hidden=
"true"
>
×
</span></button>
</div>
</div>
<div
class=
"modal-body"
>
<div
class=
"modal-body"
>
<div
class=
"row"
>
<div
class=
"col-auto"
>
{[ if (o.image) { ]}
<a
class=
"show-profile"
href=
"#"
>
<img
alt=
"User Avatar"
class=
"img-thumbnail avatar align-self-center"
height=
"100px"
width=
"100px"
src=
"data:{{{o.image_type}}};base64,{{{o.image}}}"
/>
</a>
{[ } ]}
</div>
<div
class=
"col-auto"
>
<div
classs=
"row w-100"
>
<label>
Fullname:
</label>
<span
class=
"username"
>
{{{o.fullname}}}
</span>
</div>
<div
classs=
"row w-100"
>
<label>
XMPP Address:
</label>
<span
class=
"username"
>
{{{o.jid}}}
</span>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
...
...
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