Skip to content

Commit b1479f8

Browse files
mirekysmirekys
authored
Merge pull request #3 from CESNET/disable_profile_changes
Disable profile changes
2 parents 2f83de9 + a9363f7 commit b1479f8

5 files changed

Lines changed: 139 additions & 2 deletions

File tree

‎.github/workflows/php.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
working-directory: build
1919
run: npm run build-all
2020
- name: Build app distribution
21-
run: tar -czvf theme-cesnet.tar.gz appinfo apps core *.php README.md LICENSE AUTHORS.md
21+
run: tar -czvf theme-cesnet.tar.gz appinfo apps settings core *.php README.md LICENSE AUTHORS.md
2222
- name: Release app distribution assets
2323
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
2424
uses: softprops/action-gh-release@v1

‎build/sass/cubes.scss‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,11 @@ $base-matrix: matrix(0.9, 0.5, 0, 1, 0, 0);
3232
height: 100%;
3333
&.top {
3434
animation: $animation-duration top $easing infinite;
35+
-webkit-animation: $animation-duration top $easing infinite;
3536
}
3637
&.bottom {
3738
animation: $animation-duration bottom $easing infinite;
39+
-webkit-animation: $animation-duration bottom $easing infinite;
3840
}
3941
}
4042

@@ -124,6 +126,7 @@ $radial-map: (
124126
@each $position, $points in $radial-map {
125127
.#{$position} {
126128
animation: $animation-duration $position $easing infinite;
129+
-webkit-animation: $animation-duration $position $easing infinite;
127130
}
128131
@keyframes #{$position} {
129132
0%,
@@ -146,6 +149,27 @@ $radial-map: (
146149
translate(map-get($points, x4), map-get($points, y4));
147150
}
148151
}
152+
@-webkit-keyframes #{$position} {
153+
0%,
154+
83.33%,
155+
100% {
156+
transform: $base-matrix
157+
translate(map-get($points, x1), map-get($points, y1));
158+
}
159+
16.66% {
160+
transform: $base-matrix
161+
translate(map-get($points, x2), map-get($points, y2));
162+
}
163+
33.33%,
164+
50% {
165+
transform: $base-matrix
166+
translate(map-get($points, x3), map-get($points, y3));
167+
}
168+
66.66% {
169+
transform: $base-matrix
170+
translate(map-get($points, x4), map-get($points, y4));
171+
}
172+
}
149173
}
150174

151175
.cube {
@@ -189,6 +213,17 @@ $radial-map: (
189213
transform: translate(0, base(-2));
190214
}
191215
}
216+
@-webkit-keyframes top {
217+
0%,
218+
33.33%,
219+
100% {
220+
transform: translate(0, base(-1));
221+
}
222+
50%,
223+
83.33% {
224+
transform: translate(0, base(-2));
225+
}
226+
}
192227
@keyframes bottom {
193228
0%,
194229
33.33%,
@@ -200,3 +235,14 @@ $radial-map: (
200235
transform: translate(0, base(2));
201236
}
202237
}
238+
@-webkit-keyframes bottom {
239+
0%,
240+
33.33%,
241+
100% {
242+
transform: translate(0, base(1));
243+
}
244+
50%,
245+
83.33% {
246+
transform: translate(0, base(2));
247+
}
248+
}

‎core/templates/layout.guest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<?php print_unescaped($_['headers']); ?>
5555
</head>
5656
<body id="<?php p($_['bodyid']); ?>">
57-
<?php include('layout.noscript.warning.php'); ?>
57+
<?php include('theme-cesnet/core/templates/layout.noscript.warning.php'); ?>
5858
<section class="hero is-primary is-fullheight">
5959
<!-- Hero head: will stick at the top -->
6060
<div class="hero-head">

‎core/templates/layout.noscript.warning.php‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<noscript>
2+
<div id="nojavascript">
3+
<div>
4+
<?php print_unescaped(\str_replace(
5+
['{linkstart}', '{linkend}'],
6+
['<a href="http://enable-javascript.com/" target="_blank" rel="noreferrer">', '</a>'],
7+
$l->t('This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page.')
8+
)); ?>
9+
</div>
10+
</div>
11+
</noscript>

‎settings/templates/panels/personal/profile.php‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
<?php
2+
script('settings', 'panels/profile');
3+
vendor_script('strengthify/jquery.strengthify');
4+
vendor_style('strengthify/strengthify');
5+
if ($_['enableAvatars']) {
6+
vendor_script('jcrop/js/jquery.Jcrop');
7+
vendor_style('jcrop/css/jquery.Jcrop');
8+
}
9+
?>
10+
<?php if ($_['enableAvatars']): ?>
11+
<form id="avatar" class="section" method="post" action="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.postAvatar')); ?>">
12+
<h2 class="app-name"><?php p($l->t('Profile picture')); ?></h2>
13+
<div id="displayavatar">
14+
<div class="avatardiv"></div>
15+
<div class="warning hidden"></div>
16+
<?php if ($_['avatarChangeSupported']): ?>
17+
<label for="uploadavatar" class="inlineblock button icon-upload" id="uploadavatarbutton" title="<?php p($l->t('Upload new')); ?>"></label>
18+
<div class="inlineblock button icon-folder" id="selectavatar" title="<?php p($l->t('Select from Files')); ?>"></div>
19+
<div class="hidden button icon-delete" id="removeavatar" title="<?php p($l->t('Remove image')); ?>"></div>
20+
<input type="file" name="files[]" id="uploadavatar" class="hiddenuploadfield">
21+
<p><em><?php p($l->t('png or jpg, max. 20 MB')); ?></em></p>
22+
<?php else: ?>
23+
<?php p($l->t('Picture provided by original account')); ?>
24+
<?php endif; ?>
25+
</div>
26+
27+
<div id="cropper" class="hidden">
28+
<div class="inlineblock button" id="abortcropperbutton"><?php p($l->t('Cancel')); ?></div>
29+
<div class="inlineblock button primary" id="sendcropperbutton"><?php p($l->t('Choose as profile picture')); ?></div>
30+
</div>
31+
</form>
32+
<?php endif; ?>
33+
34+
<div id="displaynameform" class="section">
35+
<h2><?php echo $l->t('Full name'); ?></h2>
36+
<span><?php if (isset($_['displayName'][0])) {
37+
p($_['displayName']);
38+
} else {
39+
p($l->t('No display name set'));
40+
} ?></span>
41+
</div>
42+
43+
<div id="lostpassword" class="section">
44+
<h2><?php echo $l->t('Email'); ?></h2>
45+
<span><?php if (isset($_['email'][0])) {
46+
p($_['email']);
47+
} else {
48+
p($l->t('No email address set'));
49+
} ?></span>
50+
</div>
51+
52+
<div id="groups" class="section">
53+
<h2><?php p($l->t('Groups')); ?></h2>
54+
<?php if (\count($_['groups']) > 0) {
55+
?>
56+
<p><?php p($l->t('You are member of the following groups:')); ?></p>
57+
<p>
58+
<?php p(\implode(', ', $_['groups'])); ?>
59+
</p>
60+
<?php
61+
} else {
62+
?>
63+
<p><?php p($l->t('You are not a member of any groups.')); ?></p>
64+
<?php
65+
} ?>
66+
67+
</div>
68+
69+
<form id="language" class="section">
70+
<h2>
71+
<label><?php p($l->t('Language'));?></label>
72+
</h2>
73+
<?php print_unescaped($_['languageSelector']); ?>
74+
<?php if (OC_Util::getEditionString() === OC_Util::EDITION_COMMUNITY): ?>
75+
<a href="https://www.transifex.com/projects/p/owncloud/"
76+
target="_blank" rel="noreferrer">
77+
<em><?php p($l->t('Help translate'));?></em>
78+
</a>
79+
<?php endif; ?>
80+
</form>

0 commit comments

Comments
 (0)