[koha-commits] main Koha release repository branch master updated. v3.14.00-1037-ge88117b

Sat May 3 20:10:15 CEST 2014

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  e88117b5fab293137bb74f57095a1ad1cdb7dbfa (commit)
       via  62d6b44ada4b942cd7668bd0e1fcc7b50b1fe320 (commit)
       via  bc57a22c462e15a02bf4648bcbc349604f155061 (commit)
       via  772c095ea31a45743dd6bdefeda576e95808f67c (commit)
       via  efdde38768c71105d56bb33b19c3fe335edea0a8 (commit)
       via  4de746a65ace55f78affb8474c45c2129d4620a7 (commit)
       via  c0569f0b1e3d955869db411fc7456e6e7722dbd7 (commit)
       via  30e94f0c53723355e331d02e1437897cc25d7d62 (commit)
       via  bd5d32731816d2ddd7430f1f59f29bb8c7476f6f (commit)
       via  4ba1f40f30e525066b95ddf5c25ec0dc4fe28aca (commit)
       via  56f3c32fe31c087ea82ae5661ca22cbc3671be34 (commit)
       via  86be6d7550ca048d19886797ee63bfafafe8fe0a (commit)
      from  c4f17650132c9b74aa56c40a3a2bec2bdbc4477e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e88117b5fab293137bb74f57095a1ad1cdb7dbfa
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Feb 14 09:53:41 2014 -0500

    Bug 11763 - Consolidate fund action links into menu

    This patch moves the fund Edit/Delete/Add child links on the fund view
    into a pop-up menu, allow the table to be more compact and the links to
    be more distinct.

    To test you must apply the patches on Bug 11578 if necessary.

    Apply the patch and view the funds list page (Administration -> Funds).
    For each line there should be an "Actions" menu containing the
    Edit/Delete/Add cihld links. Each should function correctly. Test with
    inactive budgets shown and hidden.

    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    It is unusual to open the action list above the button, but it works.

    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 62d6b44ada4b942cd7668bd0e1fcc7b50b1fe320
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Sat May 3 18:32:34 2014 +0000

    Bug 11578: (follow-up) fix JavaScript error

    Fix error that can occur when using the DataTable filter
    to filter the table down to just one fund.

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit bc57a22c462e15a02bf4648bcbc349604f155061
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Apr 30 12:34:08 2014 +0200

    Bug 11578: (follow-up) fix budgets grouping

    If 2 budgets (budget periods) have the same description, the funds will
    be grouped into the same "block".
    This patch adds a distinction adding the id of the budget next to the
    description.

    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 772c095ea31a45743dd6bdefeda576e95808f67c
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Apr 30 12:12:07 2014 +0200

    Bug 11578: (follow-up) fix funds grouping

    The datatables sort options were wrong.
    The funds for a budget could be ungrouped.
    To reproduce:
    - Create 3 budgets A, B, C.
    - Create 1 or more funds for A, B, C
    - Mark B and C as inactive.
    - Create another fund for A
    - Go on the fund list view, click on "show inactive funds"
    => The last fund is not grouped without other funds of budget A.

    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit efdde38768c71105d56bb33b19c3fe335edea0a8
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Apr 30 11:54:29 2014 +0200

    Bug 11578: (follow-up) fix show inactive link

    Before this patch, the inactive funds were displayed by default.
    The active funds should be displayed by default.

    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 4de746a65ace55f78affb8474c45c2129d4620a7
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Mon Apr 28 19:52:29 2014 +0200

    Bug 11578: QA follow-up

    This patch removes the error raised by tt_valid
     FAIL   koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
       FAIL   tt_valid
                    lines 310

    Actually, it fails because translate script does not match strings in
    attribute value. In this case, we don't want to translate. This fix is
    not necessary.

    This patch also adds the licence for the new jQuery treetable plugin.

    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit c0569f0b1e3d955869db411fc7456e6e7722dbd7
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Tue Apr 22 16:03:33 2014 +0200

    Bug 11578: (follow-up) hide filters if a budget (budgetperiod) is chosen

    If a budget_period_id is given, the filters should not be displayed.
    Moreover, it does not make sense to display the links for
    displaying/hiding inactive budgets in this case.

    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 30e94f0c53723355e331d02e1437897cc25d7d62
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Fri Feb 14 10:39:41 2014 +0100

    Bug 11578: (follow-up) align budget names

    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit bd5d32731816d2ddd7430f1f59f29bb8c7476f6f
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Fri Feb 14 10:38:35 2014 +0100

    Bug 11578: (follow-up) hide inactive budgets by default

    This patch hides inactive budgets by default.
    They can be shown/hidden using 2 new links "Hide/Show inactive budgets".

    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 4ba1f40f30e525066b95ddf5c25ec0dc4fe28aca
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Fri Jan 17 15:35:09 2014 +0100

    Bug 11578: (follow-up) add some CSS

    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 56f3c32fe31c087ea82ae5661ca22cbc3671be34
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Fri Jan 17 15:29:18 2014 +0100

    Bug 11578: Improve the funds list view

    The current funds list view does not allow to search in the table and
    the ergonomics of the page is quite bad.

    This patch add the datatables plugin combined to the treetable plugin in
    order to offer a better view of the budgets/funds.

    Test plan:
    - Verify there is no regression on this page: try to add/modify/delete a
    fund and a budget.
    - Verify the funds hierarchy is correctly displayed.
    - Filter the funds using the branch and the budget filters.

    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 86be6d7550ca048d19886797ee63bfafafe8fe0a
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Fri Jan 17 15:24:37 2014 +0100

    Bug 11578: Upgrade the treetable jquery plugin

    This patch upgrade the treetable jquery plugin to the last version
    (3.1.0).
    It is only used on the funds list view.

    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

-----------------------------------------------------------------------

Summary of changes:
 C4/Budgets.pm                                      |    2 +-
 admin/aqbudgets.pl                                 |   98 ++--
 .../jquery/plugins/treetable/jquery.treetable.js   |  620 ++++++++++++++++++++
 .../treetable/stylesheets/jquery.treetable.css     |   36 ++
 .../stylesheets/jquery.treetable.theme.default.css |   83 +++
 .../plugins/treetable/stylesheets/screen.css       |   28 +
 koha-tmpl/intranet-tmpl/prog/en/css/datatables.css |    7 +
 .../intranet-tmpl/prog/en/css/staff-global.css     |    6 +
 .../treetable/images/toggle-collapse-dark.png      |  Bin 2886 -> 0 bytes
 .../treetable/images/toggle-collapse-light.png     |  Bin 2864 -> 0 bytes
 .../treetable/images/toggle-expand-dark.png        |  Bin 2894 -> 0 bytes
 .../treetable/images/toggle-expand-light.png       |  Bin 2863 -> 0 bytes
 .../plugins/treetable/jquery.treeTable.min.js      |   13 -
 .../treetable/stylesheets/jquery.treeTable.css     |   43 --
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt   |    3 +
 .../prog/en/modules/admin/aqbudgets.tt             |  262 +++++----
 16 files changed, 984 insertions(+), 217 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/plugins/treetable/jquery.treetable.js
 create mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/plugins/treetable/stylesheets/jquery.treetable.css
 create mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/plugins/treetable/stylesheets/jquery.treetable.theme.default.css
 create mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/plugins/treetable/stylesheets/screen.css
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/treetable/images/toggle-collapse-dark.png
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/treetable/images/toggle-collapse-light.png
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/treetable/images/toggle-expand-dark.png
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/treetable/images/toggle-expand-light.png
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/treetable/jquery.treeTable.min.js
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/treetable/stylesheets/jquery.treeTable.css

hooks/post-receive
-- 
main Koha release repository