kalipso/racalmas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'calcms/master'

Browse Source
This commit is contained in:
www-data
2024-03-27 00:58:59 +01:00
parent 9e0ea0e09d fa67921d98
commit 454f0374da
34 changed files with 141 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
website/agenda/planung/assign-series.cgi
View File

@@ -76,8 +76,7 @@ if ( defined $params->{action} ) {
show_series( $config, $request );
sub show_series {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
@@ -138,8 +137,7 @@ sub show_series {
}
sub assign_series {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
@@ -192,8 +190,7 @@ sub assign_series {
}
sub unassign_series {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};

6
website/agenda/planung/assignments.cgi
View File

@@ -76,8 +76,7 @@ if ( defined $params->{action} ) {
show_events( $config, $request );
sub show_events {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
@@ -180,8 +179,7 @@ sub show_events {
}
sub assign_events {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};

13
website/agenda/planung/comment.cgi
View File

@@ -90,8 +90,7 @@ $config->{access}->{write} = 0;
showComments( $config, $request );
sub showComments {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
@@ -161,9 +160,7 @@ sub showComments {
}
sub modify_comments {
my $config = shift;
my $request = shift;
my $results = shift;
my ($config, $request, $results) = @_;
my $language = $config->{date}->{language} || 'en';
for my $result (@$results) {
@@ -176,8 +173,7 @@ sub modify_comments {
}
sub setLock {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
@@ -205,8 +201,7 @@ sub setLock {
}
sub setRead {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};

13
website/agenda/planung/create-events.cgi
View File

@@ -72,8 +72,7 @@ if ( $params->{action} eq 'create_events' ) {
}
sub show_events {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
@@ -93,8 +92,7 @@ sub show_events {
}
sub create_events {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
@@ -122,8 +120,7 @@ sub create_events {
}
sub getDates {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
@@ -180,9 +177,7 @@ sub getDates {
}
sub createEvent {
my $config = shift;
my $request = shift;
my $date = shift;
my ($config, $request, $date) = @_;
my $permissions = $request->{permissions};
my $user = $request->{user};

13
website/agenda/planung/css/default.css
View File

@@ -95,6 +95,11 @@ body,
}
#content div.panel-header,
#content .label {
font-family: Roboto condensed, Roboto, sans-serif;
}
#content div.panel-header,
#content button {
font-size: 1rem;
font-family: Roboto, sans-serif;
@@ -297,7 +302,7 @@ a {
}
#content .panel {
background:white;
background:#fff;
margin: 1rem;
padding: 1rem;
@@ -352,6 +357,10 @@ table {
vertical-align: middle;
}
td.label{
vertical-align: top;
}
#content td {
padding: 0.5rem;
}
@@ -582,7 +591,6 @@ table.tablesorter tr {
border: none;
border-bottom: 1px solid #ccc;
color: #000;
background: #fefefe;
box-sizing:border-box;
}
@@ -603,7 +611,6 @@ table.tablesorter tr {
#content textarea:hover,
#content textarea:focus {
border-bottom: 1px solid #03a9f4;
background:#fff;
}
#content select {

4
website/agenda/planung/css/event.css
View File

@@ -64,10 +64,6 @@ div#edit_new table{
width:480px;
}
#content table.edit_event{
background:white;
}
#content table.edit_event td{
padding-left:1rem;
padding-right:1rem;

7
website/agenda/planung/css/series.css
View File

@@ -11,6 +11,11 @@
max-width: 2rem;
}
#content .editor td.label {
max-width: min-content;
padding-top:0.5rem;
}
#content .label {
color: #555;
}
@@ -57,7 +62,7 @@
height: 24px;
}
#context textarea {
#content textarea {
width: 600px;
height: 100px;
}

5
website/agenda/planung/css/user-settings.css Normal file
View File

@@ -0,0 +1,5 @@
div.col {
float: left;
width: 2rem;
height: 2rem;
}

6
website/agenda/planung/event-history.cgi
View File

@@ -85,8 +85,7 @@ show_history( $config, $request );
#show existing event history
sub show_history {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
@@ -125,8 +124,7 @@ sub show_history {
#show existing event history
sub compare {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};

3
website/agenda/planung/help-texts.cgi
View File

@@ -56,8 +56,9 @@ return unless uac::check( $config, $params, $user_presets ) == 1;
if ( defined $params->{action} ) {
save_help( $config, $request ) if $params->{action} eq 'save';
delete_help( $config, $request ) if $params->{action} eq 'delete';
edit_help( $config, $request ) if $params->{action} eq 'edit';
get_help( $config, $request ) if $params->{action} eq 'get';
}
edit_help( $config, $request );
$config->{access}->{write} = 0;

4
website/agenda/planung/image.cgi
View File

@@ -255,9 +255,7 @@ sub print_js_error {
}
sub save_image {
my $config = shift;
my $request = shift;
my $user = shift;
my ($config, $request, $user) = @_;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};

20
website/agenda/planung/js/jquery.tablesorter.min.js vendored
View File

File diff suppressed because one or more lines are too long

30
website/agenda/planung/js/user-settings.js Normal file
View File

@@ -0,0 +1,30 @@
var selectedId;
$(document).ready(function() {
$('input.color').click(function() {
selectedId = ($(this).attr('id'));
showColors();
});
});
function showColors() {
var colors = [ '#ef9a9a', '#f48fb1', '#ce93d8', '#b39ddb', '#9fa8da',
'#90caf9', '#81d4fa', '#80deea', '#80cbc4', '#a5d6a7',
'#c5e1a5', '#e6ee9c', '#fff59d', '#ffe082', '#ffcc80',
'#ffab91', '#bcaaa4', '#b0bec5', '#bdc3c7', '#dde4e6',
'#eeeeee', ];
var content = '';
for ( var c in colors) {
var value = colors[c];
content += '<div class="col" value="'+value+'" style="background:'+value+';"> </div>';
}
content += '<br style="clear:both">'
$("#colors").html(content);
$("#colors div.col").click(function() {
var color = $(this).attr("value");
$('#' + selectedId).css('background', color);
$('#' + selectedId).attr('value', color);
});
}

10
website/agenda/planung/notify-events.cgi
View File

@@ -73,8 +73,7 @@ show_events( $config, $request );
#show existing event history
sub show_events {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
@@ -126,8 +125,7 @@ sub show_events {
}
sub sendMail {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
@@ -169,9 +167,7 @@ sub sendMail {
}
sub getMail {
my $config = shift;
my $request = shift;
my $event = shift;
my ($config, $request, $event) = @_;
my $users = series::get_users(
$config,

3
website/agenda/planung/playout.cgi
View File

@@ -75,8 +75,7 @@ if ( defined $params->{action} ) {
return;
sub deleteFromPlayout {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};

6
website/agenda/planung/pot/de/event.po
View File

@@ -15,13 +15,13 @@ msgid "button_upload"
msgstr "Vorproduktion hochladen"
msgid "button_create"
msgstr "Anlegen"
msgstr "Sendung anlegen"
msgid "button_save"
msgstr "Speichern"
msgstr "Sendung speichern"
msgid "button_delete"
msgstr "Löschen"
msgstr "Sendung löschen"
msgid "button_apply"
msgstr "Übernehmen"

6
website/agenda/planung/pot/de/image.po
View File

@@ -85,6 +85,9 @@ msgstr "Angabe der Lizenz ermöglicht Veröffentlichung des Bildes"
msgid "label_assign_to_event"
msgstr "Dieses Bild für Sendung nutzen"
msgid "label_assign_to_broadcast"
msgstr "Dieses Bild für Sendung nutzen"
msgid "label_assign_to_series"
msgstr "Dieses Bild für Sendereihe nutzen"
@@ -97,6 +100,9 @@ msgstr "Dieses Bild für Projekt nutzen"
msgid "label_assign_to_projects"
msgstr "Dieses Bild für Projekt nutzen"
msgid "label_warn_not_public_broadcast"
msgstr "Bild muss veröffentlicht werden, um es in Sendebeschreibung zu nutzen."
msgid "label_warn_not_public_event"
msgstr "Bild muss veröffentlicht werden, um es in Sendebeschreibung zu nutzen."

6
website/agenda/planung/pot/en/image.po
View File

@@ -86,6 +86,9 @@ msgstr "fill in licence to allow publishing the image"
msgid "label_assign_to_event"
msgstr "use image for event"
msgid "label_assign_to_broadcast"
msgstr "use image for event"
msgid "label_assign_to_series"
msgstr "use image for series"
@@ -98,6 +101,9 @@ msgstr "use image for project"
msgid "label_assign_to_projects"
msgstr "use image for project"
msgid "label_warn_not_public_broadcast"
msgstr "image must has been published before assigning to event"
msgid "label_warn_not_public_event"
msgstr "image must has been published before assigning to event"

15
website/agenda/planung/projects.cgi
View File

@@ -64,8 +64,7 @@ $config->{access}->{write} = 0;
show_projects( $config, $request );
sub delete_project {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $permissions = $request->{permissions};
unless ( $permissions->{delete_project} == 1 ) {
@@ -95,8 +94,7 @@ sub delete_project {
}
sub save_project {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
@@ -144,8 +142,7 @@ sub save_project {
}
sub assign_studio {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
@@ -175,8 +172,7 @@ sub assign_studio {
# TODO: unassign series from studio
sub unassign_studio {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
@@ -205,8 +201,7 @@ sub unassign_studio {
}
sub show_projects {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};

6
website/agenda/planung/roles.cgi
View File

@@ -82,8 +82,7 @@ return;
# new roles will have role level 0 by default
#
sub save_roles {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
@@ -255,8 +254,7 @@ sub check_level {
# user has to be assigned to studio
# user needs to have permissions read_role
sub show_roles {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};

3
website/agenda/planung/select-event.cgi
View File

@@ -60,8 +60,7 @@ show_events( $config, $request );
#TODO: filter by published, draft
sub show_events {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};

3
website/agenda/planung/select-series.cgi
View File

@@ -64,8 +64,7 @@ unless ( $permissions->{read_series} == 1 ) {
show_series( $config, $request );
sub show_series {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};

3
website/agenda/planung/set-user-day-start.cgi
View File

@@ -59,8 +59,7 @@ return unless uac::check( $config, $params, $user_presets ) == 1;
set_start_date( $config, $request );
sub set_start_date {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};

3
website/agenda/planung/show-image.cgi
View File

@@ -54,8 +54,7 @@ showImage( $config, $request );
#TODO: filter by published, draft
sub showImage {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};

3
website/agenda/planung/show-playout.cgi
View File

@@ -73,8 +73,7 @@ template::process( $config, 'print', $params->{template}, $params );
exit;
sub showPlayout {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};

12
website/agenda/planung/studio-timeslots.cgi
View File

@@ -85,8 +85,7 @@ return;
#insert or update a schedule and update all schedule dates
sub save_schedule {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $permissions = $request->{permissions};
unless ( $permissions->{update_studio_timeslot_schedule} == 1 ) {
@@ -133,8 +132,7 @@ sub save_schedule {
}
sub delete_schedule {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $permissions = $request->{permissions};
unless ( $permissions->{update_studio_timeslot_schedule} == 1 ) {
@@ -162,8 +160,7 @@ sub delete_schedule {
}
sub showTimeslotSchedule {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
$config->{access}->{write} = 0;
@@ -246,8 +243,7 @@ sub showTimeslotSchedule {
}
sub showDates {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
$config->{access}->{write} = 0;

9
website/agenda/planung/studios.cgi
View File

@@ -61,8 +61,7 @@ $config->{access}->{write} = 0;
show_studios( $config, $request );
sub delete_studio {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $permissions = $request->{permissions};
unless ( $permissions->{update_studio} == 1 ) {
@@ -110,8 +109,7 @@ sub delete_studio {
}
sub save_studio {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
@@ -177,8 +175,7 @@ sub save_studio {
}
sub show_studios {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};

2
website/agenda/planung/templates/edit-event.html
View File

@@ -483,7 +483,7 @@
</td>
<td>
<TMPL_IF .allow.update_event_field_image>
<button onclick="selectImage('<TMPL_VAR series_name escape=js>', '<TMPL_VAR image escape=js>', 'event', '<TMPL_VAR .project_id escape=js>','<TMPL_VAR .studio_id escape=js>','<TMPL_VAR series_id escape=js>','<TMPL_VAR event_id escape=js>'); return false;"
<button onclick="selectImage('<TMPL_VAR series_name escape=js>', '<TMPL_VAR image escape=js>', 'broadcast', '<TMPL_VAR .project_id escape=js>','<TMPL_VAR .studio_id escape=js>','<TMPL_VAR series_id escape=js>','<TMPL_VAR event_id escape=js>'); return false;"
class="selectImage"
>
<img id="imagePreview" src="show-image.cgi?project_id=<TMPL_VAR project_id>&studio_id=<TMPL_VAR studio_id>&filename=<TMPL_VAR image>&type=icon">

41
website/agenda/planung/templates/user-settings.html
View File

@@ -1,44 +1,3 @@
<script type="text/javascript">
var selectedId;
$(document).ready(function() {
$('input.color').click(function() {
selectedId = ($(this).attr('id'));
showColors();
});
});
function showColors() {
var colors = [ '#ef9a9a', '#f48fb1', '#ce93d8', '#b39ddb', '#9fa8da',
'#90caf9', '#81d4fa', '#80deea', '#80cbc4', '#a5d6a7',
'#c5e1a5', '#e6ee9c', '#fff59d', '#ffe082', '#ffcc80',
'#ffab91', '#bcaaa4', '#b0bec5', '#bdc3c7', '#dde4e6',
'#eeeeee', ];
var content = '';
for ( var c in colors) {
var value = colors[c];
content += '<div class="col" value="'+value+'" style="background:'+value+';"> </div>';
}
content += '<br style="clear:both">'
$("#colors").html(content);
$("#colors div.col").click(function() {
var color = $(this).attr("value");
$('#' + selectedId).css('background', color);
$('#' + selectedId).attr('value', color);
});
}
</script>
<style>
div.col {
float: left;
width: 2rem;
height: 2rem;
}
</style>
<h2>
<TMPL_VAR loc.title>
</h2>

4
website/agenda/planung/user-selected-event.cgi
View File

@@ -67,9 +67,7 @@ sub get_value_fields {
}
sub log_event_selection {
my $config = shift;
my $request = shift;
my $user = shift;
my ($config, $request, $user) = @_;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};

9
website/agenda/planung/user-settings.cgi
View File

@@ -66,8 +66,7 @@ $config->{access}->{write} = 0;
show_settings( $config, $request );
sub show_settings {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
@@ -119,8 +118,7 @@ sub show_settings {
}
sub updateDefaultProjectStudio {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
@@ -168,8 +166,7 @@ sub updateDefaultProjectStudio {
}
sub update_settings {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};

6
website/agenda/planung/user-stats.cgi
View File

@@ -67,8 +67,7 @@ if ($params->{action} eq 'show-user-stats'){
};
sub show_user_stats {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
@@ -87,8 +86,7 @@ sub show_user_stats {
}
sub show_active_users{
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};

12
website/agenda/planung/users.cgi
View File

@@ -68,8 +68,7 @@ $config->{access}->{write} = 0;
show_users( $config, $request );
sub show_users {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $params = $request->{params}->{checked};
@@ -170,8 +169,7 @@ sub show_users {
}
sub update_user {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
@@ -248,8 +246,7 @@ sub change_password {
}
sub delete_user {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $permissions = $request->{permissions};
unless ( $permissions->{delete_user} == 1 ) {
@@ -265,8 +262,7 @@ sub delete_user {
# add or remove user from role for given studio_id
# todo: assign/unassign role oly if max(change user rank) is < max(users rank)
sub update_user_roles {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $permissions = $request->{permissions};
unless ( $permissions->{update_user_role} == 1 ) {

9
website/agenda/planung/work-time.cgi
View File

@@ -69,8 +69,7 @@ return;
#insert or update a schedule and update all schedule dates
sub save_schedule {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $params = $request->{params}->{checked};
@@ -135,8 +134,7 @@ sub save_schedule {
}
sub delete_schedule {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
@@ -163,8 +161,7 @@ sub delete_schedule {
}
sub show_work_schedule {
my $config = shift;
my $request = shift;
my ($config, $request) = @_;
$config->{access}->{write} = 0;