From b93c4ee8668b66284f6fe5cc14e81c55f1ce8068 Mon Sep 17 00:00:00 2001 From: Milan Date: Sun, 10 Dec 2023 12:55:55 +0100 Subject: [PATCH 1/6] jquery.tablesorter.min.js: add copyright notice --- .../planung/js/jquery.tablesorter.min.js | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/website/agenda/planung/js/jquery.tablesorter.min.js b/website/agenda/planung/js/jquery.tablesorter.min.js index dac499e..5e15329 100644 --- a/website/agenda/planung/js/jquery.tablesorter.min.js +++ b/website/agenda/planung/js/jquery.tablesorter.min.js @@ -1 +1,21 @@ !function(e){"function"==typeof define&&define.amd?define(["jquery"],e):"object"==typeof module&&"object"==typeof module.exports?module.exports=e(require("jquery")):e(jQuery)}(function(e){return function(A){"use strict";var L=A.tablesorter={version:"2.31.3",parsers:[],widgets:[],defaults:{theme:"default",widthFixed:!1,showProcessing:!1,headerTemplate:"{content}",onRenderTemplate:null,onRenderHeader:null,cancelSelection:!0,tabIndex:!0,dateFormat:"mmddyyyy",sortMultiSortKey:"shiftKey",sortResetKey:"ctrlKey",usNumberFormat:!0,delayInit:!1,serverSideSorting:!1,resort:!0,headers:{},ignoreCase:!0,sortForce:null,sortList:[],sortAppend:null,sortStable:!1,sortInitialOrder:"asc",sortLocaleCompare:!1,sortReset:!1,sortRestart:!1,emptyTo:"bottom",stringTo:"max",duplicateSpan:!0,textExtraction:"basic",textAttribute:"data-text",textSorter:null,numberSorter:null,initWidgets:!0,widgetClass:"widget-{name}",widgets:[],widgetOptions:{zebra:["even","odd"]},initialized:null,tableClass:"",cssAsc:"",cssDesc:"",cssNone:"",cssHeader:"",cssHeaderRow:"",cssProcessing:"",cssChildRow:"tablesorter-childRow",cssInfoBlock:"tablesorter-infoOnly",cssNoSort:"tablesorter-noSort",cssIgnoreRow:"tablesorter-ignoreRow",cssIcon:"tablesorter-icon",cssIconNone:"",cssIconAsc:"",cssIconDesc:"",cssIconDisabled:"",pointerClick:"click",pointerDown:"mousedown",pointerUp:"mouseup",selectorHeaders:"> thead th, > thead td",selectorSort:"th, td",selectorRemove:".remove-me",debug:!1,headerList:[],empties:{},strings:{},parsers:[],globalize:0,imgAttr:0},css:{table:"tablesorter",cssHasChild:"tablesorter-hasChildRow",childRow:"tablesorter-childRow",colgroup:"tablesorter-colgroup",header:"tablesorter-header",headerRow:"tablesorter-headerRow",headerIn:"tablesorter-header-inner",icon:"tablesorter-icon",processing:"tablesorter-processing",sortAsc:"tablesorter-headerAsc",sortDesc:"tablesorter-headerDesc",sortNone:"tablesorter-headerUnSorted"},language:{sortAsc:"Ascending sort applied, ",sortDesc:"Descending sort applied, ",sortNone:"No sort applied, ",sortDisabled:"sorting is disabled",nextAsc:"activate to apply an ascending sort",nextDesc:"activate to apply a descending sort",nextNone:"activate to remove the sort"},regex:{templateContent:/\{content\}/g,templateIcon:/\{icon\}/g,templateName:/\{name\}/i,spaces:/\s+/g,nonWord:/\W/g,formElements:/(input|select|button|textarea)/i,chunk:/(^([+\-]?(?:\d*)(?:\.\d*)?(?:[eE][+\-]?\d+)?)?$|^0x[0-9a-f]+$|\d+)/gi,chunks:/(^\\0|\\0$)/,hex:/^0x[0-9a-f]+$/i,comma:/,/g,digitNonUS:/[\s|\.]/g,digitNegativeTest:/^\s*\([.\d]+\)/,digitNegativeReplace:/^\s*\(([.\d]+)\)/,digitTest:/^[\-+(]?\d+[)]?$/,digitReplace:/[,.'"\s]/g},string:{max:1,min:-1,emptymin:1,emptymax:-1,zero:0,none:0,"null":0,top:!0,bottom:!1},keyCodes:{enter:13},dates:{},instanceMethods:{},setup:function(t,r){if(t&&t.tHead&&0!==t.tBodies.length&&!0!==t.hasInitialized){var e,o="",s=A(t),a=A.metadata;t.hasInitialized=!1,t.isProcessing=!0,t.config=r,A.data(t,"tablesorter",r),L.debug(r,"core")&&(console[console.group?"group":"log"]("Initializing tablesorter v"+L.version),A.data(t,"startoveralltimer",new Date)),r.supportsDataObject=((e=A.fn.jquery.split("."))[0]=parseInt(e[0],10),1':"",d.$headers=A(A.map(d.$table.find(d.selectorHeaders),function(e,t){var r,o,s,a,n,i=A(e);if(!L.getClosest(i,"tr").hasClass(d.cssIgnoreRow))return/(th|td)/i.test(e.nodeName)||(n=L.getClosest(i,"th, td"),i.attr("data-column",n.attr("data-column"))),r=L.getColumnData(d.table,d.headers,t,!0),d.headerContent[t]=i.html(),""===d.headerTemplate||i.find("."+L.css.headerIn).length||(a=d.headerTemplate.replace(L.regex.templateContent,i.html()).replace(L.regex.templateIcon,i.find("."+L.css.icon).length?"":l),d.onRenderTemplate&&(o=d.onRenderTemplate.apply(i,[t,a]))&&"string"==typeof o&&(a=o),i.html('
'+a+"
")),d.onRenderHeader&&d.onRenderHeader.apply(i,[t,d,d.$table]),s=parseInt(i.attr("data-column"),10),e.column=s,n=L.getOrder(L.getData(i,r,"sortInitialOrder")||d.sortInitialOrder),d.sortVars[s]={count:-1,order:n?d.sortReset?[1,0,2]:[1,0]:d.sortReset?[0,1,2]:[0,1],lockedOrder:!1,sortedBy:""},void 0!==(n=L.getData(i,r,"lockedOrder")||!1)&&!1!==n&&(d.sortVars[s].lockedOrder=!0,d.sortVars[s].order=L.getOrder(n)?[1,1]:[0,0]),d.headerList[t]=e,i.addClass(L.css.header+" "+d.cssHeader),L.getClosest(i,"tr").addClass(L.css.headerRow+" "+d.cssHeaderRow).attr("role","row"),d.tabIndex&&i.attr("tabindex",0),e})),d.$headerIndexed=[],r=0;r'),t=n.$table.width(),s=(o=n.$tbodies.find("tr:first").children(":visible")).length,a=0;a").css("width",r));n.$table.prepend(i)}},getData:function(e,t,r){var o,s,a="",n=A(e);return n.length?(o=!!A.metadata&&n.metadata(),s=" "+(n.attr("class")||""),void 0!==n.data(r)||void 0!==n.data(r.toLowerCase())?a+=n.data(r)||n.data(r.toLowerCase()):o&&void 0!==o[r]?a+=o[r]:t&&void 0!==t[r]?a+=t[r]:" "!==s&&s.match(" "+r+"-")&&(a=s.match(new RegExp("\\s"+r+"-([\\w-]+)"))[1]||""),A.trim(a)):""},getColumnData:function(e,t,r,o,s){if("object"!=typeof t||null===t)return t;var a,n=(e=A(e)[0]).config,i=s||n.$headers,d=n.$headerIndexed&&n.$headerIndexed[r]||i.find('[data-column="'+r+'"]:last');if(void 0!==t[r])return o?t[r]:t[i.index(d)];for(a in t)if("string"==typeof a&&d.filter(a).add(d.find(a)).length)return t[a]},isProcessing:function(e,t,r){var o=(e=A(e))[0].config,s=r||e.find("."+L.css.header);t?(void 0!==r&&0'),A.fn.detach?t.detach():t.remove();var o=A(e).find("colgroup.tablesorter-savemyplace");t.insertAfter(o),o.remove(),e.isProcessing=!1},clearTableBody:function(e){A(e)[0].config.$tbodies.children().detach()},characterEquivalents:{a:"áàâãäąå",A:"ÁÀÂÃÄĄÅ",c:"çćč",C:"ÇĆČ",e:"éèêëěę",E:"ÉÈÊËĚĘ",i:"íìİîïı",I:"ÍÌİÎÏ",o:"óòôõöō",O:"ÓÒÔÕÖŌ",ss:"ß",SS:"ẞ",u:"úùûüů",U:"ÚÙÛÜŮ"},replaceAccents:function(e){var t,r="[",o=L.characterEquivalents;if(!L.characterRegex){for(t in L.characterRegexArray={},o)"string"==typeof t&&(r+=o[t],L.characterRegexArray[t]=new RegExp("["+o[t]+"]","g"));L.characterRegex=new RegExp(r+"]")}if(L.characterRegex.test(e))for(t in o)"string"==typeof t&&(e=e.replace(L.characterRegexArray[t],t));return e},validateOptions:function(e){var t,r,o,s,a="headers sortForce sortList sortAppend widgets".split(" "),n=e.originalSettings;if(n){for(t in L.debug(e,"core")&&(s=new Date),n)if("undefined"===(o=typeof L.defaults[t]))console.warn('Tablesorter Warning! "table.config.'+t+'" option not recognized');else if("object"===o)for(r in n[t])o=L.defaults[t]&&typeof L.defaults[t][r],A.inArray(t,a)<0&&"undefined"===o&&console.warn('Tablesorter Warning! "table.config.'+t+"."+r+'" option not recognized');L.debug(e,"core")&&console.log("validate options time:"+L.benchmark(s))}},restoreHeaders:function(e){var t,r,o=A(e)[0].config,s=o.$table.find(o.selectorHeaders),a=s.length;for(t=0;t tr").children("th, td");!1===t&&0<=A.inArray("uitheme",a.widgets)&&(s.triggerHandler("applyWidgetId",["uitheme"]),s.triggerHandler("applyWidgetId",["zebra"])),n.find("tr").not(i).remove(),o="sortReset update updateRows updateAll updateHeaders updateCell addRows updateComplete sorton appendCache updateCache applyWidgetId applyWidgets refreshWidgets removeWidget destroy mouseup mouseleave "+"keypress sortBegin sortEnd resetToLoadState ".split(" ").join(a.namespace+" "),s.removeData("tablesorter").unbind(o.replace(L.regex.spaces," ")),a.$headers.add(d).removeClass([L.css.header,a.cssHeader,a.cssAsc,a.cssDesc,L.css.sortAsc,L.css.sortDesc,L.css.sortNone].join(" ")).removeAttr("data-column").removeAttr("aria-label").attr("aria-disabled","true"),i.find(a.selectorSort).unbind("mousedown mouseup keypress ".split(" ").join(a.namespace+" ").replace(L.regex.spaces," ")),L.restoreHeaders(e),s.toggleClass(L.css.table+" "+a.tableClass+" tablesorter-"+a.theme,!1===t),s.removeClass(a.namespace.slice(1)),e.hasInitialized=!1,delete e.config.cache,"function"==typeof r&&r(e),L.debug(a,"core")&&console.log("tablesorter has been removed")}}};A.fn.tablesorter=function(t){return this.each(function(){var e=A.extend(!0,{},L.defaults,t,L.instanceMethods);e.originalSettings=t,!this.hasInitialized&&L.buildTable&&"TABLE"!==this.nodeName?L.buildTable(this,e):L.setup(this,e)})},window.console&&window.console.log||(L.logs=[],console={},console.log=console.warn=console.error=console.table=function(){var e=1 Date: Mon, 1 Jan 2024 20:15:42 +0100 Subject: [PATCH 2/6] pass parameters with @_ instead of shift --- website/agenda/planung/assign-series.cgi | 9 +++------ website/agenda/planung/assignments.cgi | 6 ++---- website/agenda/planung/comment.cgi | 13 ++++--------- website/agenda/planung/create-events.cgi | 13 ++++--------- website/agenda/planung/event-history.cgi | 6 ++---- website/agenda/planung/image.cgi | 4 +--- website/agenda/planung/notify-events.cgi | 10 +++------- website/agenda/planung/playout.cgi | 3 +-- website/agenda/planung/pot/de/event.po | 6 +++--- website/agenda/planung/projects.cgi | 15 +++++---------- website/agenda/planung/roles.cgi | 6 ++---- website/agenda/planung/select-event.cgi | 3 +-- website/agenda/planung/select-series.cgi | 3 +-- website/agenda/planung/set-user-day-start.cgi | 3 +-- website/agenda/planung/show-image.cgi | 3 +-- website/agenda/planung/show-playout.cgi | 3 +-- website/agenda/planung/studio-timeslots.cgi | 12 ++++-------- website/agenda/planung/studios.cgi | 9 +++------ website/agenda/planung/user-selected-event.cgi | 4 +--- website/agenda/planung/user-settings.cgi | 9 +++------ website/agenda/planung/user-stats.cgi | 6 ++---- website/agenda/planung/users.cgi | 12 ++++-------- website/agenda/planung/work-time.cgi | 9 +++------ 23 files changed, 55 insertions(+), 112 deletions(-) diff --git a/website/agenda/planung/assign-series.cgi b/website/agenda/planung/assign-series.cgi index 1c60f2e..f9868c5 100755 --- a/website/agenda/planung/assign-series.cgi +++ b/website/agenda/planung/assign-series.cgi @@ -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}; diff --git a/website/agenda/planung/assignments.cgi b/website/agenda/planung/assignments.cgi index 1b12bb3..c6adba1 100755 --- a/website/agenda/planung/assignments.cgi +++ b/website/agenda/planung/assignments.cgi @@ -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}; diff --git a/website/agenda/planung/comment.cgi b/website/agenda/planung/comment.cgi index 315b87c..dfbb92b 100755 --- a/website/agenda/planung/comment.cgi +++ b/website/agenda/planung/comment.cgi @@ -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}; diff --git a/website/agenda/planung/create-events.cgi b/website/agenda/planung/create-events.cgi index 03860d6..bd3e5a0 100755 --- a/website/agenda/planung/create-events.cgi +++ b/website/agenda/planung/create-events.cgi @@ -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}; diff --git a/website/agenda/planung/event-history.cgi b/website/agenda/planung/event-history.cgi index 57d5c35..f315e92 100755 --- a/website/agenda/planung/event-history.cgi +++ b/website/agenda/planung/event-history.cgi @@ -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}; diff --git a/website/agenda/planung/image.cgi b/website/agenda/planung/image.cgi index 5957f11..fb58b09 100755 --- a/website/agenda/planung/image.cgi +++ b/website/agenda/planung/image.cgi @@ -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}; diff --git a/website/agenda/planung/notify-events.cgi b/website/agenda/planung/notify-events.cgi index d9cfa7a..4e01d02 100755 --- a/website/agenda/planung/notify-events.cgi +++ b/website/agenda/planung/notify-events.cgi @@ -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, diff --git a/website/agenda/planung/playout.cgi b/website/agenda/planung/playout.cgi index 9d123f5..170e88a 100755 --- a/website/agenda/planung/playout.cgi +++ b/website/agenda/planung/playout.cgi @@ -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}; diff --git a/website/agenda/planung/pot/de/event.po b/website/agenda/planung/pot/de/event.po index 4b160fe..330ca90 100644 --- a/website/agenda/planung/pot/de/event.po +++ b/website/agenda/planung/pot/de/event.po @@ -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" diff --git a/website/agenda/planung/projects.cgi b/website/agenda/planung/projects.cgi index 2db400f..304836f 100755 --- a/website/agenda/planung/projects.cgi +++ b/website/agenda/planung/projects.cgi @@ -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}; diff --git a/website/agenda/planung/roles.cgi b/website/agenda/planung/roles.cgi index ba02fb1..9b187dd 100755 --- a/website/agenda/planung/roles.cgi +++ b/website/agenda/planung/roles.cgi @@ -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}; diff --git a/website/agenda/planung/select-event.cgi b/website/agenda/planung/select-event.cgi index 2ef481d..9bed4f0 100755 --- a/website/agenda/planung/select-event.cgi +++ b/website/agenda/planung/select-event.cgi @@ -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}; diff --git a/website/agenda/planung/select-series.cgi b/website/agenda/planung/select-series.cgi index 56ef2a3..68d9db8 100755 --- a/website/agenda/planung/select-series.cgi +++ b/website/agenda/planung/select-series.cgi @@ -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}; diff --git a/website/agenda/planung/set-user-day-start.cgi b/website/agenda/planung/set-user-day-start.cgi index 0d5bacb..53b9a06 100644 --- a/website/agenda/planung/set-user-day-start.cgi +++ b/website/agenda/planung/set-user-day-start.cgi @@ -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}; diff --git a/website/agenda/planung/show-image.cgi b/website/agenda/planung/show-image.cgi index 1870773..ecef0e3 100755 --- a/website/agenda/planung/show-image.cgi +++ b/website/agenda/planung/show-image.cgi @@ -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}; diff --git a/website/agenda/planung/show-playout.cgi b/website/agenda/planung/show-playout.cgi index 4d617a6..afb8482 100755 --- a/website/agenda/planung/show-playout.cgi +++ b/website/agenda/planung/show-playout.cgi @@ -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}; diff --git a/website/agenda/planung/studio-timeslots.cgi b/website/agenda/planung/studio-timeslots.cgi index 91cf393..38981ce 100755 --- a/website/agenda/planung/studio-timeslots.cgi +++ b/website/agenda/planung/studio-timeslots.cgi @@ -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; diff --git a/website/agenda/planung/studios.cgi b/website/agenda/planung/studios.cgi index 9017967..021cda8 100755 --- a/website/agenda/planung/studios.cgi +++ b/website/agenda/planung/studios.cgi @@ -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}; diff --git a/website/agenda/planung/user-selected-event.cgi b/website/agenda/planung/user-selected-event.cgi index 2a301cd..cdac151 100644 --- a/website/agenda/planung/user-selected-event.cgi +++ b/website/agenda/planung/user-selected-event.cgi @@ -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}; diff --git a/website/agenda/planung/user-settings.cgi b/website/agenda/planung/user-settings.cgi index d123ae8..f04643a 100755 --- a/website/agenda/planung/user-settings.cgi +++ b/website/agenda/planung/user-settings.cgi @@ -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}; diff --git a/website/agenda/planung/user-stats.cgi b/website/agenda/planung/user-stats.cgi index ca26920..58acb39 100755 --- a/website/agenda/planung/user-stats.cgi +++ b/website/agenda/planung/user-stats.cgi @@ -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}; diff --git a/website/agenda/planung/users.cgi b/website/agenda/planung/users.cgi index e25d6ac..c1eaef7 100755 --- a/website/agenda/planung/users.cgi +++ b/website/agenda/planung/users.cgi @@ -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 ) { diff --git a/website/agenda/planung/work-time.cgi b/website/agenda/planung/work-time.cgi index fee2fba..b1eca56 100755 --- a/website/agenda/planung/work-time.cgi +++ b/website/agenda/planung/work-time.cgi @@ -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; From cb068a857861ea11eefafd38b8d17417c8337b97 Mon Sep 17 00:00:00 2001 From: Milan Date: Mon, 1 Jan 2024 20:10:44 +0100 Subject: [PATCH 3/6] user-settings: separate css and js --- website/agenda/planung/css/user-settings.css | 5 +++ website/agenda/planung/js/user-settings.js | 30 ++++++++++++++ .../planung/templates/user-settings.html | 41 ------------------- 3 files changed, 35 insertions(+), 41 deletions(-) create mode 100644 website/agenda/planung/css/user-settings.css create mode 100644 website/agenda/planung/js/user-settings.js diff --git a/website/agenda/planung/css/user-settings.css b/website/agenda/planung/css/user-settings.css new file mode 100644 index 0000000..340f406 --- /dev/null +++ b/website/agenda/planung/css/user-settings.css @@ -0,0 +1,5 @@ +div.col { + float: left; + width: 2rem; + height: 2rem; +} diff --git a/website/agenda/planung/js/user-settings.js b/website/agenda/planung/js/user-settings.js new file mode 100644 index 0000000..f2e2077 --- /dev/null +++ b/website/agenda/planung/js/user-settings.js @@ -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 += '
'; + } + content += '
' + + $("#colors").html(content); + $("#colors div.col").click(function() { + var color = $(this).attr("value"); + $('#' + selectedId).css('background', color); + $('#' + selectedId).attr('value', color); + }); +} diff --git a/website/agenda/planung/templates/user-settings.html b/website/agenda/planung/templates/user-settings.html index ce15608..72f6e35 100644 --- a/website/agenda/planung/templates/user-settings.html +++ b/website/agenda/planung/templates/user-settings.html @@ -1,44 +1,3 @@ - - - -

From 8923c668a66e2ae4fef6e0756d250f81d928dcbe Mon Sep 17 00:00:00 2001 From: Milan Date: Sat, 16 Dec 2023 13:26:20 +0100 Subject: [PATCH 4/6] forms layout - small labels --- website/agenda/planung/css/default.css | 13 ++++++++++--- website/agenda/planung/css/event.css | 4 ---- website/agenda/planung/css/series.css | 7 ++++++- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/website/agenda/planung/css/default.css b/website/agenda/planung/css/default.css index 4d0ac27..18c7de2 100644 --- a/website/agenda/planung/css/default.css +++ b/website/agenda/planung/css/default.css @@ -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 { diff --git a/website/agenda/planung/css/event.css b/website/agenda/planung/css/event.css index 1d0118c..4171a2b 100644 --- a/website/agenda/planung/css/event.css +++ b/website/agenda/planung/css/event.css @@ -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; diff --git a/website/agenda/planung/css/series.css b/website/agenda/planung/css/series.css index 0536cf0..c76e5c8 100644 --- a/website/agenda/planung/css/series.css +++ b/website/agenda/planung/css/series.css @@ -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; } From a85eae84d513e71a398f454f1331976e87a24ae7 Mon Sep 17 00:00:00 2001 From: Milan Date: Tue, 26 Mar 2024 21:39:36 +0100 Subject: [PATCH 5/6] fixup! help-texts: add --- website/agenda/planung/help-texts.cgi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/website/agenda/planung/help-texts.cgi b/website/agenda/planung/help-texts.cgi index b1c19aa..777217f 100644 --- a/website/agenda/planung/help-texts.cgi +++ b/website/agenda/planung/help-texts.cgi @@ -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; From fa67921d984933ea9168cd2d7fff545bf5c7226e Mon Sep 17 00:00:00 2001 From: Milan Date: Tue, 26 Mar 2024 22:23:41 +0100 Subject: [PATCH 6/6] fixup! event.cgi -> broadcast.cgi --- website/agenda/planung/pot/de/image.po | 6 ++++++ website/agenda/planung/pot/en/image.po | 6 ++++++ website/agenda/planung/templates/edit-event.html | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/website/agenda/planung/pot/de/image.po b/website/agenda/planung/pot/de/image.po index 806ec85..1d6e15f 100644 --- a/website/agenda/planung/pot/de/image.po +++ b/website/agenda/planung/pot/de/image.po @@ -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." diff --git a/website/agenda/planung/pot/en/image.po b/website/agenda/planung/pot/en/image.po index 35de737..60a1efb 100644 --- a/website/agenda/planung/pot/en/image.po +++ b/website/agenda/planung/pot/en/image.po @@ -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" diff --git a/website/agenda/planung/templates/edit-event.html b/website/agenda/planung/templates/edit-event.html index 99a19d4..2adb44b 100644 --- a/website/agenda/planung/templates/edit-event.html +++ b/website/agenda/planung/templates/edit-event.html @@ -483,7 +483,7 @@ -