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

add user password reset, add series image switch, add image licences, redesign exclude filters

Browse Source
This commit is contained in:
Milan
2018-03-17 13:14:13 +01:00
parent b3f743dee9
commit aadf3fd06e
48 changed files with 1329 additions and 667 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
website/agenda/planung/templates/default.html
View File

@@ -37,6 +37,10 @@
<div> <a href="projects.cgi?project_id=<TMPL_VAR project_id>&studio_id=<TMPL_VAR default_studio_id>"><TMPL_VAR .loc.projects></a> </div>
</TMPL_IF>
<TMPL_IF .allow.update_image_others>
<div> <a href="image.cgi?project_id=<TMPL_VAR project_id>&studio_id=<TMPL_VAR default_studio_id>"><TMPL_VAR .loc.images></a> </div>
</TMPL_IF>
<TMPL_IF .allow.scan_series_events>
<div> <a href="assignments.cgi?project_id=<TMPL_VAR project_id>&studio_id=<TMPL_VAR default_studio_id>"><TMPL_VAR .loc.import></a> </div>
</TMPL_IF>

6
website/agenda/planung/templates/edit_event.html
View File

@@ -384,7 +384,7 @@
<tr>
<td class="label">description</td>
<td>
<img src="<TMPL_VAR image>" style="float:right;padding-left:1em">
<img style="float:right;padding-left:1em" src="showImage.cgi?project_id=<TMPL_VAR project_id>&studioId=<TMPL_VAR .studio_id>&type=icon&filename=<TMPL_VAR image>">
<div><TMPL_VAR topic</div>
<div><TMPL_VAR html_content escape=0></div>
</td>
@@ -452,9 +452,11 @@
<button onclick="selectImage('<TMPL_VAR .project_id>','<TMPL_VAR .studio_id>','image_<TMPL_VAR event_id>','<TMPL_VAR series_name escape=HTML>','<TMPL_VAR image ESCAPE=url>','<TMPL_VAR series_id>');return false;"
style="padding:0;"
>
<img id="imagePreview" src="<TMPL_VAR image>">
<img id="imagePreview" src="showImage.cgi?project_id=<TMPL_VAR project_id>&studioId=<TMPL_VAR studio_id>&filename=<TMPL_VAR image>&type=icon">
</button>
<input id="image_<TMPL_VAR event_id>" name="image" value="<TMPL_VAR image>" class="image" style="float:right" placeholder="<TMPL_VAR .loc.label_image>">
<input type="hidden" name="series_image" value="<TMPL_VAR series_image>" >
<!--(series_image:<TMPL_VAR series_image>,image=<TMPL_VAR image>)-->
</TMPL_IF>
</td>
</tr>

4
website/agenda/planung/templates/edit_series.html
View File

@@ -136,7 +136,7 @@
<button onclick="selectImage('<TMPL_VAR .project_id>','<TMPL_VAR .studio_id>','image_<TMPL_VAR .series_id>','<TMPL_VAR series_name escape=HTML>','<TMPL_VAR image escape=URL>','<TMPL_VAR series_id>');return false;"
style="padding:0;float:left"
>
<img id="imagePreview" src="<TMPL_VAR image>">
<img id="imagePreview" src="showImage.cgi?project_id=<TMPL_VAR .project_id>&studioId=<TMPL_VAR .studio_id>&filename=<TMPL_VAR image>&type=icon">
</button>
<input id="image_<TMPL_VAR .series_id>" name="image" value="<TMPL_VAR image>" class="image" placeholder="<TMPL_VAR .loc.template_image>">
</TMPL_IF>
@@ -444,7 +444,7 @@
<TMPL_LOOP events>
<tr id="event_<TMPL_VAR event_id>">
<TMPL_IF .allow.read_image>
<td class="logo"><img src="<TMPL_VAR image>" width="33" height="33"></td>
<td class="logo"><img width="33" height="33" src="showImage.cgi?project_id=<TMPL_VAR project_id>&studioId=<TMPL_VAR .studio_id>&type=icon&filename=<TMPL_VAR image>"></td>
</TMPL_IF>
<td class="weekday"><TMPL_VAR weekday_short_name></td>
<td class="date"><TMPL_VAR start_date></td>

4
website/agenda/planung/templates/image.html
View File

@@ -20,7 +20,7 @@
$("#image-tabs").tabs({
activate: function(event, ui){
if (ui==null) return;
selectedImageTab=getSelectedTab('image-tabs');
selectedImageTab = getSelectedTab('image-tabs');
<TMPL_IF .allow.create_image>
if(selectedImageTab=="upload"){
@@ -100,7 +100,7 @@
<TMPL_LOOP images>
<div class="image"
id="img_<TMPL_VAR id>"
style="background-image:url('<TMPL_VAR thumb_url>')"
style="background-image:url('showImage.cgi?project_id=<TMPL_VAR project_id>&studioId=<TMPL_VAR .studio_id>&type=icon&filename=<TMPL_VAR filename>')"
title="<TMPL_VAR description>"
onclick="imageAction('<TMPL_VAR filename>');return false;"
>

59
website/agenda/planung/templates/image_edit.html
View File

@@ -2,11 +2,51 @@
<head>
<link type="text/css" href="css/admin.css" rel="stylesheet"/>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<script>
function updateCheckBox(selector, value){
$(selector).attr('value', value)
if (value==1){
$(selector).prop( "checked", true );
} else {
$(selector).prop( "checked", false );
}
}
function updatePublicCheckbox(elem){
console.log(elem.prop('checked'))
if (elem.prop('checked')){
console.log( 'set public' );
updateCheckBox(elem, 1);
}else{
console.log( 'unset public' );
updateCheckBox(elem, 0);
}
}
$(document).ready(
function(){
var publicCheckbox=$("#img_editor input[name='public']");
updatePublicCheckbox( publicCheckbox );
publicCheckbox.change(
function(){
updatePublicCheckbox($(this));
}
)
console.log("image handler initialized");
}
);
</script>
</head>
<body>
<TMPL_LOOP images>
<form id="save_img_<TMPL_VAR id>"
method="post" action="image.cgi"
method="post"
action="image.cgi"
onsubmit="saveImage('<TMPL_VAR id>','<TMPL_VAR filename>');return false;"
style="float:left"
>
@@ -15,9 +55,10 @@
<table>
<tr>
<td rowspan="5"><a href="<TMPL_VAR image_url>" onclick="showImage('<TMPL_VAR image_url>');return false;"><img src="<TMPL_VAR thumb_url>" /></a></td>
<td><TMPL_VAR .loc.label_name></td>
<td><input value="<TMPL_VAR name escape=0>" name="update_name" class="field"></td>
<td rowspan="99"><a href="<TMPL_VAR image_url>" onclick="showImage('<TMPL_VAR image_url>');return false;"
><img src="showImage.cgi?project_id=<TMPL_VAR project_id>&studioId=<TMPL_VAR .studio_id>&type=icon&filename=<TMPL_VAR filename>" /></a></td>
</tr>
<tr>
<td><TMPL_VAR .loc.label_description></td>
@@ -33,21 +74,25 @@
</tr>
<tr>
<td><TMPL_VAR .loc.label_editor_link></td>
<td><input value="{{thumbs/<TMPL_VAR filename escape=0>|<TMPL_VAR name>}}" class="field"/></td>
<td><input value="{{<TMPL_VAR filename escape=0>|<TMPL_VAR name>}}" class="field" /></td>
</tr>
<tr>
<td><TMPL_VAR .loc.label_author>/<TMPL_VAR .loc.label_licence></td>
<td><input name="licence" value="<TMPL_VAR licence>" class="field<TMPL_IF missing_licence> error</TMPL_IF>" placeholder="<TMPL_VAR .loc.label_licence_missing>"/></td>
</tr>
<tr>
<td><TMPL_VAR .loc.label_public></td>
<td><input type="checkbox" name="public" <TMPL_IF public>checked="checked" value="1"<TMPL_ELSE>value="0"</TMPL_IF> /></td>
</tr>
<tr>
<td />
<td>
<TMPL_IF name="update_image">
<input type="hidden" name="project_id" value="<TMPL_VAR .project_id>">
<input type="hidden" name="studio_id" value="<TMPL_VAR .studio_id>" />
<input type="hidden" name="save_image" value="<TMPL_VAR filename escape=0>" />
<button onclick="this.submit"><TMPL_VAR .loc.button_save></button/>
</TMPL_IF>
<TMPL_IF name="delete_image">
<input type="hidden" name="project_id" value="<TMPL_VAR .project_id>">
<input type="hidden" name="studio_id" value="<TMPL_VAR .studio_id>" />
<button onclick="askDeleteImage('img_<TMPL_VAR id escape=0>','<TMPL_VAR filename escape=0>');return false;"><TMPL_VAR .loc.button_delete></button>
</TMPL_IF>
</td>

2
website/agenda/planung/templates/image_single.html
View File

@@ -1,5 +1,3 @@
Content-type:text/html; charset=UTF-8;
<html>
<body>
<TMPL_LOOP images>

163
website/agenda/planung/templates/notify_event.html
View File

@@ -1,163 +0,0 @@
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title><TMPL_VAR .doc.title></title>
<script src="js/page_leave_handler.js" type="text/javascript"></script>
<style>
.mailHeader{
background:#ccc;
}
.mailSubject{
border-bottom:2px solid #ccc;
}
.mailBody{
white-space:pre;
border-top:2px solid #ccc;
}
.done{
background:#cfc;
}
table#events td:nth-of-type(1){
width:15em;
}
table#events td:nth-of-type(2){
width:60em;
}
td.action, input.action{
width:5em;
}
form input{
width:50em;
}
form textarea{
width:50em;
height:14em;
}
</style>
<script>
var region='<TMPL_VAR loc.region>';
var event_id='<TMPL_VAR event_id>';
var selectImageId='';
<TMPL_IF .event_edited>
$(document).ready(
function(){
if ($('div.error').length>0) return;
if(comeFromCalendar()) getBack();
}
);
</TMPL_IF>
$(document).ready(
function(){
$("#forms form").submit(
function( event ) {
event.preventDefault();
var $form = $( this );
var posting = $.post("notify_events.cgi", $form.serialize());
posting.done(
function( data ) {
var content = $( data ).find( "#content" );
$('#result').html(content);
var formId=$form.attr('id');
$('#'+formId+" .mailHeader").addClass("done");
}
);
}
);
}
);
</script>
</head>
<body>
<div id="result" style="display:none"> </div>
<div id="forms">
<TMPL_LOOP events>
<form id="event_<TMPL_VAR event_id>">
<input type="hidden" name="project_id" value="<TMPL_VAR project_id>">
<input type="hidden" name="studio_id" value="<TMPL_VAR studio_id>">
<input type="hidden" name="series_id" value="<TMPL_VAR series_id>">
<input type="hidden" name="event_id" value="<TMPL_VAR event_id>">
<input type="hidden" name="action" value="send">
<table id="events">
<tr id="header_<TMPL_VAR event_id>" class="mailHeader">
<td><b><TMPL_VAR start></b></td>
<td><b><TMPL_VAR full_title></b> | <TMPL_IF live>live</TMPL_IF> <TMPL_IF preproduction>preproduction</TMPL_IF> <TMPL_IF playout>playout</TMPL_IF></td>
<TMPL_IF noRecipient>
<td></td>
</tr>
<tr>
<td>Warning</td>
<td><div class="error">no recipient configured at series!</div></td>
</tr>
<TMPL_ELSE>
<td class="action"><input class="button" type="submit" name="action" value="send"></td>
</tr>
<TMPL_IF mail.Subject>
<tr>
<td>Subject</td>
<td class="mailSubject"><input name="subject" value="<TMPL_VAR mail.Subject>"></td>
</tr>
</TMPL_IF>
<TMPL_IF mail.To>
<tr>
<td>To</td>
<td><input name="to" value="<TMPL_VAR mail.To>"></td>
</tr>
</TMPL_IF>
<TMPL_IF mail.From>
<tr>
<td>From</td>
<td><TMPL_VAR mail.From></td>
</tr>
</TMPL_IF>
<TMPL_IF mail.Cc>
<tr>
<td>Cc</td>
<td><input name="cc" value="<TMPL_VAR mail.Cc>"></td>
</tr>
</TMPL_IF>
<TMPL_IF mail.Reply-To>
<tr>
<td>Reply-To</td>
<td><TMPL_VAR mail.Reply-To></td>
</tr>
</TMPL_IF>
<TMPL_IF mail.data>
<tr>
<td>Content</td>
<td class="mailBody"><textarea name="content" ><TMPL_VAR mail.data></textarea></td>
</tr>
</TMPL_IF>
</TMPL_IF>
</table>
</form>
</TMPL_LOOP>
</div>
</body>
</html>

5
website/agenda/planung/templates/series.html
View File

@@ -12,8 +12,9 @@ var region='<TMPL_VAR loc.region>';
<button onclick="add_series('<TMPL_VAR series_name>')"><TMPL_VAR .loc.button_add_series></button>
<div id="edit_new" class="editor" style="display:none;clear:both">
<form method="post" action="series.cgi">
<input type="hidden" name="project_id" value="<TMPL_VAR project_id>">
<input type="hidden" name="studio_id" value="<TMPL_VAR studio_id>">
<input type="hidden" name="project_id" value="<TMPL_VAR .project_id>">
<input type="hidden" name="studio_id" value="<TMPL_VAR .studio_id>">
<input type="hidden" name="image" value="<TMPL_VAR .image>">
<div class="formField">
<div class="label"><TMPL_VAR .loc.label_name></div>