Skip to content

Commit d46448a

Browse files
adrianfishadrianfish
authored
SAK-41762 Moved to permissions webcomponent in Roster (sakaiproject#6888)
1 parent 03ef986 commit d46448a

File tree

30 files changed

+330
-346
lines changed

30 files changed

+330
-346
lines changed

‎admin-tools/src/webapp/css/authz.css

-19
This file was deleted.

‎admin-tools/src/webapp/js/authz.js

-43
This file was deleted.

‎admin-tools/src/webapp/vm/authz-helper/chef_permissions-Main.vm

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
## This is the fallback template which is used when there is a problem and a normal template
22
## isn't used.
33
<div class="portletBody">
4-
#css("/sakai-authz-tool/css/authz.css" 'media="all"')
54
#javascript("/library/js/spinner.js")
65
#if($menu)
76
#toolbar($menu)

‎admin-tools/src/webapp/vm/authz-helper/chef_permissions.vm

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
##<!-- $Header: /cvs/sakai2/legacy/tools/src/webapp/vm/helper/chef_permissions.vm,v 1.4 2005/05/28 03:04:36 ggolden.umich.edu Exp $ -->
22
<div class="portletBody">
3-
#css("/admin-tools/css/authz.css")
43
<script>includeLatestJQuery('chef_permissions.vm');</script>
5-
#javascript("/admin-tools/js/authz.js")
64
#javascript("/library/js/spinner.js")
75
#if($menu)
86
#toolbar($menu)
@@ -53,7 +51,7 @@
5351

5452
<form name= "permissionForm" action="#toolForm("$action")" method="post">
5553
#if ($!roles)
56-
<table class="listHier checkGrid specialLink" cellspacing="0" summary ="$thelp.getString("per.lis")" border="0" style="width:auto">
54+
<table class="permissions-table listHier checkGrid specialLink" cellspacing="0" summary ="$thelp.getString("per.lis")" border="0" style="width:auto">
5755
<tr>
5856
<th id="permission">
5957
<a href="#" title="$thelp.getString("per.lis.head.title")">$thelp.getString("per.lis.head")</a>

‎library/src/morpheus-master/js/src/sakai.morpheus.authz.js

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
(function ($) {
2+
3+
$(function () {
4+
5+
// When the checkboxes change update the cell.
6+
$('.permissions-table input:checkbox').change(function () {
7+
$(this).parents('td').toggleClass('active', this.checked);
8+
}).change();
9+
$(".permissions-table tr:even").addClass("evenrow");
10+
// Save the default selected
11+
$('.permissions-table :checked').parents('td').addClass('defaultSelected');
12+
13+
$('.permissions-table .permissionDescription').hover(function (e) {
14+
$(this).parents('tr').children('td').toggleClass('rowHover', e.type === "mouseenter");
15+
});
16+
17+
$('.permissions-table th').hover(function (event) {
18+
19+
var col = ($(this).prevAll().size());
20+
$('.' + col).add(this).toggleClass('rowHover', event.type === "mouseenter");
21+
});
22+
23+
$('.permissions-table th#permission').hover(function (event) {
24+
$('.permissions-table td.checkboxCell').toggleClass('rowHover', event.type === "mouseenter");
25+
});
26+
27+
$('.permissions-table th#permission a').click(function (e) {
28+
29+
$('.permissions-table .checkGrid input').prop('checked', ($('.checkGrid :checked').length === 0)).change();
30+
e.preventDefault();
31+
});
32+
$('.permissions-table .permissionDescription a').click(function (e) {
33+
34+
var anyChecked = $(this).parents('tr').find('input:checked').not('[disabled]').length > 0;
35+
$(this).parents('tr').find('input:checkbox').not('[disabled]').prop('checked', !anyChecked).change();
36+
e.preventDefault();
37+
});
38+
$('.permissions-table th.role a').click(function (e) {
39+
40+
var col = ($(this).parent('th').prevAll().size());
41+
var anyChecked = $('.permissions-table .' + col + ' input:checked').not('[disabled]').length > 0;
42+
$('.permissions-table .' + col + ' input').not('[disabled]').prop('checked', !anyChecked).change();
43+
e.preventDefault();
44+
});
45+
46+
$('#clearall').click(function (e) {
47+
48+
$(".permissions-table input").not('[disabled]').prop("checked", false).change();
49+
e.preventDefault();
50+
});
51+
});
52+
}) ($PBJQ);

‎library/src/morpheus-master/sass/modules/tool/authz/_authz.scss

+70
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
.checkGrid th:hover,.checkGrid td h4:hover {
2+
color: #369 !important;
3+
}
4+
.checkGrid a {
5+
text-decoration: none !important;
6+
}
7+
.checkGrid {
8+
border-top: 1px solid #e5eff8;
9+
border-right: 1px solid #e5eff8;
10+
border-collapse: collapse;
11+
}
12+
.checkGrid th {
13+
background: #f4f9fe;
14+
text-align: center !important;
15+
color: #5896C7;
16+
}
17+
.checkGrid th#permission {
18+
text-align: left !important;
19+
}
20+
.checkGrid label {
21+
display: block;
22+
width: 100%;
23+
height: 100%;
24+
margin: 0;
25+
text-align: center;
26+
padding: .3em 0;
27+
}
28+
.checkGrid td {
29+
border: 1px solid #eee;
30+
cursor: pointer;
31+
padding: 0 !important;
32+
text-align: center;
33+
vertical-align: middle;
34+
width: 10em;
35+
}
36+
.checkGrid td label:hover {
37+
background: #C4DFFB;
38+
cursor: pointer;
39+
}
40+
.checkGrid td.permissionDescription {
41+
width: auto;
42+
background: #F9FCFE;
43+
text-align: left;
44+
white-space: nowrap;
45+
}
46+
.checkGrid td.permissionDescription a {
47+
padding: .3em;
48+
display: block;
49+
}
50+
.checkGrid tr.evenrow .permissionDescription {
51+
background: #f4f9fe;
52+
}
53+
.checkGrid tr.evenrow td {
54+
background: #f7fbff;
55+
}
56+
.checkGrid .rowHover {
57+
background: #c4dffb !important;
58+
}
59+
.checkGrid td.active {
60+
background: #DDECFC !important;
61+
}
62+
.checkGrid td.active:hover {
63+
background: #cde !important;
64+
}
65+
div#groupSelector {
66+
margin-top: 0.5em;
67+
}
68+
.permissions-undo-button {
69+
margin-bottom: 15px;
70+
}

‎library/src/morpheus-master/sass/tool.scss

+2-1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
@import "modules/tool/roster/roster";
4949
@import "modules/tool/tagservice/tagservice";
5050
@import "modules/tool/rubrics/rubrics";
51+
@import "modules/tool/authz/authz";
5152

5253
@import "base/rtl";
5354

@@ -65,4 +66,4 @@
6566
@import "modules/connection-manager/base";
6667
@import "modules/profile-popup/base";
6768
@import "modules/joinpage/base";
68-
@import "modules/editor/base";
69+
@import "modules/editor/base";

‎portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/site.vm

+2
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,8 @@
145145
<script src="${pageScriptPath}jquery/qtip/tutorial.js$!{portalCDNQuery}"></script>
146146
<script src="${pageWebjarsPath}cropper/4.0.0/dist/cropper.min.js$!{portalCDNQuery}"></script>
147147

148+
<script type="module" src="/webcomponents/sakai-tool-permissions.js$!{portalCDNQuery}"></script>
149+
148150
<!-- RUBRICS CODE AND MODULES -->
149151
<script src="/rubrics-service/webcomponents/sakai-rubrics.js$!{portalCDNQuery}"></script>
150152
<script type="module" src="/rubrics-service/webcomponents/sakai-rubric-student.js$!{portalCDNQuery}"></script>

‎roster2/i18n/pom.xml ‎roster2/bundle/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
<modelVersion>4.0.0</modelVersion>
55

6-
<name>ROSTER2 I18N</name>
7-
<artifactId>sakai-roster2-i18n</artifactId>
6+
<name>ROSTER2 BUNDLE</name>
7+
<artifactId>sakai-roster2-bundle</artifactId>
88
<groupId>org.sakaiproject.roster2</groupId>
99

1010
<parent>
@@ -22,7 +22,7 @@
2222
<build>
2323
<resources>
2424
<resource>
25-
<directory>${basedir}/src/i18n</directory>
25+
<directory>${basedir}/src/bundle</directory>
2626
<includes>
2727
<include>**/*.properties</include>
2828
</includes>

‎roster2/i18n/src/i18n/org/sakaiproject/roster/i18n/ui.properties ‎roster2/bundle/src/bundle/org/sakaiproject/roster/bundle/Messages.properties

+11-10
Original file line numberDiff line numberDiff line change
@@ -83,16 +83,17 @@ roster_permissions_role = Role
8383
roster_save_button = Save
8484
roster_cancel_button = Cancel
8585
permissions_header = Permission
86-
permissions_allmembers = View all participants
87-
permissions_hidden = View hidden participants
88-
permissions_groups = View groups
89-
permissions_enrollment = View participant's enrollment status
90-
permissions_profile = View participant's profile
91-
permissions_email = View participant's email
92-
permissions_photo = View participant's official photo
93-
permissions_visits = View participant's site visits
94-
permissions_export = Export roster
95-
permissions_user_properties= View participant's properties
86+
87+
perm-roster.viewallmembers = View all participants
88+
perm-roster.viewhidden = View hidden participants
89+
perm-roster.export = Export roster
90+
perm-roster.viewgroup = View groups
91+
perm-roster.viewenrollmentstatus = View participant's enrollment status
92+
perm-roster.viewprofile = View participant's profile
93+
perm-roster.viewemail = View participant's email
94+
perm-roster.viewofficialphoto = View participant's official photo
95+
perm-roster.viewsitevisits = View participant's site visits
96+
perm-roster.viewuserproperties= View participant's properties
9697

9798
groups = Group
9899
roles_label = Role

‎roster2/i18n/src/i18n/org/sakaiproject/roster/i18n/ui_ca.properties ‎roster2/bundle/src/bundle/org/sakaiproject/roster/bundle/Messages_ca.properties

+10-10
Original file line numberDiff line numberDiff line change
@@ -83,16 +83,16 @@ roster_permissions_role=Rol
8383
roster_save_button=Desa
8484
roster_cancel_button=Cancel\u00b7la
8585
permissions_header=Perm\u00eds
86-
permissions_allmembers=Pot veure tots els participants
87-
permissions_hidden=Pot veure els participants ocults
88-
permissions_groups=Pot veure els grups
89-
permissions_enrollment=Pot veure l'estat de la matr\u00edcula dels participants
90-
permissions_profile=Pot veure el perfil dels participants
91-
permissions_email=Pot veure el correu electr\u00f2nic dels participants
92-
permissions_photo=Pot veure la fotografia oficial dels participants
93-
permissions_visits=Pot veure el nombre de visites a l'espai dels participants
94-
permissions_export=Pot exportar l'orla
95-
permissions_user_properties=Pot veure les propietats dels participants
86+
perm-roster.viewallmembers=Pot veure tots els participants
87+
perm-roster.viewhidden=Pot veure els participants ocults
88+
perm-roster.export=Pot exportar l'orla
89+
perm-roster.viewgroup=Pot veure els grups
90+
perm-roster.viewenrollmentstatus=Pot veure l'estat de la matr\u00edcula dels participants
91+
perm-roster.viewprofile=Pot veure el perfil dels participants
92+
perm-roster.viewemail=Pot veure el correu electr\u00f2nic dels participants
93+
perm-roster.viewofficialphoto=Pot veure la fotografia oficial dels participants
94+
perm-roster.viewsitevisits=Pot veure el nombre de visites a l'espai dels participants
95+
perm-roster.viewuserproperties=Pot veure les propietats dels participants
9696

9797
groups=Grup
9898
roles_label=Rol

‎roster2/i18n/src/i18n/org/sakaiproject/roster/i18n/ui_es.properties ‎roster2/bundle/src/bundle/org/sakaiproject/roster/bundle/Messages_es.properties

+10-10
Original file line numberDiff line numberDiff line change
@@ -83,16 +83,16 @@ roster_permissions_role=Rol
8383
roster_save_button=Guardar
8484
roster_cancel_button=Cancelar
8585
permissions_header=Permisos
86-
permissions_allmembers=Ver todos los participantes
87-
permissions_hidden=Ver participantes ocultos
88-
permissions_groups=Ver grupos
89-
permissions_enrollment=Ver el estado de inscripci\u00f3n del participante
90-
permissions_profile=Ver el perfil del participante
91-
permissions_email=Ver el correo electr\u00f3nico del participante
92-
permissions_photo=Ver la foto oficial del participante
93-
permissions_visits=Ver las visitas al sitio del participante
94-
permissions_export=Exportar listado
95-
permissions_user_properties=Ver las propiedades del participante
86+
perm-roster.viewallmembers=Ver todos los participantes
87+
perm-roster.viewhidden=Ver participantes ocultos
88+
perm-roster.export=Exportar listado
89+
perm-roster.viewgroup=Ver grupos
90+
perm-roster.viewenrollmentstatus=Ver el estado de inscripci\u00f3n del participante
91+
perm-roster.viewprofile=Ver el perfil del participante
92+
perm-roster.viewemail=Ver el correo electr\u00f3nico del participante
93+
perm-roster.viewofficialphoto=Ver la foto oficial del participante
94+
perm-roster.viewsitevisits=Ver las visitas al sitio del participante
95+
perm-roster.viewuserproperties=Ver las propiedades del participante
9696

9797
groups=Grupo
9898
roles_label=Rol

‎roster2/i18n/src/i18n/org/sakaiproject/roster/i18n/ui_fa_IR.properties ‎roster2/bundle/src/bundle/org/sakaiproject/roster/bundle/Messages_fa_IR.properties

+9-9
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,13 @@ last_visit=\u0622\u062e\u0631\u06cc\u0646 \u0645\u0631\u0627\u062c\u0639\u0647
7171
months=\u0641\u0631\u0648\u0631\u062f\u06cc\u0646\u060c \u0627\u0631\u062f\u06cc\u0628\u0647\u0634\u062a\u060c \u062e\u0631\u062f\u0627\u062f\u060c \u062a\u06cc\u0631\u060c \u0645\u0631\u062f\u0627\u062f\u060c \u0634\u0647\u0631\u06cc\u0648\u0631\u060c \u0645\u0647\u0631\u060c \u0622\u0628\u0627\u0646\u060c \u0622\u0630\u0631\u060c \u062f\u06cc\u060c\u0628\u0647\u0645\u0646\u060c \u0627\u0633\u0641\u0646\u062f
7272
no_visits_yet=\u0647\u0646\u0648\u0632 \u0647\u06cc\u0686 \u0645\u0648\u0631\u062f
7373
permissions_header=\u0645\u062c\u0648\u0632
74-
permissions_allmembers=\u0645\u0634\u0627\u0647\u062f\u0647 \u0647\u0645\u0647 \u0634\u0631\u06a9\u062a \u06a9\u0646\u0646\u062f\u06af\u0627\u0646
75-
permissions_hidden=\u0645\u0634\u0627\u0647\u062f\u0647 \u0634\u0631\u06a9\u062a \u06a9\u0646\u0646\u062f\u06af\u0627\u0646 \u067e\u0646\u0647\u0627\u0646
76-
permissions_groups=\u0645\u0634\u0627\u0647\u062f\u0647 \u06af\u0631\u0648\u0647 \u0647\u0627
77-
permissions_enrollment=\u0645\u0634\u0627\u0647\u062f\u0647 \u0648\u0636\u0639\u06cc\u062a \u062b\u0628\u062a \u0646\u0627\u0645 \u0634\u0631\u06a9\u062a \u06a9\u0646\u0646\u062f\u06af\u0627\u0646
78-
permissions_profile=\u0645\u0634\u0627\u0647\u062f\u0647 \u067e\u0631\u0648\u0641\u0627\u06cc\u0644 \u0634\u0631\u06a9\u062a \u06a9\u0646\u0646\u062f\u06af\u0627\u0646
79-
permissions_email=\u0645\u0634\u0627\u0647\u062f\u0647 \u067e\u0633\u062a \u0627\u0644\u06a9\u062a\u0631\u0648\u0646\u06cc\u06a9 \u0634\u0631\u06a9\u062a \u06a9\u0646\u0646\u062f\u06af\u0627\u0646
80-
permissions_photo=\u0645\u0634\u0627\u0647\u062f\u0647 \u062a\u0635\u0648\u06cc\u0631 \u0631\u0633\u0645\u06cc \u0634\u0631\u06a9\u062a \u06a9\u0646\u0646\u062f\u06af\u0627\u0646
81-
permissions_visits=\u0645\u0634\u0627\u0647\u062f\u0647 \u062f\u0641\u0639\u0627\u062a \u0628\u0627\u0631\u062f\u06cc\u062f\u0647\u0627\u06cc \u0633\u0627\u06cc\u062a \u0627\u0632 \u0637\u0631\u0641 \u0634\u0631\u06a9\u062a \u06a9\u0646\u0646\u062f\u06af\u0627\u0646
82-
permissions_export=\u062e\u0631\u0648\u062c\u06cc \u06af\u0631\u0641\u062a\u0646 \u0641\u0647\u0631\u0633\u062a
74+
perm-roster.viewallmembers=\u0645\u0634\u0627\u0647\u062f\u0647 \u0647\u0645\u0647 \u0634\u0631\u06a9\u062a \u06a9\u0646\u0646\u062f\u06af\u0627\u0646
75+
perm-roster.viewhidden=\u0645\u0634\u0627\u0647\u062f\u0647 \u0634\u0631\u06a9\u062a \u06a9\u0646\u0646\u062f\u06af\u0627\u0646 \u067e\u0646\u0647\u0627\u0646
76+
perm-roster.export=\u062e\u0631\u0648\u062c\u06cc \u06af\u0631\u0641\u062a\u0646 \u0641\u0647\u0631\u0633\u062a
77+
perm-roster.viewgroup=\u0645\u0634\u0627\u0647\u062f\u0647 \u06af\u0631\u0648\u0647 \u0647\u0627
78+
perm-roster.viewenrollmentstatus=\u0645\u0634\u0627\u0647\u062f\u0647 \u0648\u0636\u0639\u06cc\u062a \u062b\u0628\u062a \u0646\u0627\u0645 \u0634\u0631\u06a9\u062a \u06a9\u0646\u0646\u062f\u06af\u0627\u0646
79+
perm-roster.viewprofile=\u0645\u0634\u0627\u0647\u062f\u0647 \u067e\u0631\u0648\u0641\u0627\u06cc\u0644 \u0634\u0631\u06a9\u062a \u06a9\u0646\u0646\u062f\u06af\u0627\u0646
80+
perm-roster.viewemail=\u0645\u0634\u0627\u0647\u062f\u0647 \u067e\u0633\u062a \u0627\u0644\u06a9\u062a\u0631\u0648\u0646\u06cc\u06a9 \u0634\u0631\u06a9\u062a \u06a9\u0646\u0646\u062f\u06af\u0627\u0646
81+
perm-roster.viewofficialphoto=\u0645\u0634\u0627\u0647\u062f\u0647 \u062a\u0635\u0648\u06cc\u0631 \u0631\u0633\u0645\u06cc \u0634\u0631\u06a9\u062a \u06a9\u0646\u0646\u062f\u06af\u0627\u0646
82+
perm-roster.viewsitevisits=\u0645\u0634\u0627\u0647\u062f\u0647 \u062f\u0641\u0639\u0627\u062a \u0628\u0627\u0631\u062f\u06cc\u062f\u0647\u0627\u06cc \u0633\u0627\u06cc\u062a \u0627\u0632 \u0637\u0631\u0641 \u0634\u0631\u06a9\u062a \u06a9\u0646\u0646\u062f\u06af\u0627\u0646
8383

‎roster2/i18n/src/i18n/org/sakaiproject/roster/i18n/ui_fr_FR.properties ‎roster2/bundle/src/bundle/org/sakaiproject/roster/bundle/Messages_fr_FR.properties

File renamed without changes.

‎roster2/i18n/src/i18n/org/sakaiproject/roster/i18n/ui_hi_IN.properties ‎roster2/bundle/src/bundle/org/sakaiproject/roster/bundle/Messages_hi_IN.properties

File renamed without changes.

‎roster2/i18n/src/i18n/org/sakaiproject/roster/i18n/ui_ja.properties ‎roster2/bundle/src/bundle/org/sakaiproject/roster/bundle/Messages_ja.properties

+9-9
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ last_visit=\u6700\u7d42\u30a2\u30af\u30bb\u30b9
4747
months=Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec
4848
no_visits_yet=\u306a\u3057
4949
permissions_header=\u6a29\u9650
50-
permissions_allmembers=\u3059\u3079\u3066\u306e\u53c2\u52a0\u8005\u3092\u8868\u793a
51-
permissions_hidden=\u975e\u8868\u793a\u306e\u53c2\u52a0\u8005\u3092\u8868\u793a
52-
permissions_groups=\u30b0\u30eb\u30fc\u30d7\u3092\u8868\u793a
53-
permissions_enrollment=\u53c2\u52a0\u8005\u306e\u5c65\u4fee\u767b\u9332\u72b6\u614b\u3092\u8868\u793a
54-
permissions_profile=\u53c2\u52a0\u8005\u306e\u30d7\u30ed\u30d5\u30a3\u30fc\u30eb\u3092\u8868\u793a
55-
permissions_email=\u53c2\u52a0\u8005\u306e\u30e1\u30fc\u30eb\u3092\u8868\u793a
56-
permissions_photo=\u53c2\u52a0\u8005\u306e\u516c\u5f0f\u5199\u771f\u3092\u8868\u793a
57-
permissions_visits=\u53c2\u52a0\u8005\u306e\u30b5\u30a4\u30c8\u30a2\u30af\u30bb\u30b9\u6570\u3092\u8868\u793a
58-
permissions_export=\u540d\u7c3f\u3092\u30a8\u30af\u30b9\u30dd\u30fc\u30c8
50+
perm-roster.viewallmembers=\u3059\u3079\u3066\u306e\u53c2\u52a0\u8005\u3092\u8868\u793a
51+
perm-roster.viewhidden=\u975e\u8868\u793a\u306e\u53c2\u52a0\u8005\u3092\u8868\u793a
52+
perm-roster.export=\u540d\u7c3f\u3092\u30a8\u30af\u30b9\u30dd\u30fc\u30c8
53+
perm-roster.viewgroup=\u30b0\u30eb\u30fc\u30d7\u3092\u8868\u793a
54+
perm-roster.viewenrollmentstatus=\u53c2\u52a0\u8005\u306e\u5c65\u4fee\u767b\u9332\u72b6\u614b\u3092\u8868\u793a
55+
perm-roster.viewprofile=\u53c2\u52a0\u8005\u306e\u30d7\u30ed\u30d5\u30a3\u30fc\u30eb\u3092\u8868\u793a
56+
perm-roster.viewemail=\u53c2\u52a0\u8005\u306e\u30e1\u30fc\u30eb\u3092\u8868\u793a
57+
perm-roster.viewofficialphoto=\u53c2\u52a0\u8005\u306e\u516c\u5f0f\u5199\u771f\u3092\u8868\u793a
58+
perm-roster.viewsitevisits=\u53c2\u52a0\u8005\u306e\u30b5\u30a4\u30c8\u30a2\u30af\u30bb\u30b9\u6570\u3092\u8868\u793a

‎roster2/i18n/src/i18n/org/sakaiproject/roster/i18n/ui_pt_BR.properties ‎roster2/bundle/src/bundle/org/sakaiproject/roster/bundle/Messages_pt_BR.properties

File renamed without changes.

‎roster2/i18n/src/i18n/org/sakaiproject/roster/i18n/ui_sv.properties ‎roster2/bundle/src/bundle/org/sakaiproject/roster/bundle/Messages_sv.properties

File renamed without changes.

0 commit comments

Comments
 (0)