Correction to include in bookfund.tmpl; Formatting input form in systempreferences.tmpl; Tweaking markup and formatting of guided reports interface.

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
This commit is contained in:
Owen Leonard 2007-11-04 16:23:53 -06:00 committed by Joshua Ferraro
parent ed69b3486f
commit e04586d2f6
7 changed files with 117 additions and 96 deletions

View file

@ -51,6 +51,10 @@ h6 {
font-weight : bold;
}
h1,h2,h3,h4,h5,h6 {
margin : .3em 0;
}
p {
margin: .5em 0 .5em 0;
}
@ -542,6 +546,14 @@ fieldset.rows label, fieldset.rows span.label {
text-align: right;
}
.yui-b fieldset.rows label, .yui-b fieldset.rows span.label {
width: 9em;
}
.yui-u fieldset.rows label, .yui-u fieldset.rows span.label {
width: 6em;
}
fieldset.rows.left label, fieldset.rows.left span.label {
width : 8em;
text-align : left;

View file

@ -0,0 +1,10 @@
<h5>Build and Run Reports</h5>
<ul>
<li><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build new">Build New</a></li>
<li><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Used saved">Use Saved</a></li>
<li><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create report from SQL">Create from SQL</a></li>
</ul>
<h5>Reports Dictionary</h5>
<ul>
<li><a href="/cgi-bin/koha/reports/dictionary.pl?phase=View Dictionary">View Dictionary</a></li>
</ul>

View file

@ -58,7 +58,7 @@
</div>
</div>
<div class="yui-b">
<!-- TMPL_INCLUDE NAME="labels-menu.inc" -->
<!-- TMPL_INCLUDE NAME="acquisitions-menu.inc" -->
</div>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

View file

@ -76,19 +76,18 @@
<!-- TMPL_IF NAME="add_form" -->
<!-- TMPL_IF NAME="modify" -->
<h1>Modify a system preference</h1>
<!-- TMPL_ELSE -->
<h1>Add a system preference</h1>
<!-- /TMPL_IF -->
<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
<table>
<tr><td><label for="explanation">Explanation: </label></td><td><input type="text" name="explanation" id="explanation" size="60" value="<!-- TMPL_VAR NAME="explanation" escape="HTML" -->" /><input type="hidden" name="op" value="add_validate" /></td></tr>
<tr><!-- TMPL_IF NAME="searchfield" --><td><label>Variable</label></td><td><!-- TMPL_VAR NAME="searchfield" --><input type="hidden" name="variable" value="<!-- TMPL_VAR NAME="searchfield" -->"></td>
<!-- TMPL_ELSE --><td><label for="variable">Variable</label></td><td><input type="text" name="variable" id="variable" size="60" /></td><!-- /TMPL_IF --></tr>
<tr><td><label for="value">Value</label></td><td><!-- TMPL_IF NAME="type-free" -->
<fieldset class="rows"><legend><!-- TMPL_IF NAME="modify" -->
Modify a system preference
<!-- TMPL_ELSE -->
Add a system preference
<!-- /TMPL_IF --></legend><ol>
<li><label for="explanation">Explanation: </label><input type="text" name="explanation" id="explanation" size="60" value="<!-- TMPL_VAR NAME="explanation" escape="HTML" -->" /><input type="hidden" name="op" value="add_validate" /></li>
<li><!-- TMPL_IF NAME="searchfield" --><td><label>Variable</label><!-- TMPL_VAR NAME="searchfield" --><input type="hidden" name="variable" value="<!-- TMPL_VAR NAME="searchfield" -->">
<!-- TMPL_ELSE --><td><label for="variable">Variable</label><input type="text" name="variable" id="variable" size="60" /><!-- /TMPL_IF --></li>
<li><label for="value">Value</label><!-- TMPL_IF NAME="type-free" -->
<textarea id="value" name="value" cols="<!-- TMPL_VAR NAME="fieldlength" -->"><!-- TMPL_VAR NAME="value" escape="HTML" --></textarea>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="type-textarea" -->
@ -110,16 +109,21 @@
<input type="radio" name="value" id="value" value="1" checked="checked"><!-- TMPL_ELSE --><input type="radio" name="value" id="value" value="1" /><!-- /TMPL_IF -->ON
<!-- TMPL_IF NAME="value-no" -->
<input type="radio" name="value" value="0" checked="checked" /><!-- TMPL_ELSE --><input type="radio" name="value" value="0" /><!-- /TMPL_IF -->OFF<!-- /TMPL_IF -->
</td></tr>
</table>
<p><input type="submit" value="<!-- TMPL_IF NAME="modify" -->Save Changes<!-- TMPL_ELSE -->Add this Preference<!-- /TMPL_IF -->"> <input type="button" value="Cancel" onclick="location.href='<!-- TMPL_VAR name="script_name" -->'; return false;" /></p>
</li>
</ol></fieldset>
<fieldset class="action"><input type="submit" value="<!-- TMPL_IF NAME="modify" -->Save Changes<!-- TMPL_ELSE -->Add this Preference<!-- /TMPL_IF -->"> <input type="button" value="Cancel" onclick="location.href='<!-- TMPL_VAR name="script_name" -->'; return false;" /></fieldset>
<h3>Koha internal</h3>
Note: you should have no reasons to modify the following default values
<table>
<tr><td><label for="preftype">Variable type:</label></td><td><input type="text" name="preftype" id="preftype" value="<!--TMPL_VAR NAME="preftype" -->" size="40" maxlength="40"><span class="formfield-notes"> (Choice, YesNo, Integer, Textarea, Float, Themes, Languages, or ClassSource)</td></tr>
<tr><td><label for="prefoptions">Variable options:</label></td><td><input type="text" name="prefoptions" id="prefoptions" value="<!-- TMPL_VAR NAME="prefoptions" -->" size="60" maxlength="80" />(a choice list for Choice (separated by |) or cols|rows for Texarea)</td></tr>
</table>
<fieldset class="brief">
<legend>Koha internal</legend>
<div class="hint">Note: you should have no reasons to modify the following default values</div>
<ol>
<label for="preftype">Variable type:</label>
<div class="hint"> (Choice, YesNo, Integer, Textarea, Float, Themes, Languages, or ClassSource)</div>
<input type="text" name="preftype" id="preftype" value="<!--TMPL_VAR NAME="preftype" -->" size="40" maxlength="40">
<label for="prefoptions">Variable options:</label>
<div class="hint">(a choice list for Choice (separated by |) or cols|rows for Texarea)</div>
<input type="text" name="prefoptions" id="prefoptions" value="<!-- TMPL_VAR NAME="prefoptions" -->" size="60" maxlength="80" />
</fieldset>
</form>
<!-- /TMPL_IF -->

View file

@ -1,6 +1,5 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
<title>Koha -- Reports</title>
<title>Koha &rsaquo; Reports &rsaquo; Guided Reports &rsaquo; Dictionary</title>
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="calendar.inc" -->
</head>
@ -30,8 +29,8 @@ Filter By Area <select name="areas">
<!-- /TMPL_LOOP -->
</select>
<!-- <input name="phase" value="Filter Dictionary" type="submit"> -->
<input name="phase" value="Add New Definition" type="phase">
<input name="submit" value="Add New Definition" type="submit">
<input name="phase" value="Add New Definition" type="hidden" />
<input name="submit" value="Add New Definition" type="submit" />
</form>
<br />
<table border="1" cellspacing="0" cellpadding="5">
@ -40,6 +39,7 @@ Filter By Area <select name="areas">
<th>Description</th>
<th>Area</th>
<th>Definition</th>
<th>&nbsp;</th>
</tr>
<!-- TMPL_LOOP NAME="definitions" -->
<tr valign="top">
@ -48,9 +48,9 @@ Filter By Area <select name="areas">
<td><!-- TMPL_VAR NAME="area" --></td>
<td><!-- TMPL_VAR NAME="saved_sql" --></td>
<td><form method="post" action="/cgi-bin/koha/reports/dictionary.pl">
<input type="hidden" name="id" value="<!-- TMPL_VAR NAME="id" -->">
<input type="hidden" name="phase" value="Delete Definition">
<input type="submit" name="submit" value="Delete Definition">
<input type="hidden" name="id" value="<!-- TMPL_VAR NAME="id" -->" />
<input type="hidden" name="phase" value="Delete Definition" />
<input type="submit" name="submit" value="Delete Definition" />
</form></td>
</tr>
<!-- /TMPL_LOOP -->
@ -74,8 +74,8 @@ Filter By Area <select name="areas">
</tr>
</table>
<input type="hidden" name="phase" value="New Term step 2">
<input name="submit" value="Next" type="submit">
<input type="hidden" name="phase" value="New Term step 2" />
<input name="submit" value="Next" type="submit" />
</form>
<!-- /TMPL_IF -->
@ -84,16 +84,16 @@ Filter By Area <select name="areas">
<p>1 Name | <b>2 Area</b> | 3 Columns | 4 Values</p>
<form action="/cgi-bin/koha/reports/dictionary.pl" method="post">
<input type="hidden" name="phase" value="New Term step 3">
<input type="hidden" name="definition_name" value="<!-- TMPL_VAR NAME="definition_name" -->">
<input type="hidden" name="definition_description" value="<!-- TMPL_VAR NAME="definition_description" -->">
<input type="hidden" name="phase" value="New Term step 3" />
<input type="hidden" name="definition_name" value="<!-- TMPL_VAR NAME="definition_name" -->" />
<input type="hidden" name="definition_description" value="<!-- TMPL_VAR NAME="definition_description" -->" />
Select table <select name="areas">
<!-- TMPL_LOOP NAME="areas" -->
<option value="<!-- TMPL_VAR NAME="id" -->"><!-- TMPL_VAR NAME="name"--></option>
<!-- /TMPL_LOOP -->
</select>
<input name="submit" value="Next" type="submit">
<input name="submit" value="Next" type="submit" />
</form>
<!-- /TMPL_IF -->
@ -102,11 +102,11 @@ Select table <select name="areas">
<p>1 Name | 2 Area | <b>3 Columns</b> | 4 Values</p>
<form action="/cgi-bin/koha/reports/dictionary.pl" method="post">
<input type="hidden" name="area" value="<!-- TMPL_VAR NAME="area" -->">
<input type="hidden" name="definition_name" value="<!-- TMPL_VAR NAME="definition_name" -->">
<input type="hidden" name="definition_description" value="<!-- TMPL_VAR NAME="definition_description" -->">
<input type="hidden" name="area" value="<!-- TMPL_VAR NAME="area" -->" />
<input type="hidden" name="definition_name" value="<!-- TMPL_VAR NAME="definition_name" -->" />
<input type="hidden" name="definition_description" value="<!-- TMPL_VAR NAME="definition_description" -->"> /
<select id="availableColumns" name="oldcolumns2" multiple size="25" style="width:200px;height:300px;">
<select id="availableColumns" name="oldcolumns2" size="25" style="width:200px;height:300px;">
<!-- TMPL_LOOP NAME="columns" -->
<!-- TMPL_IF NAME="table" -->
<!-- TMPL_IF NAME="__first__" -->
@ -126,13 +126,13 @@ Select table <select name="areas">
</option>
<!-- /TMPL_LOOP -->
</select>
<input type="button" name="Add" value="Add" class="button" onClick="addColumn()"/>
<input type="button" name="Add" value="Add" class="button" onClick="addColumn()" />
<select id="selectedColumns" name="columns" multiple size="25" style="width:200px;height:300px;"></select>
<input type="button" name="delete" value="delete" class="button" onClick="delColumn()"/>
<select id="selectedColumns" name="columns" size="25" style="width:200px;height:300px;"></select>
<input type="button" name="delete" value="delete" class="button" onClick="delColumn()" />
<input type="hidden" name="phase" value="New Term step 4">
<input type="submit" name="submit" value="Next">
<input type="hidden" name="phase" value="New Term step 4" />
<input type="submit" name="submit" value="Next" />
</form>
<!-- /TMPL_IF -->
@ -141,32 +141,32 @@ Select table <select name="areas">
<p>1 Name | 2 Area | 3 Columns | <b>4 Values</b></p>
<form action="/cgi-bin/koha/reports/dictionary.pl" method="post">
<input type="hidden" name="area" value="<!-- TMPL_VAR NAME="area" -->">
<input type="hidden" name="definition_name" value="<!-- TMPL_VAR NAME="definition_name" -->">
<input type="hidden" name="definition_description" value="<!-- TMPL_VAR NAME="definition_description" -->">
<input type="hidden" name="columnstring" value="<!-- TMPL_VAR NAME="columnstring" -->">
<input type="hidden" name="area" value="<!-- TMPL_VAR NAME="area" -->" />
<input type="hidden" name="definition_name" value="<!-- TMPL_VAR NAME="definition_name" -->" />
<input type="hidden" name="definition_description" value="<!-- TMPL_VAR NAME="definition_description" -->" />
<input type="hidden" name="columnstring" value="<!-- TMPL_VAR NAME="columnstring" -->" />
<!-- TMPL_LOOP NAME="columns" -->
<p>
<input type=hidden name="criteria_column" value="<!-- TMPL_VAR NAME="name" -->">
<input type="hidden" name="criteria_column" value="<!-- TMPL_VAR NAME="name" -->" />
<!-- TMPL_VAR NAME="name" -->
<!-- TMPL_IF NAME="distinct" -->
<select name="<!-- TMPL_VAR NAME="name" -->_value">
<!-- TMPL_LOOP NAME="values" -->
<select name="<!-- TMPL_VAR NAME="name" -->_value">
<!-- TMPL_LOOP NAME="values" -->
<option value="<!-- TMPL_VAR NAME="availablevalues"-->"><!-- TMPL_VAR NAME="availablevalues" --></option>
<!-- /TMPL_LOOP -->
</select>
<!-- /TMPL_LOOP -->
</select>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="date" -->
<table>
<tr valign="top">
<td><input type="radio" name="<!-- TMPL_VAR NAME="name" -->_all" value="all">All Dates</td>
<tr valign="top">
<td><input type="radio" name="<!-- TMPL_VAR NAME="name" -->_all" value="all" />All Dates</td>
<td>OR</td>
<td><input type="radio" name="dates" value="range">Date Range<br />
<td><input type="radio" name="dates" value="range" />Date Range<br />
<table>
<tr>
<td>Start of Date Range</td>
<td><input type="text" size="10" id="<!-- TMPL_VAR NAME="name" -->_start_value" name="<!-- TMPL_VAR NAME="name" -->_start_value" value="" >
<td><input type="text" size="10" id="<!-- TMPL_VAR NAME="name" -->_start_value" name="<!-- TMPL_VAR NAME="name" -->_start_value" value="" />
<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="buttonfrom1" style="cursor: pointer;" />
<script type="text/javascript">
Calendar.setup({
@ -181,7 +181,7 @@ align : "Tl"
<tr>
<td>End of Date Range</td>
<td>
<input type="text" size="10" id="<!-- TMPL_VAR NAME="name" -->_end_value" name="<!-- TMPL_VAR NAME="name" -->_end_value" value="" >
<input type="text" size="10" id="<!-- TMPL_VAR NAME="name" -->_end_value" name="<!-- TMPL_VAR NAME="name" -->_end_value" value="" />
<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="buttonfrom1" style="cursor: pointer;" />
<script type="text/javascript">
Calendar.setup({
@ -197,23 +197,23 @@ align : "Tl"
</tr>
</table>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="text">
<p>Search string matches <input type="text" size="13" name="<!-- TMPL_VAR NAME="name" -->_value"></p>
<!-- TMPL_IF NAME="text" -->
<p>Search string matches <input type="text" size="13" name="<!-- TMPL_VAR NAME="name" -->_value" /></p>
<!-- /TMPL_IF -->
</p>
<!-- /TMPL_LOOP -->
<input type="hidden" name="phase" value="New Term step 5">
<input type="submit" name="submit" value="Next">
<input type="hidden" name="phase" value="New Term step 5" />
<input type="submit" name="submit" value="Next" />
</form>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="step_5" -->
<form action="/cgi-bin/koha/reports/dictionary.pl" method="post">
<input type="hidden" name="area" value="<!-- TMPL_VAR NAME="area" -->">
<input type="hidden" name="definition_name" value="<!-- TMPL_VAR NAME="definition_name" -->">
<input type="hidden" name="definition_description" value="<!-- TMPL_VAR NAME="definition_description" -->">
<input type="hidden" name="columnstring" value="<!-- TMPL_VAR NAME="columnstring" -->">
<input type="hidden" name="area" value="<!-- TMPL_VAR NAME="area" -->" />
<input type="hidden" name="definition_name" value="<!-- TMPL_VAR NAME="definition_name" -->" />
<input type="hidden" name="definition_description" value="<!-- TMPL_VAR NAME="definition_description" -->" />
<input type="hidden" name="columnstring" value="<!-- TMPL_VAR NAME="columnstring" -->" />
<h3>Confirm Definition</h3>
@ -242,9 +242,9 @@ align : "Tl"
<!-- /TMPL_LOOP -->
</table>
<input type="hidden" name="sql" value="<!-- TMPL_VAR NAME="query" -->">
<input type="hidden" name="phase" value="New Term step 6">
<input type="submit" name="submit" value="Save">
<input type="hidden" name="sql" value="<!-- TMPL_VAR NAME="query" -->" />
<input type="hidden" name="phase" value="New Term step 6" />
<input type="submit" name="submit" value="Save" />
</form>
<!-- /TMPL_IF -->

View file

@ -1,5 +1,5 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
<title>Koha -- Guided Reports</title>
<title>Koha &rsaquo; Reports &rsaquo; Guided Reports<!-- TMPL_IF NAME="create" --> &rsaquo; <a href="/cgi-bin/koha/reports/guided_reports.pl">Guided Reports Wizard</a> &rsaquo; <strong>Create from SQL</strong><!-- /TMPL_IF --></title>
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="calendar.inc" -->
@ -9,9 +9,10 @@
<!-- TMPL_INCLUDE NAME="circ-search.inc" -->
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a>
&rsaquo; <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> &rsaquo; <strong>Guided Reports Wizard </strong></div>
&rsaquo; <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a><!-- TMPL_IF NAME="start" --> &rsaquo; <strong>Guided Reports Wizard </strong><!-- /TMPL_IF --><!-- TMPL_IF NAME="saved1" --> &rsaquo; <a href="/cgi-bin/koha/reports/guided_reports.pl">Guided Reports Wizard</a> &rsaquo; <strong>Saved Reports</strong><!-- /TMPL_IF --><!-- TMPL_IF NAME="create" --> &rsaquo; <a href="/cgi-bin/koha/reports/guided_reports.pl">Guided Reports Wizard</a> &rsaquo; <strong>Create from SQL</strong><!-- /TMPL_IF --><!-- TMPL_IF NAME="showsql" -->
&rsaquo; <a href="/cgi-bin/koha/reports/guided_reports.pl">Guided Reports Wizard</a> &rsaquo; Saved Reports &rsaquo; <strong>SQL View</strong><!-- /TMPL_IF --></div>
<div id="doc3" class="yui-t2">
<div id="doc3" class="yui-t1">
<div id="bd">
<div id="yui-main">
@ -49,7 +50,7 @@ reports</p>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="saved1" -->
<h1>Load Saved Reports</h1>
<h1>Saved Reports</h1>
<p>Choose the report to run from the list</p>
<table>
<form action="/cgi-bin/koha/reports/guided_reports.pl">
@ -310,20 +311,18 @@ Notes: <textarea name="notes"></textarea><br />
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="create" -->
<h1>Create Report From SQL</h1>
<form action="/cgi-bin/koha/reports/guided_reports.pl" method="post">
Report Name: <input type="text" name="reportname"> <br />
Notes: <textarea name="notes"></textarea><br />
Type:
<select name="types">
<!-- TMPL_LOOP NAME="types" -->
<option value="<!-- TMPL_VAR NAME="id" -->"><!-- TMPL_VAR NAME="name"--></option>
<!-- /TMPL_LOOP -->
</select>
<br />
SQL: <textarea name="sql" cols=30 rows=10></textarea><br />
<input type="hidden" name="phase" value="Save Report">
<input type="submit" name="submit" value="Save Report">
<fieldset class="rows">
<legend>Create Report From SQL</legend>
<ol>
<li><label for="reportname">Report Name:</label> <input type="text" id="reportname" name="reportname" /> </li>
<li><label for="notes">Notes:</label> <textarea id="notes" name="notes" cols="50" rows="2"></textarea></li>
<li><label for="types">Type:</label><select id="types" name="types"><!-- TMPL_LOOP NAME="types" --><option value="<!-- TMPL_VAR NAME="id" -->"><!-- TMPL_VAR NAME="name"--></option><!-- /TMPL_LOOP --></select></li>
<li><label for="sql">SQL: </label><textarea id="sql" name="sql" cols="50" rows="10"></textarea></li>
</ol>
</fieldset>
<fieldset class="action"><input type="hidden" name="phase" value="Save Report" /><input type="submit" name="submit" value="Save Report" /></fieldset>
</form>
<!-- /TMPL_IF -->
@ -341,8 +340,8 @@ Sub report:<select name="subreport">
<!-- /TMPL_LOOP -->
</select>
<br />
<input type="hidden" name="phase" value="Save Compound">
<input type="submit" name="submit" value="Save Compound">
<input type="hidden" name="phase" value="Save Compound" />
<input type="submit" name="submit" value="Save Compound" />
</form>
<!-- /TMPL_IF -->
@ -391,6 +390,7 @@ Sub report:<select name="subreport">
</div>
</div>
<script type="text/javascript">
//<![CDATA[
function setObjects() {
selectedColumnsObj=document.getElementById('selectedColumns');
availableColumnsObj=document.getElementById('availableColumns');
@ -415,5 +415,6 @@ function delColumn() {
selectedColumnsObj.remove(selectedColumnsObj.options.selectedIndex)
}
}
//]]>
</script>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

View file

@ -7,15 +7,13 @@
<!-- TMPL_INCLUDE NAME="circ-search.inc" -->
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation.pl">Reports</a></div>
<div id="doc3" class="yui-t2">
<div id="doc" class="yui-t7">
<div id="bd">
<div id="yui-main">
<div class="yui-b">
<h1>Reports</h1>
<div class="yui-g">
<h1>Reports</h1>
<div class="yui-u first">
<h2>Guided Report Wizard</h2>
<ul>
@ -54,10 +52,6 @@
</ul></div>
</div>
</div>
</div>
<div class="yui-b">
<!-- TMPL_INCLUDE NAME="guided-reports-view.inc" -->
</div>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->