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
mahara
mahara
Commits
97fd0038
Commit
97fd0038
authored
May 18, 2016
by
Son Nguyen
Committed by
Gerrit Code Review
May 18, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Bug 1548522 - Fixed friend thumbnails overlap on load" into 16.04_STABLE
parents
c51f85b3
0d8e9710
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
5 deletions
+19
-5
htdocs/theme/raw/js/theme.js
htdocs/theme/raw/js/theme.js
+9
-1
htdocs/theme/raw/plugintype/blocktype/groupmembers/templates/row.tpl
...e/raw/plugintype/blocktype/groupmembers/templates/row.tpl
+1
-1
htdocs/theme/raw/plugintype/blocktype/myfriends/templates/myfriendrows.tpl
...plugintype/blocktype/myfriends/templates/myfriendrows.tpl
+3
-3
htdocs/theme/raw/sass/_custom.scss
htdocs/theme/raw/sass/_custom.scss
+6
-0
No files found.
htdocs/theme/raw/js/theme.js
View file @
97fd0038
...
...
@@ -119,12 +119,18 @@ jQuery(function($) {
/*
* Initialise masonry for thumbnail gallery
*/
function
initThumbnailMasonry
()
{
function
initThumbnailMasonry
()
{
$
(
'
.js-masonry.thumbnails
'
).
masonry
({
itemSelector
:
'
.thumb
'
});
}
function
initUserThumbnailMasonry
()
{
$
(
'
.js-masonry.user-thumbnails
'
).
masonry
({
itemSelector
:
'
.user-icon
'
});
}
function
handleInputDropdown
(
context
)
{
var
val
=
context
.
find
(
'
select
'
).
find
(
'
option:selected
'
).
text
();
if
(
val
.
length
>
40
)
{
...
...
@@ -196,11 +202,13 @@ jQuery(function($) {
$
(
window
).
on
(
'
resize colresize
'
,
function
(){
carouselHeight
();
initThumbnailMasonry
();
initUserThumbnailMasonry
();
responsiveObjectVideo
()
});
$
(
window
).
on
(
'
load
'
,
function
()
{
carouselHeight
();
initUserThumbnailMasonry
();
});
$
(
'
.block.collapse
'
).
on
(
'
shown.bs.collapse
'
,
function
()
{
...
...
htdocs/theme/raw/plugintype/blocktype/groupmembers/templates/row.tpl
View file @
97fd0038
<div
class=
"friends"
>
<div
class=
"js-masonry
"
data-masonry-options=
'{ "itemSelector": ".item", "gutter" : 10 }'
>
<div
class=
"js-masonry
user-thumbnails"
>
{
foreach
from
=
$groupmembers
item
=
groupmember
}
<a
href=
"
{
profile_url
(
$groupmember
)
}
"
class=
"item user-icon metadata user-icon-larger"
>
<img
src=
"
{
profile_icon_url
user
=
$groupmember
maxwidth
=
100
maxheight
=
100
}
"
alt=
"
{
str
tag
=
profileimagetext
arg1
=
$groupmember
|
display_default_name
}
"
title=
"
{
$groupmember
|
display_default_name
|
escape
}
"
>
...
...
htdocs/theme/raw/plugintype/blocktype/myfriends/templates/myfriendrows.tpl
View file @
97fd0038
<div
class=
"js-masonry user-thumbnails"
>
{
foreach
from
=
$friends
item
=
row
}
<div
class=
"js-masonry"
data-masonry-options=
'{ "itemSelector": ".item", "gutter" : 10 }'
>
{
foreach
from
=
$row
item
=
friend
}
<a
href=
"
{
profile_url
(
$friend
)
}
"
class=
"item user-icon metadata user-icon-larger
{
cycle
values
=
'd0,d1'
}
"
>
<img
src=
"
{
profile_icon_url
user
=
$friend
maxwidth
=
100
maxheight
=
100
}
"
alt=
"
{
str
tag
=
profileimagetext
arg1
=
$friend
|
display_default_name
}
"
>
<img
src=
"
{
profile_icon_url
user
=
$friend
maxwidth
=
100
maxheight
=
100
}
"
alt=
"
{
str
tag
=
profileimagetext
arg1
=
$friend
|
display_default_name
}
"
with=
"100"
height=
"100"
>
<p
class=
"member-name"
>
{
$friend
|
display_default_name
|
escape
}
</p>
</a>
{/
foreach
}
</div>
{/
foreach
}
</div>
htdocs/theme/raw/sass/_custom.scss
View file @
97fd0038
...
...
@@ -248,6 +248,12 @@
}
}
.user-thumbnails
{
.user-icon
{
margin
:
5px
;
}
}
//Google apps
.google-app
{
font-style
:
normal
;
...
...
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