]>
git.koha-community.org Git - koha.git/log
Chris Cormack [Tue, 18 Sep 2007 20:17:35 +0000 (15:17 -0500)]
Removing \r characters that were busting a patch
Owen Leonard [Tue, 18 Sep 2007 19:55:11 +0000 (14:55 -0500)]
Some changes to members pages: - refining members-menu.inc - cleaning up memberentrygen.tmpl - some tweaks to moremember.tmpl - adding borrowernumber variable output to member-password.pl
Signed-off-by: Chris Cormack <crc@liblime.com>
Paul POULAIN [Tue, 18 Sep 2007 16:38:30 +0000 (18:38 +0200)]
BUGFIX : branch CPL was hardcoded
What is the branch CPL ?
Anyway, this was buggy and reseted the branch to empty
which was a bug ;-)
Signed-off-by: Chris Cormack <crc@liblime.com>
Paul POULAIN [Tue, 18 Sep 2007 16:38:29 +0000 (18:38 +0200)]
BUGFIX : no need to load a package twice
Signed-off-by: Chris Cormack <crc@liblime.com>
Henri-Damien LAURENT [Tue, 18 Sep 2007 16:38:28 +0000 (18:38 +0200)]
Fixing previous fix.
Signed-off-by: Chris Cormack <crc@liblime.com>
Henri-Damien LAURENT [Tue, 18 Sep 2007 16:38:27 +0000 (18:38 +0200)]
Fixing error on duplicate entry process.
Signed-off-by: Chris Cormack <crc@liblime.com>
Paul POULAIN [Tue, 18 Sep 2007 16:38:26 +0000 (18:38 +0200)]
BUGFIX : ModReserveStatus can't be found if you don't specify full path
this is a workaround, and could hide another problem.
However, I haven't found ModReserveStatus problem or duplicate definition.
Signed-off-by: Chris Cormack <crc@liblime.com>
Paul POULAIN [Tue, 18 Sep 2007 16:38:25 +0000 (18:38 +0200)]
FIX for #1375
marc_subfield_structure.hidden lost on create new framework
Signed-off-by: Chris Cormack <crc@liblime.com>
Paul POULAIN [Tue, 18 Sep 2007 16:38:24 +0000 (18:38 +0200)]
Installer perl package checking
- Data::Random is not necessary. I don't have it & have no problems
- HTML::Tree was used in the 1st versions of the translator. I don't have it installed, it is useless now
Signed-off-by: Chris Cormack <crc@liblime.com>
Henri-Damien LAURENT [Tue, 18 Sep 2007 16:38:23 +0000 (18:38 +0200)]
Adding error management for memberentry.pl
Signed-off-by: Chris Cormack <crc@liblime.com>
Owen Leonard [Fri, 14 Sep 2007 20:24:39 +0000 (15:24 -0500)]
More template cleanup, resident search forms, breadcrumbs menus
Signed-off-by: Chris Cormack <crc@liblime.com>
Owen Leonard [Fri, 14 Sep 2007 20:24:26 +0000 (15:24 -0500)]
Adding breadcrumbs menu to serials pages
Signed-off-by: Chris Cormack <crc@liblime.com>
Owen Leonard [Fri, 14 Sep 2007 20:24:14 +0000 (15:24 -0500)]
Finishing cleanup of Admin templates: - Corrected markup generated by scripts. - Added standard or custom resident search form on all pages. - Add breadcrumb navigation to all pages
Signed-off-by: Chris Cormack <crc@liblime.com>
Russel Garlick [Fri, 14 Sep 2007 00:14:11 +0000 (12:14 +1200)]
Disabling image uploader in TinyMCE
Signed-off-by: Chris Cormack <crc@liblime.com>
Russel Garlick [Fri, 14 Sep 2007 00:07:14 +0000 (12:07 +1200)]
Fixing missing , breaking tinyMCE config
Signed-off-by: Chris Cormack <crc@liblime.com>
Russel Garlick [Thu, 13 Sep 2007 23:54:13 +0000 (11:54 +1200)]
More changes to TinyMCE tool bar config - removing unnecessary options
Signed-off-by: Chris Cormack <crc@liblime.com>
Chris Cormack [Thu, 13 Sep 2007 23:44:45 +0000 (18:44 -0500)]
Typo in edithelp.tmpl
Signed-off-by: Chris Cormack <crc@liblime.com>
Russel Garlick [Thu, 13 Sep 2007 23:39:28 +0000 (11:39 +1200)]
Changing TinyMCE config - location of edit bar and available options
Signed-off-by: Chris Cormack <crc@liblime.com>
Chris Cormack [Thu, 13 Sep 2007 23:26:01 +0000 (18:26 -0500)]
Help includes
Signed-off-by: Chris Cormack <crc@liblime.com>
Russel Garlick [Thu, 13 Sep 2007 23:24:07 +0000 (11:24 +1200)]
Fixing path to TinyMCE
Signed-off-by: Chris Cormack <crc@liblime.com>
Russel Garlick [Thu, 13 Sep 2007 23:03:31 +0000 (11:03 +1200)]
Fixing windows carrige return charaters in files and adding TinyMCE source files
Signed-off-by: Chris Cormack <crc@liblime.com>
Russel Garlick [Thu, 13 Sep 2007 22:53:58 +0000 (10:53 +1200)]
Adding TinyMCE Rich Text Editor for editing User Contributed Help pages
Signed-off-by: Chris Cormack <crc@liblime.com>
Chris Cormack [Thu, 13 Sep 2007 22:53:20 +0000 (17:53 -0500)]
Bugfix for help editor
Signed-off-by: Chris Cormack <crc@liblime.com>
Chris Cormack [Thu, 13 Sep 2007 22:38:50 +0000 (17:38 -0500)]
Editing help system.
Mostly working needs prettying Russ is working on that now
Signed-off-by: Chris Cormack <crc@liblime.com>
Chris Cormack [Thu, 13 Sep 2007 22:31:31 +0000 (17:31 -0500)]
Fix for template
Signed-off-by: Chris Cormack <crc@liblime.com>
Owen Leonard [Thu, 13 Sep 2007 19:58:58 +0000 (14:58 -0500)]
- Lots of markup corrections, in scripts and templates, for XHTML compliance
Signed-off-by: Chris Cormack <crc@liblime.com>
Paul POULAIN [Thu, 13 Sep 2007 16:16:15 +0000 (18:16 +0200)]
Proposal for a staff-global2.css
An alternate stylesheet for the staff client.
Set intranetstylesheet to /intranet-tmpl/prog/en/css/staff-global2.css
to see the result.
Note it's a draft, or a proof of concept if you prefer ;-)
Signed-off-by: Chris Cormack <crc@liblime.com>
Paul POULAIN [Thu, 13 Sep 2007 16:16:14 +0000 (18:16 +0200)]
BUGFIXES : 3 (marc_biblio, check biblionumber, ModMarcBiblio API)
- use biblio instead of marc_biblio,
- better check that biblionumber is correctly stored
- fix an buggy API call when ModMarcBiblio
Signed-off-by: Chris Cormack <crc@liblime.com>
Paul POULAIN [Thu, 13 Sep 2007 16:16:13 +0000 (18:16 +0200)]
BUGFIX : reintroduce the intranetstylesheet behaviour
If a intranetstylesheet is defined in the systemprefs, use it instead of staff-global.css
Signed-off-by: Chris Cormack <crc@liblime.com>
Paul POULAIN [Thu, 13 Sep 2007 16:16:12 +0000 (18:16 +0200)]
BUGFIX : those 2 files are required by misc/migration_tools/rebuild_zebra.pl
without them, the copy will fail to the zebra directory structure,
and zebra won't work correctly.
Signed-off-by: Chris Cormack <crc@liblime.com>
Paul POULAIN [Thu, 13 Sep 2007 16:16:11 +0000 (18:16 +0200)]
BUGBIX : this line has nothing to do here
Signed-off-by: Chris Cormack <crc@liblime.com>
Paul POULAIN [Thu, 13 Sep 2007 16:16:10 +0000 (18:16 +0200)]
(unimarc specific) BUGFIX : if 100$a exist but is not 35 char long, MARC::File::XML may fail
So, add blanks if needed...
Signed-off-by: Chris Cormack <crc@liblime.com>
Owen Leonard [Wed, 12 Sep 2007 20:11:49 +0000 (15:11 -0500)]
Continuing to add resident search form and breakcrumbs. Markup cleanup all around.
Signed-off-by: Chris Cormack <crc@liblime.com>
Owen Leonard [Wed, 12 Sep 2007 20:11:31 +0000 (15:11 -0500)]
Modifications to ensure XHTML compliance; Adding breadcrumbs and global search
Signed-off-by: Chris Cormack <crc@liblime.com>
Paul POULAIN [Wed, 12 Sep 2007 15:19:23 +0000 (17:19 +0200)]
Som reorganization and recommiting memberentrygen.tmpl
Signed-off-by: Chris Cormack <crc@liblime.com>
Paul POULAIN [Wed, 12 Sep 2007 14:00:02 +0000 (16:00 +0200)]
BUGFIX for unimarc 4XX plugin
We don't have to count parentNode, but grand-parentNode
Signed-off-by: Chris Cormack <crc@liblime.com>
Henri-Damien LAURENT [Wed, 12 Sep 2007 14:00:01 +0000 (16:00 +0200)]
BUG FIXING :
Signed-off-by: Chris Cormack <crc@liblime.com>
Paul POULAIN [Wed, 12 Sep 2007 14:00:00 +0000 (16:00 +0200)]
BUGFIX : Expand property fixed on duplicated fields + added _() to string that must be translated
Signed-off-by: Chris Cormack <crc@liblime.com>
Henri-Damien LAURENT [Wed, 12 Sep 2007 13:59:59 +0000 (15:59 +0200)]
Bug Fixing : Year/Number Pattern was buggy.
Signed-off-by: Chris Cormack <crc@liblime.com>
Paul POULAIN [Wed, 12 Sep 2007 13:59:58 +0000 (15:59 +0200)]
BUGFIX : repeated fields where merged on biblio update
When updating a biblio, all repeated fields had the same input name.
Thus, when retrieving them through cgi->param resulted in a single line
Thus all subfields where merged in a single MARC field.
Adding a random() part to the name solves the problem
+ removing some warn lines
Signed-off-by: Chris Cormack <crc@liblime.com>
Henri-Damien LAURENT [Wed, 12 Sep 2007 13:59:57 +0000 (15:59 +0200)]
removing Date::Manip
Signed-off-by: Chris Cormack <crc@liblime.com>
Paul POULAIN [Wed, 12 Sep 2007 13:59:56 +0000 (15:59 +0200)]
improving detail page :
- fixing some bugs (subtitle repeated & shown on collection, authors repeated...)
- changing some things to look close to ISBD standard description
- adding the new biblioitems fields
Signed-off-by: Chris Cormack <crc@liblime.com>
Paul POULAIN [Wed, 12 Sep 2007 13:59:55 +0000 (15:59 +0200)]
Bug Fixing : information were messed around when editing an expired subscription.
Signed-off-by: Chris Cormack <crc@liblime.com>
Paul POULAIN [Wed, 12 Sep 2007 13:59:54 +0000 (15:59 +0200)]
BUGFIX : adding management of the 5 new biblioitems columns for biblio adding
Signed-off-by: Chris Cormack <crc@liblime.com>
Paul POULAIN [Wed, 12 Sep 2007 13:59:53 +0000 (15:59 +0200)]
BUGFIX & improvement : new biblioitems fields saving and GetMarcAuthors improvement
hdl defined 5 new fields in biblioitems, to handle collections.
The _koha_modify_biblioitem didn't deal with those fields. it's fixed now.
GetMarcAuthor in UNIMARC have a $4 field that is related to the responsability the author has
it is connected to an authorised value.
The improvement expand the numeric value to the expanded one.
Signed-off-by: Chris Cormack <crc@liblime.com>
Paul POULAIN [Wed, 12 Sep 2007 13:59:52 +0000 (15:59 +0200)]
BIGFIX : making rebuildnonmarc script work with koha 3.0
Signed-off-by: Chris Cormack <crc@liblime.com>
Paul POULAIN [Wed, 12 Sep 2007 13:59:50 +0000 (15:59 +0200)]
updating french translation
Signed-off-by: Chris Cormack <crc@liblime.com>
Owen Leonard [Tue, 11 Sep 2007 20:03:17 +0000 (15:03 -0500)]
Removing script-specified CSS and js pointers. More markup cleanup and restructuring.
Signed-off-by: Chris Cormack <crc@liblime.com>
Owen Leonard [Tue, 11 Sep 2007 20:03:04 +0000 (15:03 -0500)]
Corrections for XHTML compliance
Signed-off-by: Chris Cormack <crc@liblime.com>
Owen Leonard [Tue, 11 Sep 2007 20:02:47 +0000 (15:02 -0500)]
Continuing addition of resident search form, other markup corrections.
Signed-off-by: Chris Cormack <crc@liblime.com>
Owen Leonard [Tue, 11 Sep 2007 20:02:33 +0000 (15:02 -0500)]
More jquery tabs integration
Signed-off-by: Chris Cormack <crc@liblime.com>
Owen Leonard [Tue, 11 Sep 2007 20:02:18 +0000 (15:02 -0500)]
Trying new jquery tabs system. Appearance may not be quite right
Signed-off-by: Chris Cormack <crc@liblime.com>
Chris Cormack [Tue, 11 Sep 2007 01:36:05 +0000 (20:36 -0500)]
Making some changes so the resulting db matches kohastructure.sql more closely
Still more to be done
Signed-off-by: Chris Cormack <crc@liblime.com>
Chris Cormack [Mon, 10 Sep 2007 23:15:06 +0000 (18:15 -0500)]
Shifting print before operation
Signed-off-by: Chris Cormack <crc@liblime.com>
Owen Leonard [Mon, 10 Sep 2007 20:09:18 +0000 (15:09 -0500)]
Continuing integration of breadcrumbs and resident search form, now on member pages. The search form tabs need to be handled in a more sane manner given that they might have multiple options. Either a custom handling script for the different includes or a js-library-based system that will handle all of them.
Signed-off-by: Chris Cormack <crc@liblime.com>
Joshua Ferraro [Mon, 10 Sep 2007 20:09:02 +0000 (15:09 -0500)]
finishing the changes to circulation.tmpl
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <crc@liblime.com>
Joshua Ferraro [Mon, 10 Sep 2007 20:08:48 +0000 (15:08 -0500)]
validation of yui grids
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <crc@liblime.com>
Owen Leonard [Mon, 10 Sep 2007 20:08:29 +0000 (15:08 -0500)]
More work on resident search, adding breadcrumbs and resident search to member pages.
Signed-off-by: Chris Cormack <crc@liblime.com>
Joshua Ferraro [Mon, 10 Sep 2007 20:08:11 +0000 (15:08 -0500)]
missing end <div>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <crc@liblime.com>
Joshua Ferraro [Mon, 10 Sep 2007 20:07:53 +0000 (15:07 -0500)]
useless <p> was causing validation probs
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <crc@liblime.com>
MJ Ray [Sun, 9 Sep 2007 12:38:02 +0000 (13:38 +0100)]
Update instructions to match latest installer settings.
Signed-off-by: Chris Cormack <crc@liblime.com>
Chris Cormack [Sun, 9 Sep 2007 00:25:21 +0000 (19:25 -0500)]
Fixing spelling mistakes with reviews
Signed-off-by: Chris Cormack <crc@liblime.com>
Chris Cormack [Sat, 8 Sep 2007 03:05:04 +0000 (22:05 -0500)]
Adding link to the committed budget breakdown
Signed-off-by: Chris Cormack <crc@liblime.com>
Chris Cormack [Sat, 8 Sep 2007 02:58:58 +0000 (21:58 -0500)]
Re-adding the link to the spent budget breakdown
Signed-off-by: Chris Cormack <crc@liblime.com>
Owen Leonard [Fri, 7 Sep 2007 19:04:28 +0000 (14:04 -0500)]
New basic page structure implemented for circ pages: global main menu in the header, resident search box and logo, followed by breadcrumb navigation. Added circ-menu.inc for left-hand sidebar menu (needs revision), circ-search.inc which defines the resident search box for circ pages, additions to staff-global.js to handle tab-switching in search box.
Signed-off-by: Chris Cormack <crc@liblime.com>
Owen Leonard [Fri, 7 Sep 2007 19:04:08 +0000 (14:04 -0500)]
Snapshot of CSS which includes global search box with two-tabbed bordered box
Signed-off-by: Chris Cormack <crc@liblime.com>
MJ Ray [Fri, 7 Sep 2007 10:20:23 +0000 (11:20 +0100)]
BUGFIX: need to create authors/id if CPAN is unused
Signed-off-by: Chris Cormack <crc@liblime.com>
MJ Ray [Fri, 7 Sep 2007 09:43:40 +0000 (10:43 +0100)]
Move many files to more FHS-like paths
Signed-off-by: Chris Cormack <crc@liblime.com>
thd [Fri, 24 Aug 2007 04:04:28 +0000 (00:04 -0400)]
Major change switching Koha record ID from field 090 to 999. 090 is now for
local LC call number as used at many North American academic libraries.
Correcting authoritytypecode values where my typo used the number '0' as
part of the value in one table and the letter 'O' in another table.
Improved seealso column indexing values.
Signed-off-by: Chris Cormack <crc@liblime.com>
thd [Fri, 24 Aug 2007 10:11:42 +0000 (06:11 -0400)]
Correcting installation instructions.
Signed-off-by: Chris Cormack <crc@liblime.com>
thd [Fri, 24 Aug 2007 09:29:02 +0000 (05:29 -0400)]
Adding custom authority frameworks.
Signed-off-by: Chris Cormack <crc@liblime.com>
thd [Fri, 24 Aug 2007 08:33:27 +0000 (04:33 -0400)]
Corrected field and subfield values in frameworks.
Signed-off-by: Chris Cormack <crc@liblime.com>
thd [Fri, 24 Aug 2007 04:21:44 +0000 (00:21 -0400)]
Correcting authoritytypecode values where my typo used the number '0' as
part of the value in one table and the letter 'O' in another table.
Improved seealso column indexing values.
Signed-off-by: Chris Cormack <crc@liblime.com>
Chris Cormack [Fri, 7 Sep 2007 01:47:30 +0000 (20:47 -0500)]
Fix to get selectbranchandprinter working fine with the Session
Signed-off-by: Chris Cormack <crc@liblime.com>
MJ Ray [Thu, 6 Sep 2007 15:12:36 +0000 (16:12 +0100)]
BUGFIX: another truncated part of README. Editor accident?
Signed-off-by: Chris Cormack <crc@liblime.com>
MJ Ray [Thu, 6 Sep 2007 15:05:51 +0000 (16:05 +0100)]
BUGFIX: accidental deletion from start of README
Signed-off-by: Chris Cormack <crc@liblime.com>
MJ Ray [Thu, 6 Sep 2007 15:00:45 +0000 (16:00 +0100)]
BUGFIX: set all configuration keys - die terminated the hash
Signed-off-by: Chris Cormack <crc@liblime.com>
MJ Ray [Thu, 6 Sep 2007 14:46:56 +0000 (15:46 +0100)]
New installation instructions and release notes.
Signed-off-by: Chris Cormack <crc@liblime.com>
MJ Ray [Thu, 6 Sep 2007 14:46:55 +0000 (15:46 +0100)]
Add missing auto_install features to new installer
Signed-off-by: Chris Cormack <crc@liblime.com>
MJ Ray [Thu, 6 Sep 2007 13:56:03 +0000 (14:56 +0100)]
Add configuration file helper to the installer
Signed-off-by: Chris Cormack <crc@liblime.com>
MJ Ray [Thu, 6 Sep 2007 13:56:02 +0000 (14:56 +0100)]
Do not pack the git repository
Signed-off-by: Chris Cormack <crc@liblime.com>
Owen Leonard [Tue, 4 Sep 2007 20:07:00 +0000 (15:07 -0500)]
Adding jquery as default js library and staff-global.js for global js functions. Converting form field focus scripts to jquery syntax (use class="focus" for auto-focusing form fields)
Signed-off-by: Chris Cormack <crc@liblime.com>
Owen Leonard [Tue, 4 Sep 2007 19:24:15 +0000 (14:24 -0500)]
Moving inline script blocks to <head> where possible
Signed-off-by: Chris Cormack <crc@liblime.com>
Owen Leonard [Tue, 4 Sep 2007 16:38:31 +0000 (11:38 -0500)]
Cleanup of catalogue files, previously excluded from layout fixes. Some bugs may still remain due to script errors in my installation (results.tmpl, MARCdetail.tmpl, ISBDdetail.tmpl)
Signed-off-by: Chris Cormack <crc@liblime.com>
Owen Leonard [Tue, 4 Sep 2007 15:23:07 +0000 (10:23 -0500)]
Cleanup on Serials. Markup corrections and cleanup, moving script blocks into header, correcting previous incorrect changes to embedded scripts (translator-related stuff)
Signed-off-by: Chris Cormack <crc@liblime.com>
Paul POULAIN [Tue, 4 Sep 2007 13:56:12 +0000 (15:56 +0200)]
BUGFIX (major) : when editing an existing biblio, biblionumber was lost
In Koha 2.2 the biblionumber was an hidden field in the form,
exactly as any other subfield.
As we also stored biblionumber as specific field, it was useless to have it
twice.
with this commit, we restore the biblionumber in the MARC:Record in TransformHtml2Marc
Signed-off-by: Chris Cormack <crc@liblime.com>
Paul POULAIN [Tue, 4 Sep 2007 09:33:02 +0000 (11:33 +0200)]
BUGFIX : due to the new template structure, the up.png button has moved
Signed-off-by: Chris Cormack <crc@liblime.com>
Paul POULAIN [Tue, 4 Sep 2007 09:33:01 +0000 (11:33 +0200)]
BUGFIX : missing <!-- /TMPL_IF -->
Signed-off-by: Chris Cormack <crc@liblime.com>
Paul POULAIN [Tue, 4 Sep 2007 09:33:00 +0000 (11:33 +0200)]
determining language for OPAC correctly, until new template structure has been ported to OPAC
Signed-off-by: Chris Cormack <crc@liblime.com>
Paul POULAIN [Tue, 4 Sep 2007 09:32:59 +0000 (11:32 +0200)]
BUGFIX : deal with repeatable values when retrieving a z3950 biblio
Signed-off-by: Chris Cormack <crc@liblime.com>
Chris Cormack [Tue, 4 Sep 2007 08:13:50 +0000 (03:13 -0500)]
Test for C4::Branch
Just skeletal at this stage, actual tests need to be added
Signed-off-by: Chris Cormack <crc@liblime.com>
Paul POULAIN [Mon, 3 Sep 2007 12:48:48 +0000 (14:48 +0200)]
determining theme/language path
until the modules/structure has been ported to OPAC, this quick hack make the theme/language determination work for both OPAC & intranet
Signed-off-by: Chris Cormack <crc@liblime.com>
Paul POULAIN [Mon, 3 Sep 2007 08:12:24 +0000 (10:12 +0200)]
french translation updated
Signed-off-by: Chris Cormack <crc@liblime.com>
Paul POULAIN [Mon, 3 Sep 2007 08:10:22 +0000 (10:10 +0200)]
updating french translation
Signed-off-by: Chris Cormack <crc@liblime.com>
Paul POULAIN [Tue, 14 Aug 2007 15:43:24 +0000 (17:43 +0200)]
removing a lot of useless files in misc
Signed-off-by: Chris Cormack <crc@liblime.com>
Paul POULAIN [Mon, 3 Sep 2007 08:20:35 +0000 (10:20 +0200)]
adding Algorithm::CheckDigits dependancy, for barcode printing
Signed-off-by: Chris Cormack <crc@liblime.com>
Paul POULAIN [Mon, 3 Sep 2007 08:20:41 +0000 (10:20 +0200)]
commenting Smart::Comments
Signed-off-by: Chris Cormack <crc@liblime.com>
Paul POULAIN [Mon, 3 Sep 2007 08:20:40 +0000 (10:20 +0200)]
some spelling fixes
in 2 english templates and a french plugin
Signed-off-by: Chris Cormack <crc@liblime.com>
Paul POULAIN [Mon, 3 Sep 2007 08:20:39 +0000 (10:20 +0200)]
BUGFIX : get available language and theme
Signed-off-by: Chris Cormack <crc@liblime.com>
Joshua Ferraro [Thu, 30 Aug 2007 19:59:06 +0000 (14:59 -0500)]
fixing help feature with new template structure
Signed-off-by: Chris Cormack <crc@liblime.com>