Hi, The patch as submitted is in HEAD as commit 2bec9955c
Regards, Galen On Sun, Feb 7, 2010 at 3:41 PM, Nicole Engard <[email protected]> wrote: > Okay - let me rephrase - the patch for 4010 was applied - but 4009 wasn't... > > On Sat, Feb 6, 2010 at 10:17 AM, Nicole Engard <[email protected]> wrote: >> This has not been pushed yet - did I do something wrong or were they >> overlooked? >> >> Nicole >> >> On Sun, Dec 27, 2009 at 7:30 PM, Nicole Engard <[email protected]> wrote: >>> Bug 4009: New list w/out title fails silently >>> Fixed so Title is required when adding a list >>> >>> Bug 4010: Purchase Suggestions Should Require Title >>> Fixed text so that it indicates that title is required >>> Added check to make sure Title is filled in >>> >>> For both bugs I added a required style to the CSS >>> --- >>> koha-tmpl/opac-tmpl/prog/en/css/opac.css | 34 >>> ++++++++++-------- >>> .../opac-tmpl/prog/en/modules/opac-shelves.tmpl | 21 ++++++++++- >>> .../prog/en/modules/opac-suggestions.tmpl | 36 >>> +++++++++++++++----- >>> 3 files changed, 65 insertions(+), 26 deletions(-) >>> >>> diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css >>> b/koha-tmpl/opac-tmpl/prog/en/css/opac.css >>> index 9e30270..f9a8f59 100644 >>> --- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css >>> +++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css >>> @@ -19,6 +19,10 @@ body { >>> padding : 0 0 2.5em 0; >>> } >>> >>> +.required { >>> + color : #C00; >>> +} >>> + >>> caption { >>> font-size : 140%; >>> text-align : left; >>> @@ -33,14 +37,14 @@ fieldset { >>> } >>> >>> fieldset.rows { >>> -border-width : 1px; >>> -border-bottom : 1px solid black; >>> -float : left; >>> -font-size : 90%; >>> -clear : left; >>> -margin: .9em 0 0 0; >>> -padding: 0; >>> -width: 100%; >>> + border-width : 1px; >>> + border-bottom : 1px solid black; >>> + float : left; >>> + font-size : 90%; >>> + clear : left; >>> + margin: .9em 0 0 0; >>> + padding: 0; >>> + width: 100%; >>> } >>> >>> fieldset.rows legend { >>> @@ -64,16 +68,16 @@ fieldset.rows fieldset { >>> } >>> >>> fieldset.rows ol { >>> -padding: 1em 1em 0 1em; >>> -list-style-type: none; >>> + padding: 1em 1em 0 1em; >>> + list-style-type: none; >>> } >>> >>> fieldset.rows li { >>> -float : left; >>> -clear : left; >>> -padding-bottom: 1em; >>> -list-style-type: none; >>> -width: 100%; >>> + float : left; >>> + clear : left; >>> + padding-bottom: 1em; >>> + list-style-type: none; >>> + width: 100%; >>> } >>> >>> fieldset.rows.left li { >>> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl >>> b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl >>> index 87b78fc..6217977 100644 >>> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl >>> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl >>> @@ -123,6 +123,23 @@ $(function() { >>> }); >>> <!-- /TMPL_IF --> >>> }); >>> + function Check(f) { >>> + var _alertString=""; >>> + var alertString2; >>> + >>> + if(f.addshelf.value.length ==0){ >>> + _alertString += _("- You must enter a List Name\n"); >>> + } >>> + >>> + if (_alertString.length==0) { >>> + document.Aform.submit(); >>> + } else { >>> + alertString2 = _("Form not submitted because of the >>> following problem(s)\n"); >>> + alertString2 += >>> "------------------------------------------------------------------------------------\n\n"; >>> + alertString2 += _alertString; >>> + alert(alertString2); >>> + } >>> + } >>> //]]> >>> </script> >>> </head> >>> @@ -475,7 +492,7 @@ $(function() { >>> <input type="hidden" name="shelves" value="1" /> >>> <ol> >>> <li> >>> - <label for="addshelf">List Name:</label> >>> + <label class="required" for="addshelf">List >>> Name:</label> >>> <!-- TMPL_IF NAME="already" --> >>> <input id="addshelf" type="text" name="addshelf" >>> value="<!-- TMPL_VAR NAME="already" -->" size="60" /> >>> <!-- TMPL_ELSE --> >>> @@ -501,7 +518,7 @@ $(function() { >>> </ol> >>> </fieldset> >>> <fieldset class="action"> >>> - <input type="submit" value="Save" class="submit" /> >>> + <input type="submit" onclick="Check(this.form); return >>> false;" value="Save" class="submit" /> >>> <a class="cancel" >>> href="/cgi-bin/koha/opac-shelves.pl">Cancel</a> >>> </fieldset> >>> </form> >>> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl >>> b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl >>> index e03cd3d..263e3ae 100644 >>> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl >>> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl >>> @@ -42,6 +42,24 @@ $.tablesorter.addParser({ >>> return false; >>> }); >>> }); >>> + >>> + function Check(f) { >>> + var _alertString=""; >>> + var alertString2; >>> + >>> + if(f.title.value.length ==0){ >>> + _alertString += _("- You must enter a Title\n"); >>> + } >>> + >>> + if (_alertString.length==0) { >>> + document.Aform.submit(); >>> + } else { >>> + alertString2 = _("Form not submitted because of the >>> following problem(s)\n"); >>> + alertString2 += >>> "------------------------------------------------------------------------------------\n\n"; >>> + alertString2 += _alertString; >>> + alert(alertString2); >>> + } >>> + } >>> //]]> >>> </script> >>> </head> >>> @@ -56,18 +74,18 @@ $.tablesorter.addParser({ >>> <!-- TMPL_IF name="op_add" --> >>> <h1>Enter a new purchase suggestion</h1> >>> >>> - <p>Please fill out this form to make a purchase suggestion. You will >>> receive an email when the library processes your purchase suggestion</p> >>> - <p>No fields are mandatory. Enter whatever information you have. The >>> "Notes" field can be used to provide any additional information.</p> >>> + <p>Please fill out this form to make a purchase suggestion. You will >>> receive an email when the library processes your suggestion</p> >>> + <p>Only the title is required, but the more information you enter the >>> easier it will be for the librarians to find title you're requesting. The >>> "Notes" field can be used to provide any additional information.</p> >>> <form action="/cgi-bin/koha/opac-suggestions.pl" method="post"> >>> <fieldset class="rows"> <ol> >>> - <li><label for="title">Title:</label><input type="text" id="title" >>> name="title" size="50" maxlength="80" /></li> >>> + <li><label class="required" for="title">Title:</label><input >>> type="text" id="title" name="title" size="50" maxlength="80" /></li> >>> <li><label for="author">Author:</label><input type="text" id="author" >>> name="author" size="50" maxlength="80" /></li> >>> - <li><label for="copyrightdate">Copyright date:</label><input >>> type="text" id="copyrightdate" name="copyrightdate" size="4" maxlength="4" >>> /></li> >>> - <li><label for="isbn">ISBN or ISSN or other standard >>> number:</label><input type="text" id="isbn" name="isbn" size="50" >>> maxlength="80" /></li> >>> + <li><label for="copyrightdate">Copyright Date:</label><input >>> type="text" id="copyrightdate" name="copyrightdate" size="4" maxlength="4" >>> /></li> >>> + <li><label for="isbn">Standard Number (ISBN, ISSN or >>> Other):</label><input type="text" id="isbn" name="isbn" size="50" >>> maxlength="80" /></li> >>> <li><label for="publishercode">Publisher:</label><input type="text" >>> id="publishercode" name="publishercode" size="50" maxlength="80" /></li> >>> - <li><label for="collectiontitle">Collection title:</label><input >>> type="text" id="collectiontitle" name="collectiontitle" size="50" >>> maxlength="80" /></li> >>> - <li><label for="place">Publication Place :</label><input type="text" >>> id="place" name="place" size="50" maxlength="80" /></li> >>> - <li><label for="itemtype">Document Type:</label><select >>> name="itemtype" > >>> + <li><label for="collectiontitle">Collection Title:</label><input >>> type="text" id="collectiontitle" name="collectiontitle" size="50" >>> maxlength="80" /></li> >>> + <li><label for="place">Publication Place:</label><input type="text" >>> id="place" name="place" size="50" maxlength="80" /></li> >>> + <li><label for="itemtype">Item Type:</label><select name="itemtype" > >>> <option value="">Default</option> >>> <!-- TMPL_LOOP name="itemtypeloop" --> >>> <!-- TMPL_IF name="selected" --><option value="<!-- >>> TMPL_VAR name="itemtype"-->" selected="selected"> <!--TMPL_ELSE--><option >>> value="<!-- TMPL_VAR name="itemtype" -->"> <!--/TMPL_IF--> <!--TMPL_IF >>> Name="imageurl"--><img alt="<!-- TMPL_VAR name="description" -->" >>> src="<!--TMPL_VAR Name="imageurl"-->" /><!-- TMPL_VAR name="description" >>> --><!--TMPL_ELSE--><!-- TMPL_VAR name="description" >>> --><!--/TMPL_IF--></option> >>> @@ -75,7 +93,7 @@ $.tablesorter.addParser({ >>> </select> </li> >>> <li><label for="note">Notes:</label><textarea name="note" id="note" >>> rows="5" cols="40"></textarea></li> >>> </ol></fieldset> >>> - <fieldset class="action"><input type="hidden" name="suggestedby" >>> value="<!--TMPL_VAR Name="suggestedbyme"-->" /><input type="hidden" >>> name="op" value="add_confirm" /><input type="submit" value="Submit Your >>> Suggestion" /> <a class="action" >>> href="/cgi-bin/koha/opac-suggestions.pl">Cancel</a></fieldset> >>> + <fieldset class="action"><input type="hidden" name="suggestedby" >>> value="<!--TMPL_VAR Name="suggestedbyme"-->" /><input type="hidden" >>> name="op" value="add_confirm" /><input type="submit" >>> onclick="Check(this.form); return false;" value="Submit Your Suggestion" /> >>> <a class="action" >>> href="/cgi-bin/koha/opac-suggestions.pl">Cancel</a></fieldset> >>> </form> >>> >>> <!-- /TMPL_IF --> >>> -- >>> 1.5.6.5 >>> >>> >> > _______________________________________________ > Koha-patches mailing list > [email protected] > http://lists.koha.org/mailman/listinfo/koha-patches -- Galen Charlton [email protected] _______________________________________________ Koha-patches mailing list [email protected] http://lists.koha.org/mailman/listinfo/koha-patches
