Attachment #50603 for bug #16281

View | Details | Raw Unified | Return to bug 16281
Collapse All | Expand All

Lines 27-33 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc (-1 / +7 lines)
27		27
28	[% IF ( CAN_user_reports_create_reports ) %]	28	[% IF ( CAN_user_reports_create_reports ) %]
29	<div class="btn-group">	29	<div class="btn-group">
30	<a class="confirmdelete btn btn-small" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id %]&phase=Delete%20Saved" onclick="return confirm(MSG_CONFIRM_DELETE);">	30	<a class="delete btn btn-small" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id %]&phase=Delete%20Saved">
31	<i class="fa fa-remove"></i> Delete	31	<i class="fa fa-remove"></i> Delete
32	</a>	32	</a>
33	</div>	33	</div>
Lines 50-53 Link Here
50		50
51	<script type="text/javascript">	51	<script type="text/javascript">
52	var MSG_CONFIRM_DELETE = _("Are you sure you want to delete this report? This cannot be undone.");	52	var MSG_CONFIRM_DELETE = _("Are you sure you want to delete this report? This cannot be undone.");
		53
		54	$(document).ready(function(){
		55	$(".delete").on("click",function(){
		56	return confirmDelete(MSG_CONFIRM_DELETE);
		57	});
		58	});
53	</script>	59	</script>

Lines 5-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt (-1 / +8 lines)
5	<style type="text/css">fieldset.rows table { clear: none; margin: 0;}</style>	5	<style type="text/css">fieldset.rows table { clear: none; margin: 0;}</style>
6	<script type="text/javascript">	6	<script type="text/javascript">
7	var MSG_CONFIRM_DELETE = _("Are you sure you want to delete this dictionary definition? This cannot be undone.");	7	var MSG_CONFIRM_DELETE = _("Are you sure you want to delete this dictionary definition? This cannot be undone.");
		8
		9	$(document).ready(function(){
		10	$("#delete").on("click",function(){
		11	return confirmDelete(MSG_CONFIRM_DELETE);
		12	});
		13	});
		14
8	</script>	15	</script>
9	</head>	16	</head>
10	<body id="rep_dictionary" class="rep">	17	<body id="rep_dictionary" class="rep">
Lines 82-88 var MSG_CONFIRM_DELETE = _("Are you sure you want to delete this dictionary defi Link Here
82	<td class="actions"><form method="post" action="/cgi-bin/koha/reports/dictionary.pl">	89	<td class="actions"><form method="post" action="/cgi-bin/koha/reports/dictionary.pl">
83	<input type="hidden" name="id" value="[% definition.id %]" />	90	<input type="hidden" name="id" value="[% definition.id %]" />
84	<input type="hidden" name="phase" value="Delete Definition" />	91	<input type="hidden" name="phase" value="Delete Definition" />
85	<button type="submit" name="submit" class="btn btn-mini" onclick="return confirm(MSG_CONFIRM_DELETE);"><i class="fa fa-trash"></i> Delete</button>	92	<button type="submit" name="submit" class="btn btn-mini" id="delete"><i class="fa fa-trash"></i> Delete</button>
86	</form></td>	93	</form></td>
87	</tr>	94	</tr>
88	[% END %]	95	[% END %]





$(document).ready(function(){

$(".goback").on("click",function(){
    window.history.back();
});

$("#addColumn").on("click",function(){
    addColumn();
});

$("#delColumn").on("click",function(){
    delColumn();
});

[% IF (saved1) %]
    var rtable = $("#table_reports").dataTable($.extend(true, {}, dataTablesDefaults, {
        'bAutoWidth': false,


<fieldset class="action">
    <input type="hidden" name="phase" value="Choose this type" />
    <input type="button" name="back" value="&lt;&lt; Back" class="goback" />
    <input type="submit" name="submit" value="Next &gt;&gt;" />
</fieldset>
</form>

[% END %]
</optgroup>
</select></div>
<div style="width: 6.3em; float: right; margin-top: 100px"><input type="button" name="Add" value="Add" class="button" style="width:6em;" id="addColumn" /><br />
<input type="button" name="delete" value="&lt;&lt; Delete" class="button" style="width: 6em; margin: 1em 0;" id="delColumn" /></div>
</div>

<div class="yui-u">

<div class="yui-g">
<fieldset class="action">
    <input type="hidden" name="phase" value="Choose these columns" />
    <input type="button" name="back" value="&lt;&lt; Back" class="goback" />
    <input type="submit" name="submit" value="Next &gt;&gt;" />
</fieldset>
</div>

[% END %]

<fieldset class="action"><input type="hidden" name="phase" value="Choose these criteria" />
    <input type="button" name="back" value="&lt;&lt; Back" class="goback" />
    <input type="submit" name="submit" value="Next &gt;&gt;" /> </fieldset>
</form>
[% END %]

</table></fieldset>

<fieldset class="action"><input type="hidden" name="phase" value="Choose these operations" />
    <input type="button" name="back" value="&lt;&lt; Back" class="goback" />
    <input type="submit" name="submit" value="Next &gt;&gt;" /></fieldset>
</form>
[% END %]

        </form>
        <!-- Go back to editing -->
        <form action='/cgi-bin/koha/reports/guided_reports.pl'>
            <button type="button" class="new goback"><i class="fa fa-fw fa-pencil"></i> Edit SQL</button>
        </form>
    </div>
[% END %]

    [% ELSE %]
    [% END %]
    <div id="onerror_actions">
        <a class="button goback">Return to previous page</a>
    </div>
[% END %]
</div>
- 

Return to bug 16281

Lines 68-73 function load_group_subgroups () { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt (-9 / +20 lines)
68		68
69	$(document).ready(function(){	69	$(document).ready(function(){
70		70
		71	$(".goback").on("click",function(){
		72	window.history.back();
		73	});
		74
		75	$("#addColumn").on("click",function(){
		76	addColumn();
		77	});
		78
		79	$("#delColumn").on("click",function(){
		80	delColumn();
		81	});
		82
71	[% IF (saved1) %]	83	[% IF (saved1) %]
72	var rtable = $("#table_reports").dataTable($.extend(true, {}, dataTablesDefaults, {	84	var rtable = $("#table_reports").dataTable($.extend(true, {}, dataTablesDefaults, {
73	'bAutoWidth': false,	85	'bAutoWidth': false,
Lines 466-472 canned reports and writing custom SQL reports.</p> Link Here
466		478
467	<fieldset class="action">	479	<fieldset class="action">
468	<input type="hidden" name="phase" value="Choose this type" />	480	<input type="hidden" name="phase" value="Choose this type" />
469	<input type="button" name="back" value="<< Back" onclick="javascript:history.back()" />	481	<input type="button" name="back" value="<< Back" class="goback" />
470	<input type="submit" name="submit" value="Next >>" />	482	<input type="submit" name="submit" value="Next >>" />
471	</fieldset>	483	</fieldset>
472	</form>	484	</form>
Lines 514-521 canned reports and writing custom SQL reports.</p> Link Here
514	[% END %]	526	[% END %]
515	</optgroup>	527	</optgroup>
516	</select></div>	528	</select></div>
517	<div style="width: 6.3em; float: right; margin-top: 100px"><input type="button" name="Add" value="Add" class="button" style="width:6em;" onclick="addColumn()" /><br />	529	<div style="width: 6.3em; float: right; margin-top: 100px"><input type="button" name="Add" value="Add" class="button" style="width:6em;" id="addColumn" /><br />
518	<input type="button" name="delete" value="<< Delete" class="button" style="width: 6em; margin: 1em 0;" onclick="delColumn()" /></div>	530	<input type="button" name="delete" value="<< Delete" class="button" style="width: 6em; margin: 1em 0;" id="delColumn" /></div>
519	</div>	531	</div>
520		532
521	<div class="yui-u">	533	<div class="yui-u">
Lines 526-532 canned reports and writing custom SQL reports.</p> Link Here
526	<div class="yui-g">	538	<div class="yui-g">
527	<fieldset class="action">	539	<fieldset class="action">
528	<input type="hidden" name="phase" value="Choose these columns" />	540	<input type="hidden" name="phase" value="Choose these columns" />
529	<input type="button" name="back" value="<< Back" onclick="javascript:history.back()" />	541	<input type="button" name="back" value="<< Back" class="goback" />
530	<input type="submit" name="submit" value="Next >>" />	542	<input type="submit" name="submit" value="Next >>" />
531	</fieldset>	543	</fieldset>
532	</div>	544	</div>
Lines 599-605 canned reports and writing custom SQL reports.</p> Link Here
599	[% END %]	611	[% END %]
600		612
601	<fieldset class="action"><input type="hidden" name="phase" value="Choose these criteria" />	613	<fieldset class="action"><input type="hidden" name="phase" value="Choose these criteria" />
602	<input type="button" name="back" value="<< Back" onclick="javascript:history.back()" />	614	<input type="button" name="back" value="<< Back" class="goback" />
603	<input type="submit" name="submit" value="Next >>" /> </fieldset>	615	<input type="submit" name="submit" value="Next >>" /> </fieldset>
604	</form>	616	</form>
605	[% END %]	617	[% END %]
Lines 631-637 canned reports and writing custom SQL reports.</p> Link Here
631	</table></fieldset>	643	</table></fieldset>
632		644
633	<fieldset class="action"><input type="hidden" name="phase" value="Choose these operations" />	645	<fieldset class="action"><input type="hidden" name="phase" value="Choose these operations" />
634	<input type="button" name="back" value="<< Back" onclick="javascript:history.back()" />	646	<input type="button" name="back" value="<< Back" class="goback" />
635	<input type="submit" name="submit" value="Next >>" /></fieldset>	647	<input type="submit" name="submit" value="Next >>" /></fieldset>
636	</form>	648	</form>
637	[% END %]	649	[% END %]
Lines 738-744 canned reports and writing custom SQL reports.</p> Link Here
738	</form>	750	</form>
739	<!-- Go back to editing -->	751	<!-- Go back to editing -->
740	<form action='/cgi-bin/koha/reports/guided_reports.pl'>	752	<form action='/cgi-bin/koha/reports/guided_reports.pl'>
741	<button type="button" class="new" onclick="history.back()"><i class="fa fa-fw fa-pencil"></i> Edit SQL</button>	753	<button type="button" class="new goback"><i class="fa fa-fw fa-pencil"></i> Edit SQL</button>
742	</form>	754	</form>
743	</div>	755	</div>
744	[% END %]	756	[% END %]
Lines 1005-1011 Sub report:<select name="subreport"> Link Here
1005	[% ELSE %]	1017	[% ELSE %]
1006	[% END %]	1018	[% END %]
1007	<div id="onerror_actions">	1019	<div id="onerror_actions">
1008	<a href="javascript:window.history.back()" class="button">Return to previous page</a>	1020	<a class="button goback">Return to previous page</a>
1009	</div>	1021	</div>
1010	[% END %]	1022	[% END %]
1011	</div>	1023	</div>
1012	-