Attachment #136895 for bug #30952

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




        }

        tbody {

            border-top: 2px solid #A19B9E;

            td {

                    display: none;
                }
            }
        }

            .dropdown-menu{
                background-color: #F3F4F4;

                a{
                    color: #000;

                    &:hover,
                    &:focus{
                        background-image: none;
                        background-color: #F3F4F4;
                    }
                }
            }
        }
    }

    /* Row grouping */

td,
th {
    //border-bottom: 1px solid $table-border-color;
    //border-left: 1px solid $table-border-color;
    padding: .2em .9em;
}

td {
    background-color: #FFFFFF;
    vertical-align: top;
    text-align: center;

    &.actions {
        white-space: nowrap;

.dataTables_wrapper {
    .dataTables_processing {
        background-color: #F4F8F9;
        border: 2px solid #538200;
        border-radius: 3px;
        box-shadow: 2px 2px 3px 1px rgba(0, 0, 0, .2);
        color: #333;




}

.panel {
    //border: 1px solid #B9D8D9;
    //border-radius: 4px;
    //box-shadow: none;
    //padding: 0;
    display: none;
    //margin: 1em 0;
    z-index: 1;


    height: 100%;
    width: 100%;
    background-color: #FFF;
    position: relative;
    color: #696969;
    left: 0px;
    top: 0px;
    margin: 0em 1em 1em 0em;
    padding: 1em;
    box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356);
    //display: inline-block;
}

fieldset.brief {




    &:hover,
    &:active {
        color: #000;
        text-decoration: underline;
    }

    &:hover {

        &:link,
        &:visited {
            color: #71B443;
            padding: 6px 25px;
        }

        &.btn-link {

        background-color: transparent;
        color: #696969;
        border: #696969 double 1px;
        margin: 5px;

        //font-family: $font-main;
        font-family: 'Poppins', sans-serif;
        //box-shadow: inset 0 1px 0 rgb(255 255 255 / 15%), 0 1px 1px rgb(0 0 0 / 8%);
        display: inline-block;
        margin-bottom: 0;
        font-weight: normal;
        text-align: center;
        white-space: nowrap;

    &.clear_date {
        color: #418940;
        font-size: 130%;
        vertical-align: middle;

        &:hover {
            color: #71B443;

        background-image: none;
        padding: 6px 12px;
        font-size: 12px;
        //line-height: 1.42857143;
        border-radius: 4px;
        -webkit-user-select: none;
        -moz-user-select: none;

        background-color: transparent;
        border: none;
        display: inline-block;
        margin: 5px 10px;
        color: #696969;

        &:hover{
            text-decoration: none;
        }

        &:active{
            border: none;
        }
    }
}

#addauth{
    color: #fff;
    background-color: #71B443;
}

#resetZ3950Search{

        margin: .5em 0;
    }

    .radio, .checkbox {
        margin: 0;
    }

    p{
        margin: 0;
    }

    fieldset {
        &.brief {
            padding: 1.4em 1.7em;
            //height: auto;
            width: 100%;
            left: 0px;

            overflow: auto;
            //white-space: nowrap;
            height: auto;
            max-height: 500px;


            &::-webkit-scrollbar {
                width: 12px;
            }

            &::-webkit-scrollbar-track {
                background: #eeeeee;
                //border-color: #696969;
                //border-radius: 20px;

            }

            &::-webkit-scrollbar-thumb {
                background: #696969;
                border-radius: 20px;
                border: 3px solid #eeeeee;
            }

            button + button,
            input + input {
                margin-left: 5px;

                legend {
                    font-size: 95%;
                    margin: 0;
                    border-bottom: none;
                }

                &.action {


            label {
                margin: .5em 0 0 0;
                border-top : 1px inset #999999;
            }

            li {

                }

                &.radio {
                    padding: .3em 0;

                    input {
                        padding: .3em 0;

div {
    display: block;

    &.menuspe{
        display: inline;
        //align-items: center;
        //justify-content: center;
    }


    &.menuspebas{
        ///display: inline;
        display: flex;
        //-webkit-box-align: center;
        //-ms-flex-align: center;
        align-items: center;
        //-webkit-box-pack: center;
        //-ms-flex-pack: center;
        justify-content: center;
    }

    &.vert{
        display: block;
        float: right;
        top: 0px;
        right: 0;
        position: absolute;
        width: 160px;
        margin-right: 100px;

        li{
            list-style-type: none;
            height: 150px;
            margin-right: auto;
            margin-left: auto;
        }
    }

    &.bas{
        background: transparent url(../img/koha-logo-medium.png) no-repeat center;
        width: 150px;
        background-size: 70%;
        height: 50px;
        margin: 25px;
       // position: inherit;
        bottom: 0px;
        text-align: center;
        display: flex;
        align-items: center;
        justify-content: center;
        position: fixed;
        //right: 0;
        //left: 0;
        z-index: 1030;

        a{
            width: 100%;
            height: 100%;
        }
    }

   /* &.plus{
        display: block;
        background-color: #352C2E;


h5 {
    font-size: 100%;
    //font-weight: bold;
}

h6 {

    font-size: 93%;
    font-weight: bold;
    text-align: center;
    //padding: 5px;
    position: relative;
    left: 0px;
    bottom: 0px;

}

p {
    margin: .7em 0;
}

strong {

        white-space: nowrap;
        vertical-align: middle;
        touch-action: manipulation;
        min-width: 90px;
        width: auto;
        cursor: pointer;
        background-image: none;
        padding: 6px 12px;

        display: inline-block;
        font-size: inherit;
        line-height: 1.42857143;
        //padding: .3em .8em;
        margin: 5px;
        text-align: center;
        text-shadow: 0 1px 0 #fff;
        vertical-align: middle;

}

.col-sm-3 {
    width: 25%;
}

#area-news{

}

.col-sm-9 {
    width: 75%;
}


.biglinks-list{
    padding: 0px;
    margin: 10px 30px;
    align-items: center;
    height: 150px;

    li{
        list-style-type: none;
        display: flex;
        float: left;
        text-align: center;
        margin-bottom: 5px;
        padding: 10px;
        //display: flex;
        align-items: center;
        justify-content: center;
        flex-wrap: wrap;
        width: 150px;
        height: 150px;
        margin-right: auto;
        margin-left: auto;
    }
}

.accueil{
    text-align: center;
    //display: block;
    display: table;
    -webkit-box-sizing: content-box;
    box-sizing: content-box;
    width: 25px;
    height: 25px;
    margin: 0 1em 5px 1em;
    padding: 5px;
    border: solid 3px #71B443;
    border-radius: 50%;
    text-decoration: none;
    font-family: verdana, arial;

    h1 {
        font-size: 150%;
        font-weight: normal;
    }

    i{
        text-align: center;
        //max-height: 100%;
        //max-width: 100%;
        color: #fff;
        border: solid 3px #71B443;
        border-radius: 50%;
        background-color: #71B443;
        width: 40px;
        height: 40px;
        margin-bottom: 5px;
        margin-left: auto;
        margin-right: auto;
        padding: 5px;
        align-items: center;
        justify-content: center;
        -webkit-box-sizing: content-box;
        box-sizing: content-box;
        //font-weight: bold;
        //font-size: large;
        display: flex;

    }

    &:hover{
        color: #418940;
        //border-color: #418940;
        text-decoration: none;
        //font-weight: bold;

        i{
            background-color: #418940;
            border-color: #418940;
        }

        h1{
            font-weight: bold;
        }
    }
}

#reglages{
    i, img{
        text-align: center;
        //max-height: 100%;
        //max-width: 100%;
        color: #71B443;
        border: solid 3px #71B443;
        border-radius: 50%;
        background-color: transparent;
        width: 40px;
        height: 40px;
        margin-bottom: 5px;
        margin-left: auto;
        margin-right: auto;
        padding: 5px;
        align-items: center;
        justify-content: center;
        -webkit-box-sizing: content-box;
        box-sizing: content-box;
        //font-weight: bold;
        //font-size: large;
        display: flex;

    }

    &:hover{
        color: #418940;
        //border-color: #418940;
        text-decoration: none;
        font-weight: bold;

        i, img{
            border-color: #418940;
            color: #418940;
        }

    }

    img{
        max-width: 30px;
        height: auto;
        padding: 10px;
    }
}



#navmenulist {
    background-color: #e6e6e6;
    width: 100%;
    overflow: auto;
    //white-space: nowrap;
    display: block;
    position: absolute;
    left: 0px;
    max-height: 700px;
    height: auto;

    &::-webkit-scrollbar {
        width: 12px;
      }

    &::-webkit-scrollbar-track {
        background: #eeeeee;
        //border-color: #696969;
        //border-radius: 20px;

    }

    &::-webkit-scrollbar-thumb {
        background: #696969;
        border-radius: 20px;
        border: 3px solid #eeeeee;
    }




    ul {
        margin-bottom: 8.5px;
        margin-left: 0;
        margin-right: 0;
        padding-left: 0px;
       // position: relative;
       // top: 30px;
        
        h5{
            padding-left: 0.5em;
            padding-bottom: 0.5em;
            font-size: 120%;
            margin-top: 15px;
            margin-left: 0;
            margin-right: 0;
            margin-bottom: 5px;
            color: #696969;

            border-bottom: 1px solid #696969;
            //position: absolute;
            //top: 0px;
        }

        &.sousmenu{
            margin-bottom: 13px;
            margin-left: 0;
            margin-right: 0;
            padding-left: 0px;
            position: relative;
            top: 0px;

            li{
                a{
                    font-size: 75%;
                }
            }
        }

        li {
            //border-bottom: 1px solid #352C2E;
            list-style: $nav-menu-bullet;

            left: 0px;
            flex-direction: row;
            width: 100%;
            //height: 2.1em;



            height: auto;

            a {
                //text-decoration: none;

                text-decoration: none;
                padding: 0.5em 0.3em 0.5em 1.2em;

                &.current, &:hover {

                &.current, &.hover {
                    background-color: #F3F4F4;
                    color: #418940;
                    border-left: solid 5px #418940;
                    font-weight: bold;
                }

                &.titre{
                    width: 100%;
                    font-size: 146.5%;
                    font-weight: bold;
                    text-align: center;
                    color: #000;

                    &:hover, &.current{
                        background-color: #e6e6e6;
                        color: #000;
                        border-left: none;
                        font-weight: bold;
                    }
                }
            }
        }
    }
}

#titre{
    width: 100%;
    font-size: 146.5%;
    font-weight: bold;
    margin-top: 0;
    margin-bottom: 0;
    padding: 0.5em 2.6em 0.5em 2.6em;
    color: #000;
    position: absolute;
    top: 0px;
    left: 0px;
}

.main {
    margin-bottom: $language-footer-min-height * 1.5;
    //display: block;
    margin-top: 1em;
}

#login_controls {

        }
    }

    &.nav-tabs {
        border-bottom: 1px solid transparent;
        padding: .2em 1.4em 0 1.4em;
    }



    &.budget_hierarchy {
        margin-left: 0;
        padding-left: 0;

    font-weight: bold;
}




.strong {
    font-weight: bold;
}

        ol,
        li {
            list-style-type: none;
            //margin-bottom: 1.9em;
        }

        span {

        }
    }

    ol{
        li{
            list-style-type: none;
            padding: .3em 0;
        }
    }

    &.rows {
        border: none;
        box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356);
        clear: left;
        float: left;
        font-size: 90%;
        margin: .9em 0 0;
        padding: 0;
        width: 100%;

        fieldset {

            font-weight: bold;
            margin-right: 1rem;
            text-align: right;
            width: auto;
            min-width: 9rem;

            &.error {
                float: none;

            }

            fieldset {
                //margin-left: 10em;

                label {
                    width: 6em;


    .renew_formfield {
        margin-bottom: 1em;
        //itemtype
    }

    .circmessage {

    }
}


/*
#header_search {
    //position : relative;
    //right : - 500px;

                    //top: 0;

                    //position: absolute;
                   // line-height: 40px;
                    top: 0;
                    left: 0;
                    display: flex;

    }
}

*/

#reserves,
#checkouts {
    //border-top: 3px solid #418910;
    padding: 1em;
}



#toolbar,
.btn-toolbar {
    background-color: #f3F4F4;
    border: none;
    border-radius: 5px 5px 0 0;
    margin: 0;

        height: 100%;

        .dropdown-menu {
            /*border-top-width: 1px;
            font-size: 13px;
            background-color: #F3F4F4;
            border: none;
            box-shadow: none;
            position: absolute;*/
            //right: 10px;
            //top: 30px;

            border-top-width: 1px;
            text-align: center;
            padding: 0;
            width: auto;
            font-size: 12px;
            line-height: 1.42857143;
            border-radius: 0px;
            border: 0.5px solid lightgray;
            font-size: 100%;
            background-color: #fff;
            margin: 0;
            box-shadow: 1px 1px 2px 0 rgba(102, 102, 102, .5);
            position: absolute;
            text-decoration: none;
            top: 30px;


            left: auto;
            right: 0;

            a{
                //color: #696969;
                //float: right;
                //padding: .2em .5em;
                //border-bottom: 1px solid #000;
                color: #000;
                display: block;
                padding: 3px 20px;
                clear: both;
                font-weight: normal;
                line-height: 1.42857143;
                white-space: nowrap;
                border-bottom: none;
                float: left;

                &:hover,
                &:focus{
                    //text-decoration: none;
                    //background-color: #F3F4F4;
                    //background-image: none;
                    //font-weight: bold;
                    //border: 1px solid #696969;
                    //border-radius: 4px;



                    text-decoration: none;
                    font-weight: bold;
                    background-color: #fff;
                    background-image: none;

                }
            }
        }

        #patdrop{
            border-top-width: 1px;
            text-align: center;
            padding: 0;
            width: auto;
            font-size: 12px;
            line-height: 1.42857143;
            border-radius: 0px;
            border: 0.5px solid lightgray;
            font-size: 100%;
            background-color: #fff;
            margin: 0;
            box-shadow: 1px 1px 2px 0 rgba(102, 102, 102, .5);
            position: absolute;
            text-decoration: none;
            top: 30px;
            left: -20px;
            right: auto;

            a{
                color: #000;
                display: block;
                padding: 3px 20px;
                clear: both;
                font-weight: normal;
                line-height: 1.42857143;
                white-space: nowrap;
                border-bottom: none;
                float: left;

                &:hover{
                    font-weight: bold;
                    background-color: #fff;
                }
            }

        }

.patroninfo {
    //margin-top: -.5em;
    margin-right: .5em;
    //padding-bottom: 2em;
    padding-top: 1em;
    background-color: #e6e6e6;
    //position: absolute;
    left: -10px;
    width: 100%;
    padding-bottom: 25px;

    h5 {
        //border-right: 1px solid #B9D8D9;
        margin-bottom: 0;
        padding: .5em .9em;
        font-weight: bold;
        color: #000;

        &:empty {
            border-right: 0;
        }

        li{
            &.patrondateofbirth{
                font-size: 75%;
                font-weight: normal;
                list-style-type: none;
                //display: table;
                text-align: center;
            }
        }
    }

    ul {
        border: 0;
        border-bottom: 0;
        border-right: 1px solid #B9D8D9;
        border-top: 0;
        margin: 0;
        padding: 0 .9em;

        li {
            list-style-type: none;
            margin: 0;

        }
    }


    }

    > div {
        //border-right: 1px solid #B9D8D9;
        width: 100%;
    }

    &.is-staff {
        h5 {
            //background-color: #EEE;
        }
    }
}

}

.patroninfo-heading {
  //  background-color: rgba(237, 244, 246, .4);
    padding: .5em;
    margin-bottom: .3em;
    clear: both;

    li {
        list-style-type: none;
    }

}

.btn-toolbar {

    margin-top: .5em;
    display: inline;
    background: transparent url("../img/UIKit/setting.svg") no-repeat scroll 0%;
    background-size: 100%;
    position: relative;
    margin: 3px;
    align-items: center;
    right: 25px;
    opacity: 0.3;

    &:hover{
        opacity: 1;
    }

    a{
        width: 100%;

        &:hover{
            text-decoration: none;
        }
    }
}

.checkin-active-setting {

        background-color: #FFFFFF;
        //border: 1px solid #BCBCBC;
        margin: .4em;
        padding: .4em;

        &:hover {
            background-color: #FFC;


        &[type="submit"] {
            background: #FFF none;
        }

            &.approve{
                background-color: #FEC32C;
                color: #000;
                text-shadow: 0 1px 0 #fff;
                border: none;
                background-image: none;
                margin-top: 5px;

                &:hover,
                &:active,
                &:focus{
                    background-color: #fec22c9f;
                }
            }

            &.deny{
                background-color: transparent;
                color: #696969;
                border: #696969 double 1px;
                margin-top: 5px;
                margin-left: 5px;

                //font-family: $font-main;
                font-family: 'Poppins', sans-serif;
                //box-shadow: inset 0 1px 0 rgb(255 255 255 / 15%), 0 1px 1px rgb(0 0 0 / 8%);
                display: inline-block;
                margin-bottom: 0;
                font-weight: normal;
                text-align: center;
                white-space: nowrap;
                vertical-align: middle;
                touch-action: manipulation;
                //width: 90px;
                cursor: pointer;
                background-image: none;
                padding: 6px 12px;
                font-size: 12px;
                line-height: 1.42857143;
                border-radius: 4px;
                user-select: none;

                &:hover{
                    font-weight: bold;
                    background-color: #f1f1f1;
                    border: #696969 double 1px;
                    text-decoration: none;
                }
            }
        }

        &.flatpickr-input {
            padding: 3px 3px 3px 20px;
        }
    }

    li {
        list-style-position: inside;
    }

    p {
        margin-top: 0;


.approve,
.success {
    background-color: #FEC32C;
    i {
        &.fa {
            color: #418940;

    //border: none;
    padding-left: 5px;
    padding-right: 30px;
    border-radius: 0;
}

.petit-barcode{

    border-width: 1px;
    padding: 5px;
    font-style: italic;
    border-radius: 0;

    font-size: 90%;
    vertical-align: middle;

    }
}

#catalogue_stats_wrapper, #tbl_cash_register_stats_wrapper, #resulttable_wrapper, #numberpatternst_wrapper{
    background-color: #fff;
    margin-top: 20px;
    box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356);
    padding: 20px;
}

#searchresults {
    background-color: #fff;
    margin-top: 20px;
    box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356);
    padding: 20px;
    padding-right: 20px;

    h3{
        padding-top: 2.0em;
        padding-bottom: .7em;
        margin: 0;
        color: #696969;

                font-size: 90%;
                list-style: url("../img/item-bullet.svg");
                padding: .2em 0;
                background-color: #fff;
                box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356);
                color: #000;
                top: 100%;

                &.result_itype_image {
                    list-style: none;

            }
        }
    }

    .dropdown-menu {
        //position: absolute;
        //top: 50px;
        background-color: #fff;
        color: #000;
        top: 100%;

        a{
            color: #000;

            &:hover{
                background-image: none;
                color: #000;
                text-decoration: underline;
                background-color: #fff;
            }
        }
    }
}

.searchheader {

    font-size: 80%;
    margin-top: .5em;
    margin-bottom: .5em;
    padding: 5px;
    width: 100%;
    //padding: .4em 1em .4em 1em;
    color: #696969;

    &.floating {
        border-radius: 0;
        margin-top: 0;

    }

    .btn-group {



#search-facets {
    //border: 3px solid #71B443;
    //border-radius: 4px;

    h4 {
        background-color: #71B443;
        border-bottom: 1px solid #71B443;
        border-radius: 4px 4px 0 0;
        font-size: 90%;
        color: #fff;
        margin: 0;
        padding: .4em .2em;
        text-align: center;

        margin: 0;
        padding: .3em;

        &.cadre{
            border: 3px solid #71B443;
        }

        li {
            font-weight: bold;
            list-style-type: none;

    }
}

#lientype, #multi_hold_submit, #show-picture-upload, #edit_suggester, #expand_all, #collapse_all, #hide_inactive, #show_inactive, #addnewmessageLabel, #results_batch_ops, #highlight_toggle_off, #selectall, #clearall, #highlight_toggle_on, #addColumn, #remove_from_cart, #place_hold, #add_to_list, #batch_modify, #batch_delete, #delColumn, #edit_manager, #addauth, #unset, #UncheckAll, #check-all, #results_batch_ops #uncheck-all, #frameworkactions, #authtypeactions, #modify_sru_fields, #cartsubmit, #z3950submit, #add_manual_restriction{
    color: #71B443;
    padding: .3em;
    border: none;
    background-color: transparent;
    border: none;
    box-shadow: none;
    font-size: 100%;

    &:hover{
        text-decoration: underline;
    }
}

.highlight_toggle{
    color: #71B443;
    padding: .3em;
    border: none;
    background-color: transparent;
    border: none;
    box-shadow: none;
    font-size: 100%;

    &:hover{
        text-decoration: underline;
    }
}


.cover-image {
    display: none;


.advsearch {
    //margin: 0;
    //box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356);
    margin: 0em 1em 1em 0em;

    table {
        border-collapse: separate;

// Override core jQueryUI widgets
.ui-widget-content {
    background: #FFFFFF none;
    border-radius: 4px;
    border: 3px solid #538200;
    color: #222222;
}


.ui-state-default,
.ui-widget-content .ui-state-default,
.ui-widget-header .ui-state-default {
   // background: #F4F8F9 none;
    border: 1px solid #B9D8D9;
    color: #555555;
    font-weight: normal;

    &.ui-widget-header {
        background: none;
        border: 0;
        padding: .2em .9em 0 .9em;
    }
}

.ui-tabs {
    .ui-tabs-panel {
        background: #FFF none;
        border-radius: 4px;
        border: 3px solid #538200;

        fieldset{
            box-shadow: none;
        }
    }
    .ui-tabs-nav {
        li {
            background: #71B443;
            border: none;
            margin-right: .4em;
            //top: 1px;
            border-radius: 4px 4px 0 0;

            &.ui-tabs-active, &.ui-state-hover {
                background-color: #418910;
                border-radius: 4px 4px 0 0;
                border: none;
                border-bottom-width: 0;
                padding-bottom: 0;



            }

        }
    }


    &.ui-widget-content {
        background: transparent none;
        border: 0;

}

.statictabs {

    background-color: #fff;
    margin-top: 20px;
    box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356);
    padding: 20px;

    h3{
        padding-bottom: .7em;
        margin: 0;
        color: #696969;
    }

    td {
        border: none;

        ul {
            li {
                clear: left;
                font-size: 90%;
                list-style: url("../img/item-bullet.svg");
                padding: .2em 0;

                &.result_itype_image {
                    list-style: none;
                    list-style-type: none;
                }

                img {
                    float: left;
                    margin: 3px 5px 3px -5px;
                    max-width: 25px;
                }
            }
        }
    }

    span {
        &.status {
            clear: left;
            color: #900;
            display: block;
        }

        &.unavailable {
            clear: left;
            display: block;
        }
    }


    > ul {
        background: none repeat scroll 0 0 transparent;
        border: 0 none;
    //    border-bottom-left-radius: 4px;
      //  border-bottom-right-radius: 4px;
        //border-top-left-radius: 4px;
       // border-top-right-radius: 4px;
        color: #222222;
        font-size: 100%;
        font-weight: bold;

        }

        li {
            //background: none repeat scroll 0 0 #E6F0F2;
            //border: 1px solid #B9D8D9;
        //    border-bottom: 0 none;
            border-top-left-radius: 4px;
            border-top-right-radius: 4px;
            border-bottom-right-radius: 0;
            border-bottom-left-radius: 0;
           // border-radius: 0;
            //color: #555555;
            float: left;
            font-weight: normal;
            list-style: none outside none;

            top: 1px;
            white-space: nowrap;

            background: #71B443;
         //   border: none;
            //margin-right: .4em;
            //top: 1px;
          //  border-radius: 4px;

            &.active, &:hover {
                //background-color: #FFFFFF;
                //color: #212121;
                font-weight: normal;
                padding-bottom: 1px;

                background-color: #418910;
                border: none;
                border-bottom-width: 0;
                //padding-bottom: 0;

                a {
                    background: none repeat scroll 0 0 transparent;
                    color: #fff;
                    cursor: text;
                    //font-weight: bold;
                    outline: 0 none;
                    top: 1px;
                }
            }

            a {
                color: #fff;
                cursor: pointer;
                float: left;
                padding: .5em 1em;
                text-decoration: none;

                &:hover {
                    //background-color: #EDF4F5;
                    border-top-left-radius: 4px;
                    border-top-right-radius: 4px;
                    //color: #538200;
                }
            }
        }


    .tabs-container {
        background: none repeat scroll 0 0 transparent;
        border: 3px solid #418910;
        border-radius: 4px;
        border-bottom-right-radius: 4px;
        color: #222222;
        display: block;
        padding: 1em 1.4em;

    margin-top: 5px;
        .ui-tabs-panel {
            background: #FFF none;
            border-radius: 4px;
            border: 3px solid #538200;

            fieldset{
                box-shadow: none;
            }
        }
}


    }
}

.navbar{
    //background-image: linear-gradient(to right, #352C2E , #3A4F2A);
    background-color: #352C2E;
    //display: inline-block;
   // float: left;
    width: 100%;
   // overflow: hidden;
}

.navbar-header, .collapse{
  /*  //background-image: linear-gradient(to right, #352C2E , #3A4F2A);
    //background-color: #352C2E;
    box-shadow: none;
    height: 50px;
   // width: 100%;*/
    padding-left: 10px;
    padding-right: 10px;
    /*display: inline-block;*/
    float: left;

    a{
        color: #fff;
      //  display: inline-block;
      line-height: 40px;
    }
}

.navbar-head{
   // top: 0px;
    //position: absolute;
    //right: 5px;
    overflow-x: hidden;
    display: block !important;
    height: auto !important;
}

#logo {
    background: transparent url("../img/UIKit/picto-koha.svg") no-repeat scroll 0%;
    margin: .75em 0em .75em 0em;

        .residentsearch {
            border: 0;
            //border-bottom: 1px solid #85CA11;
            cursor: text;
            padding: 0 0 .2em;
            background-color: transparent;
        }

        .inactive{
            display: none;
        }

        #buttonssearch,#header_search{
            padding: 10px;
            border-radius: 28px;
            //height: 2.2em;
            height: 30px;

            z-index: 1;
        }

     /*   #containersearch{
            position: relative;
            top : 10px;
            left: 0px;*/
    
        #header_search{
            //position: relative;
            //top : 10px;
            //left: 0px;

            position: relative;
            left: 0px;
            top: 0px;
            //line-height: 40px;
            overflow: hidden;
            display: block;
            margin: 10px 0;
        }

        #submit, #autocsubmit{
            background: transparent url("../img/UIKit/arrow.svg") no-repeat scroll 0%;
            position: absolute;
          //  right : 0px;
            right : -65px;
            top: 0px;
            width: 25px;
            height: 30px;
            border: none;
            padding-left: 5px;
            padding-right: 5px;
            margin: 0;
            display: inline;
        }

        #containersearch,
        #containersearch:not(.fold) #buttonssearch{
            width: 500px;

        }


        .ui-tabs-nav {
            background-image: linear-gradient(to right, #418940, #71B443);
            border-radius: 28px;
            position: absolute;
            top: 0;
            left: 0;
            height: 100%;
            display: flex;
            justify-content: space-around;
            align-items: center;
            color: white;
            box-shadow: 0px 0px 3px 0px #0000004d;

            li {
                background: transparent;
                border: none;
               // margin-right: .4em;
                //top: 1px;
                border-radius: 0;

                &.ui-tabs-active, &.ui-state-hover {
                    background-color: transparent;
                    border-radius: 4px 4px 0 0;
                    border: none;
                    border-bottom-width: 0;
                    padding-bottom: 0;

                    a {
                        color: #FFF;
                        //font-weight: bold;
                        cursor: pointer;
                        padding: 3px;
                        font-size: .9em;
                    }


                }
            }
        }

        &.ui-widget-content {
            background: transparent none;
            border: 0;
        }

        .ui-state-default {//le menu de la barre de recherche du haut
            a {
                color: #fff;
                cursor: pointer;
                padding: 3px;
                font-size: .9em;

                &:link,
                &:visited {
                    color: #fff;
                    padding: 3px;
                    background-color: transparent;
                }
            }
        }

        .ui-state-hover, .ui-state-active {
            a {
                font-size: 1em;
               // box-shadow: inset 0px 0px 8px 0px rgba(0, 0, 0, 0.10);
                cursor: pointer;
                padding: 3px;
                font-size: .9em;
                background-color: transparent;

                i{
                    border-bottom: 2px solid #fff;
                    padding-bottom: 2px;
                }
            }
        }


    .ui-widget {
        font-family: inherit;
        font-size: inherit;

        input,
        select,
        textarea,
        button {
            font-family: inherit;
            font-size: inherit;
        }
    }









        
        .buttonsearch{
            display: none;
        }

        .buttonsearch:hover,
        .buttonsearch.active{
          //  border-bottom: 2px solid white;
            margin-right: 0;
            font-size: 0.85em;
            cursor: text;
            padding: 0.25em;
            //border-bottom: 2px solid transparent;
            margin: 0;
          //  transition: 0.25s;
            display: inline-block;
            overflow: hidden;
            opacity: 1;
        }
/*
        .buttonsearch:hover,
        .buttonsearch.active{
            border-bottom: 2px solid white;

            //width: 1000px;
        }

        #containersearch.fold .buttonsearch:not(.active){*/
    
        input{
            display: none;
        }
    
        input{


            &.focus{
                outline-offset: 0px;
                outline: 1px black;
                float: right;
               // width: calc(301px);


            //  width: 0%;
                height: 30px;
                border-radius: 17px;
                padding-left: 2em;
                padding-right: 1.5em;
                border: none ;
                margin-left: 0px;
              //  transition: 0.5s;

                position:absolute;
                top: 0px;
                right: 30px;
                z-index	: -2;
                display: inline-block;

                letter-spacing: normal;
                word-spacing: normal;
                text-transform: none;
                text-indent: 0px;
                text-shadow: none;
                text-align: start;
                cursor: text;
                font: 400 13.3333px Arial;

                &::placeholder{
                    font-size: 85%;
                }
            }

            &.titre{
                float: none;
                position: relative;
                width: 170px;
                bottom: 15px;
                right: -115px;
            }

        }

    
        #header_search.fold .buttonsearch:not(.active){
            width: 0px;
            opacity: 0;
            margin: 0;

        #backsearch{
            display: none;
            font-size: 1em;

        }

       /* .iconsearch{
            display: none;
            font-size: 1em;
        }*/
    
        #header_search.fold #backsearch{
            display: inline-block;
            cursor: pointer;
        }

     /*   .iconsearch{
            display: inline-block;
            cursor: pointer;
            padding: 3px;
            font-size: .9em;

            &:hover{
                font-size: 1em;
                box-shadow: inset 0px 0px 8px 0px rgba(0, 0, 0, 0.10);
             //   border: 1px solid #fff;
                // border-radius: 50%;

            }
        }*/

        .description{
            opacity: 0.6;
            max-width: 50em;

        &.open {
            li {
                background-color: #352C2E;
                //padding: 2px;

                a {
                    font-weight: normal;
                    padding: 0 15px;
                    font-size: 13px;
                    
                    &:hover,
                    &:focus{
                        background-color: #352C2E;
                        background-image: none;
                        text-decoration: underline;
                    }
                }

        }

        a {
            //font-weight: bold;
            //padding-bottom: .4em;
            //padding-top: .4em;
            line-height: 40px;

    left: 0px;
    top: 0px;
    //white-space: pre;
    //flex-direction: column;
    height: 50px;
    //display: block;


    &.btn-link {
        border: 0;
    }

    &.cancel {

        background-color: transparent;
        color: #696969;
        border: #696969 double 1px;
        margin-top: 5px;
        margin-left: 5px;

        //font-family: $font-main;
        font-family: 'Poppins', sans-serif;
        //box-shadow: inset 0 1px 0 rgb(255 255 255 / 15%), 0 1px 1px rgb(0 0 0 / 8%);
        display: inline-block;
        margin-bottom: 0;
        font-weight: normal;
        text-align: center;
        white-space: nowrap;
        vertical-align: middle;
        touch-action: manipulation;
        width: 90px;
        cursor: pointer;
        background-image: none;
        padding: 6px 12px;
        font-size: 12px;
        line-height: 1.42857143;
        border-radius: 4px;
        user-select: none;

        &:hover{
            font-weight: bold;
            background-color: #f1f1f1;
            border: #696969 double 1px;
            text-decoration: none;
        }
    }
}
#merge-patrons{
    padding: 0 25px;

}

.pat{
   /* background-color: transparent;
    border: none;
    display: inline-block;
    margin: 0 10px;

    font-size: 105%;

    &:hover{
        //text-decoration: underline;
        background-color: #d8d8d8;
    }

    &:active{
        border: none;
    }


    &:focus{
        background-color: #d8d8d8;
    }*/



    font-family: 'Poppins', sans-serif;
    font-weight: normal;
    text-align: center;
    white-space: nowrap;
    vertical-align: middle;
    -ms-touch-action: manipulation;
    touch-action: manipulation;
    cursor: pointer;
    box-shadow: none;
    background-image: none;
    padding: 6px 12px;
    font-size: 12px;
    //line-height: 1.42857143;
    border-radius: 4px;
    -webkit-user-select: none;
    -moz-user-select: none;
    -ms-user-select: none;
    user-select: none;
    font-size: 105%;
    background-color: transparent;
    border: none;
    display: inline-block;
    margin: 5px 10px;
    color: #696969;

    &:hover, &:focus{
        background-color: #d8d8d8;
    }

    &:active{


.mot{
    margin-right: 0;
    //padding-right: 0;
}

.fleche{
    margin-left: 0;
    //border: 1px solid #000;
    border-radius: 4px;
    padding: 0 5px 0 3px;


    color: #000;
    text-shadow: 0 1px 0 #fff;
    border: none;
    background-image: none;
    margin: 5px;

    &:hover,
    &:active,

    color: #000;
    text-shadow: 0 1px 0 #fff;
    border: none;
    background-image: none;
    margin: 5px;

    &:hover,
    &:active,

}

.tab-content {
 /*   background-color: #FFF;
    border: 1px solid #B9D8D9;
    border-top-width: 0;*/
    border: 3px solid #538200;
    border-radius: 4px;
    //border-top-width: 0;
    padding: 1em;
}

.nav-tabs {
    > li {
        > a {
            background-color: #71B443;
            //border: none;
           // border-radius: 4px;
            color: #fff;
            line-height: 1.42857143;
            margin-right: .4em;
            padding: .5em 1em;

            &:hover {
                background-color: #538200;
                border-radius: 4px 4px 0 0;
                border: 1px solid #538200;
                text-decoration: none;
                color: #fff;
            }
        }


            a,
            a:hover,
            a:focus {
                background-color: #538200;
                border-radius: 4px 4px 0 0;
                color: #fff;
                //border: none;
                //border-bottom-color: transparent;
                //color: #000;
                cursor: default;
                font-weight: bold;
            }


        label{
            color: #fff;
            font-weight: bold;
        }
    }


}

.loggedin-menu-label {
    color: #fff;
    font-size: 12px;
    line-height: 1.42857143;
    padding: 4px 12px;
    white-space: nowrap;

    span {
        color: #fff;
        font-weight: bold;
        left: 15px;
        top: 0;
    }

    &.divider {

    cursor: pointer;
    float: right;
    margin: .0em .4em .0em .4em;
    padding: .1em .5em .1em .5em;
}

#lastborrower-window {

/* ==== MODULE LINKS - Start ==== */
.buttons-list {
    // List containing the module links
    margin: 30px 0;
    padding: 0;
    margin-left: 15px;

    li {
        // Standard attributes for the list elements
        height: 60px;
        list-style-type: none;
        display: table;
        margin-bottom: 15px;

        a {
            &.menucirc{
                display: block;
                height: 60px;
                margin: 5px;
                //font-size: 150%;
                width: 30px;
                height: 30px;
                margin: 0 5px 14px 1em;
                padding: 5px;
                border: solid 3px #71B443;
                border-radius: 50%;
                text-decoration: none;
                font-family: verdana, arial;
                font-weight: bold;
                font-size: large;
                color: #000000;
                background-color: #F3f4F4;
                align-items: center;
                justify-content: center;

                i{
                    &.fa{
                    color: #fff;
                    border-radius: 50%;
                    background-color: #71B443;
                    width: 40px;
                    height: 40px;
                    margin: 5px;
                    padding: 10px;
                    -webkit-box-sizing: content-box;
                    box-sizing: content-box;
                    align-items: center;
                    justify-content: center;
                    display: inline;
                    border: solid 3px #71B443;
                    }

                }

                h1 {
                    font-size: 150%;
                    font-weight: normal;
                    display: inline;
                }

                &:hover{
                    color: #418940;
                    text-decoration: none;


                    i{
                        &.fa{
                            background-color: #418940;
                            border: solid 3px #418940;
                        }
                    }
                border-radius: 6px;
                box-sizing: content-box;
                color: #000000;
                display: block;
                font-size: 110%;
                font-weight: bold;
                margin: .5em 0;
                max-width: 260px;
                padding: 8px;
                text-decoration: none;

                    h1{
                    font-weight: bold;
                    }
                    color: #538200;*/
                }
            }
        }

}

.header-menu-link {
   // background-color: #352C2E;
    display: none;
   // font-weight: bold;
    padding: .4em .6em;
}


    //position: absolute;
    //right: 5px;
    //top: 0;
   // position: relative;
    //left: 0px;
    top: 0px;
    position: absolute;
    right: 5px;

    //background-color: #352C2E;
 //   box-shadow: none;
   // height: 50px;
   // width: 100%;
   // padding-left: 10px;
    //padding-right: 10px;
  //  display: inline-block;
    //float: left;
}

div#makechart ol li {


    #header {
        background-color: #352C2E;
       // border: 1px solid #352C2E;
        margin-bottom: 1em;

        a {

            &:hover {
                text-decoration: underline;
                color: #FFF;
                background-color: #352C2E;
                background-image: none;
            }
        }


            box-shadow: unset;
            float: none;
            left: auto;
            position: initial;
            right: auto;

            &.dropdown-menu {
                display: block;
               // background-color : #352C2E;
            }
        }

        .dropdown-menu-brown {
            li {
              //  background-color: #352C2E;

                a {
                    //color: #fff;
                    &:hover {
                        color: #FFF;
                        text-decoration: underline;

                    }
                }
            }

    #user-menu {
        .open {
            .dropdown-menu {
                background-color: #352c35;
               // border: 1px solid #ccc;
                position: absolute;
            }
        }



    #helper {
        i {background-color: #352C2E;
            box-shadow: none;
            height: 50px;
           // width: 100%;
            padding-left: 10px;
            padding-right: 10px;
            display: inline-block;
            float: left;
            display: none;
        }





[% PROCESS 'patronfields.inc' %]
<!-- Begin Acquisitions Resident Search Box -->

<div id="header_search" class="fold">
    <div id="supplier_search" class="residentsearch">
        <form name="findsupplier" action="/cgi-bin/koha/acqui/booksellers.pl" method="post">
            <input type="text" name="supplier" id="supplier" class="focus" placeholder="Search vendors" />
            <input type="submit" id="submit" value="" />
        </form>
    </div>

    <div id="orders_search" class="residentsearch">
        <form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">
            <input type="text" id="title" name="title" class="focus" value="[% title | html %]" placeholder="Title" />
            <input type="text" id="title" name="name" class="focus" value="[% name | html %]" placeholder="Vendor" />
            <input type="hidden" id="do_search" name="do_search" value="do" />
            <span class="filteraction" id="filteraction_off" style="display:none"> <a id="plus" href="#" class="toggle_element" data-element="#filters,.filteraction">[-]</a></span>
            <span class="filteraction" id="filteraction_on"> <a id="plus" href="#" class="toggle_element" data-element="#filters,.filteraction">[+]</a></span>
            <input value="" id="submit" type="submit" /> <a href="/cgi-bin/koha/acqui/histsearch.pl">Advanced search</a>
            
            <p id="filters" class="plus" style="display:none">
                <input type="text" name="basket" id="basket" placeholder="Basket" />
                <input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" placeholder="Invoice number" />
            </p>
        </form>
    </div>

    <ul>
        <li><a id="button_1" title="Vendor search" onclick="clique(this)" class="iconsearch" href="#supplier_search"><i class="fa fa-upload"></i></a></li>
        <li><a id="button_2" title="Orders search" onclick="clique(this)" class="iconsearch" href="#orders_search"><i class="fa fa-download"></i></a></li>

        <span id="button_1" class="buttonsearch active">Vendor search</span>
        <span id="button_2" class="buttonsearch">Orders search</span>
    </ul>
</div>



<script type="text/javascript">
    function focusInput(){
        document.getElementsByClassName('head-searchbox').focus();
    }

    function toggle(elem){style="width: calc(301px);"
        var buttonssearch = document.getElementsByClassName('active');
        for (var i = buttonssearch.length - 1; i >= 0; i--) {
            buttonssearch[i].classList.remove('active');

            fold();
        }else{//Back
            document.getElementById('button_1').classList.add('active');
            document.getElementById('header_search').classList.remove('fold');
            document.getElementsByClassName('head-searchbox').style = '';
        }

        focusInput();
    }

    function clique(elem){
        var buttonssearch = document.getElementsByClassName('buttonsearch');
        var iconssearch = document.getElementsByClassName('iconsearch');
        var inputssearch = document.getElementsByClassName('head-searchbox');
        for (var i = buttonssearch.length - 1; i >= 0; i--) {
            buttonssearch[i].classList.remove('active');
            if (elem == iconssearch[i]){
                buttonssearch[i].classList.add('active');
            }
        }

        for (var i = inputssearch.length - 1; i >= 0; i--) {
            inputssearch[i].classList.remove('focus');

            if (elem == iconssearch[i]){
                inputssearch[i].classList.add('focus');

                var offsetWidth = buttonssearch[i].offsetWidth +5;
                inputssearch[i].style = "width:calc(355px - "+offsetWidth+"px)";
            }
        }

        focusInput();
        fold();
    }

    function fold(){
        document.getElementById('header_search').classList.add('fold');
       // document.getElementsByClassName('head-searchbox').style = "width:calc(355px - 100px)";
        setTimeout(
            function(){
                var offsetWidth = document.getElementsByClassName('buttonsearch').offsetWidth +5;
                document.getElementsByClassName('head-searchbox').style = "width:calc(355px - "+offsetWidth+"px)";
            }
        , 250);
    }

    $('.btn').click(function(){
    if($(this).hasClass('active')){
        $(this).removeClass('active')
    } else {
        $(this).addClass('active')
    }
});



</script>

<!-- /header_search -->





<div id="header_search">
    [% INCLUDE 'patron-search-box.inc' %]
    
    [% IF (CAN_user_circulate_circulate_remaining_permissions) %]
    <div id="checkout_search" class="residentsearch">
        <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
            <input id="inputsearch" class="inpu focus" type="text" autocomplete="off" placeholder="Enter patron card number or partial name"  />
            <input type="hidden" name="quicksearch" value="1" />
            <input value="" type="submit" id="submitsearch" />
        </form>
    </div>

    <div id="checkin_search" class="residentsearch">
        <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
            <input name="barcode" id="inputsearch" class="inpu" accesskey="r" type="text" placeholder="Scan a barcode to check in" />
            <input value="" type="submit" id="submitsearch" />
        </form>
    </div>

    <div id="renew_search" class="residentsearch">
        <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
            <input name="barcode" id="inputsearch" class="inpu" type="text" placeholder="Scan a barcode to renew" />
            <input value="" type="submit" id="submitsearch" />
        </form>
    </div>
        </div>
    [% END %]

    [% IF CAN_user_borrowers_edit_borrowers %]
    <div id="patron_search" class="residentsearch">
        <form action="/cgi-bin/koha/members/member.pl" method="post">
            <input name="searchmember" class="head-searchbox" id="inputsearch" class="inpu" type="text" placeholder="Enter patron card number or partial name" />
            <input type="hidden" name="quicksearch" value="1" />
            <input value="" id="submitsearch" type="submit" />
        </form>
    </div>
    [% END %]

    <ul>
        <span id="buttonssearch">
           <span id="button_1" title="Check out" onclick="clique(this)" class="iconsearch"><i class="fa fa-upload"></i></span> <span id="button_2" title="Check in" onclick="clique(this)" class="iconsearch"><i class="fa fa-download"></i></span> <span id="icon_3" title="Renew" onclick="clique(this)" class="iconsearch"><i class="fa fa-retweet"></i></span> <span id="icon_4" title="Search patrons" onclick="clique(this)" class="iconsearch"><i class="fa fa-fw fa-id-card-o"></i></span>
            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_1" onclick="toggle(this)" class="buttonsearch active" href="#circ_search">Check-out</span>[% END %]
            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_2" onclick="toggle(this)" class="buttonsearch" href="#checkin_search">Check-in</span>[% END %]
            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_3" onclick="toggle(this)" class="buttonsearch" href="#renew_search">Renew</span>[% END %]
            [% IF ( CAN_user_borrowers_edit_borrowers ) %]<span id="button_4" onclick="toggle(this)" class="buttonsearch" href="#patron_search">Search patrons</span>[% END %]
        </span>
            <li><a class="keep_text" href="#renew_search">Renew</a></li>
        [% END %]
        [% IF CAN_user_borrowers_edit_borrowers %]
            <li><a class="keep_text" href="#patron_search">Search patrons</a></li>
        [% END %]
    </ul>
</div>

<script type="text/javascript">
    function focusInput(){
        document.getElementById('inputsearch').focus();
    }

    function toggle(elem){
        var buttonssearch = document.getElementsByClassName('active');
        for (var i = buttonssearch.length - 1; i >= 0; i--) {
            buttonssearch[i].classList.remove('active');
        }

        if(elem){
            elem.classList.add('active');
            fold();
        }else{//Back
            document.getElementById('button_1').classList.add('active');
            document.getElementById('containersearch').classList.remove('fold');
            document.getElementById('inputsearch').style = '';
        }
        
        focusInput();
    }

    function clique(elem){
        var buttonssearch = document.getElementsByClassName('buttonsearch');
        var iconssearch = document.getElementsByClassName('iconsearch');
        var inputssearch = document.getElementsByClassName('inpu');
        for (var i = buttonssearch.length - 1; i >= 0; i--) {
            buttonssearch[i].classList.remove('active');
            if (elem == iconssearch[i]){
                buttonssearch[i].classList.add('active');
            }
        }

        for (var i = inputssearch.length - 1; i >= 0; i--) {
            inputssearch[i].classList.remove('focus');

            if (elem == iconssearch[i]){
                inputssearch[i].classList.add('focus');
            }
        }

        focusInput();
        fold(elem);
    }

    function fold(elem){
        document.getElementById('containersearch').classList.add('fold');
       // document.getElementById('inputsearch').style = "width:calc(500px - 100px)";
        setTimeout(
            function(){
                var offsetWidth = document.getElementById('buttonssearch').offsetWidth +5;
                document.getElementById('inputsearch').style = "width:calc(500px - "+offsetWidth+"px)";		
            }
        , 250);
    }




    $('.btn').click(function(){
    if($(this).hasClass('active')){
        $(this).removeClass('active')
    } else {
        $(this).addClass('active')
    }
});
</script>

<!-- /header_search -->
<!-- End Main page Resident Search Box -->

</div><!-- /#header_search -->
<!-- End advanced search page resident search box -->

Lines 1-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc (-3 / +2 lines)
1	<div class="gradient">
2	<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName \| html %]</a></div>
3	<!-- Begin Authorities Resident Search Box -->	1	<!-- Begin Authorities Resident Search Box -->
4	<div id="header_search" class="residentsearch">	2
		3	<div id="header_search" class="residentsearch fold">
5	<div id="mainmain_heading" class="residentsearch">	4	<div id="mainmain_heading" class="residentsearch">
6	<form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get">	5	<form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get">
7	<label class="tip" for="value_mainentry">Enter main heading ($a only):</label>	6	<label class="tip" for="value_mainentry">Enter main heading ($a only):</label>




    <div id="toolbar" class="btn-toolbar">
        [% IF ( CAN_user_editauthorities ) %]
            <div class="btn-group">
                <button class="pat mot" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
                    <i class="fa fa-plus"></i> New authority
                    <span class="caret"></span>
                </button>

            </div>
            [% IF servers.count > 0 %]
                <div class="btn-group">
                    <button class="pat mot" id="z3950_new"><i class="fa fa-search"></i> New from Z39.50/SRU</button>
                        <i class="fa fa-search"></i> New from Z39.50/SRU
                    </button>
                </div>
            [% END %]
        [% END %]

        [% IF ( authid ) %]
            [% IF ( CAN_user_editauthorities ) %]
                <div class="btn-group">
                    <button class="pat mot" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
                        <i class="fa fa-pencil"></i> Edit <span class="caret"></span>
                    </button>
                    <ul class="dropdown-menu">

Lines 2-9 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc (-2 / +4 lines)
2	[% USE Biblio %]	2	[% USE Biblio %]
3	[% SET biblio_object_id = object \|\| biblionumber \|\| biblio.biblionumber %]	3	[% SET biblio_object_id = object \|\| biblionumber \|\| biblio.biblionumber %]
4		4
5	<div id="menu">	5	<div id="navmenu">
6	<ul>	6	<div id="navmenulist">
		7
		8	<ul>
7	[% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]	9	[% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]
8	<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio_object_id \| url %]">Normal</a></li>	10	<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio_object_id \| url %]">Normal</a></li>
9		11

Lines 41-47 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc (-2 / +2 lines)
41	<td>[% d.created \| $KohaDates %]</td>	41	<td>[% d.created \| $KohaDates %]</td>
42	[% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]	42	[% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
43	<td>	43	<td>
44	<a class="remove_restriction btn btn-default btn-xs" href="/cgi-bin/koha/members/mod_debarment.pl?borrowernumber=[% patron.borrowernumber \| html %]&borrower_debarment_id=[% d.borrower_debarment_id \| html %]&action=del">	44	<a class="remove_restriction btn btn-default btn-xs" href="/cgi-bin/koha/members/mod_debarment.pl?borrowernumber=[% patron.borrowernumber \| html %]&borrower_debarment_id=[% d.borrower_debarment_id \| html %]&action=del" id="lientype">
45	<i class="fa fa-trash"></i> Remove	45	<i class="fa fa-trash"></i> Remove
46	</a>	46	</a>
47	</td>	47	</td>
Lines 65-71 Link Here
65	<input name="expiration" id="rexpiration" size="20" value="" class="flatpickr" data-flatpickr-futuredate="true" type="text" />	65	<input name="expiration" id="rexpiration" size="20" value="" class="flatpickr" data-flatpickr-futuredate="true" type="text" />
66	</li>	66	</li>
67	</ol>	67	</ol>
68	<fieldset class="action"><input type="submit" value="Add restriction" /> <a href="#" class="cancel" id="cancel_manual_restriction">Cancel</a></fieldset>	68	<fieldset class="action"><input type="submit" class="principal" value="Add restriction" /> <a href="#" class="cancel" id="cancel_manual_restriction">Cancel</a></fieldset>
69	</fieldset>	69	</fieldset>
70	</form>	70	</form>
71	[% END %]	71	[% END %]

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/branch-selector.inc (-1 / +1 lines)
1	[%# To select all include with selectall = 1 %]	1	[%# To select all include with selectall = 1 %]
2	<div class="branchselector">	2	<div class="branchselector">
3	<p><a href="#" id="checkall"> <i class="fa fa-check"></i> Select all</a> \| <a href="#" id="checknone"> <i class="fa fa-remove"></i> Clear all</a></p>	3	<p><a id="CheckAll" href="#" id="checkall"> <i class="fa fa-check"></i> Select all</a> \| <a id="CheckNone" href="#" id="checknone"> <i class="fa fa-remove"></i> Clear all</a></p>
4	<div class="branchgridrow">	4	<div class="branchgridrow">
5	[% FOREACH branch IN branches %]	5	[% FOREACH branch IN branches %]
6	<div class="branchgriditem">	6	<div class="branchgriditem">




[% USE Koha %]
[% USE Branches %]
<div id="header_search" class="fold">
<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Fund Admin Resident Search Box -->

    <div id="budgets_search" class="residentsearch">
        <form action="/cgi-bin/koha/admin/aqbudgets.pl" method="post">
            <input class="query" type="text" name="filter_budgetname" id="filter_budgetname" value="[% filter_budgetname | html %]" placeholder="Fund code: " />

            <select name="filter_budgetbranch" id="filter_budgetbranch" style="width:10em;">
                <option value="Library: "></option>
                    [% FOREACH branchloo IN Branches.all( selected => selected_branchcode ) %]
                        [% IF branchloo.selected %]
                        <option value="[% branchloo.branchcode | html %]" selected="selected">[% branchloo.branchname | html %]</option>
                        [% ELSE %]
                        <option value="[% branchloo.branchcode | html %]" >[% branchloo.branchname | html %]</option>
                            [% ELSE %]
                            <option value="[% branchloo.branchcode | html %]" >[% branchloo.branchname | html %]</option>
                            [% END %]
                        [% END %]
                    [% END %]
            </select>
            <input type="hidden"  name="budget_period_id" value="[% budget_period_id | html %]" />
            <input type="submit" class="submit" name="filter" value="" />
        </form>
    </div>

    [% INCLUDE 'patron-search-box.inc' %]
        [% INCLUDE 'catalogue-search-box.inc' %]

    [% INCLUDE 'catalogue-search-box.inc' %]

    <ul>
        <li><a id="icon_1" title="Search funds" onclick="clique(this)" class="iconsearch" href="#budgets_search"><i class="fa fa-upload"></i></a></li>
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_1" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]

        <span class="buttonsearch active">Search funds</span>
        <span class="buttonsearch">Check out</span>
        <span class="buttonsearch" href="#catalog_search">Search the catalog</span>
    </ul>
</div>
<!-- End Suggestions Resident Search Box -->




<div id="toolbar" class="btn-toolbar">
    [% IF ( budget_period_id ) %]
        <div class="btn-group">
            <button class="pat dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button>
                <ul class="dropdown-menu">
                    <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form">New budget</a></li>
                    [% IF ( budget_period_locked || !CAN_user_acquisition_budget_add_del ) %]

        </div>

        <div class="btn-group">
            <button class="pat dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button>
                <ul class="dropdown-menu">
                    <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form&amp;budget_period_id=[% budget_period_id | uri %]">Edit budget [% budget_period_description | html %]</a></li>
                    <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=duplicate_form&amp;budget_period_id=[% budget_period_id | uri %]">Duplicate budget [% budget_period_description | html %]</a></li>

        </div>

        <div class="btn-group">
            <button class="pat dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Planning <span class="caret"></span></button>
                <ul class="dropdown-menu">
                    [% IF ( CAN_user_acquisition_planning_manage ) %]
                    <li>

        </div>

    [% ELSE %]
        <div class="btn-group"><a class="pat" id="newrootbudget" href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form"><i class="fa fa-plus"></i> New budget</a></div>
    [% END %]

</div>





[% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items || CAN_user_serials_create_subscription ) %]
    <div class="btn-group">
    <button class="pat dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button>
        <ul class="dropdown-menu">
            [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
             <li><a id="newbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl">New record</a></li>


[% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items || CAN_user_tools_items_batchmod || CAN_user_tools_items_batchdel ) or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %]
    <div class="btn-group">
    <button class="pat dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button>
        <ul class="dropdown-menu">
            [% IF CAN_user_editcatalogue_edit_catalogue or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %]
            <li><a id="editbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber | html %]">Edit record</a></li>

[% END %]

    <div class="btn-group">
    <button class="pat dropdown-toggle" data-toggle="dropdown"><i class="fa fa-download"></i> Save <span class="caret"></span></button>
    <ul class="dropdown-menu">
        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=bibtex&amp;op=export&amp;bib=[% biblionumber | uri %]">BIBTEX</a></li>
        <li><a href="#" data-toggle="modal" data-target="#exportModal_">Dublin Core</a></li>

    [% IF (Koha.Preference("intranetbookbag")) %]
        [% IF ( incart ) %]
            <div class="btn-group">
                <a id="cart[% biblionumber | html %]" class="pat addtocart incart" href="#"><i class="fa fa-shopping-cart"></i> Add to cart</a>
            </div>
            <div class="btn-group">
                <a id="cartR[% biblionumber | html %]" class="pat cartRemove incart" href="#"><i class="fa fa-shopping-cart"></i> Remove from cart</a>
            </div>
        [% ELSE %]
            <div class="btn-group">
                <a id="cart[% biblionumber | html %]" class="pat addtocart" href="#"><i class="fa fa-shopping-cart"></i> Add to cart</a>
            </div>
            <div class="btn-group">
                <a id="cartR[% biblionumber | html %]" class="pat cartRemove" href="#"><i class="fa fa-shopping-cart"></i> Remove from cart</a>
            </div>
        [% END %]
    [% END %]

    [% IF Koha.Preference('virtualshelves') %]
        <div class="btn-group">
            <button type="button" class="pat dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                <i class="fa fa-list"></i> Add to list <span class="caret"></span>
            </button>
            <ul class="dropdown-menu">

        </div>
    [% END # /IF virtualshelves %]

    <div class="btn-group"><a id="printbiblio" class="pat"><i class="fa fa-print"></i> Print</a></div>

[% IF ( CAN_user_reserveforothers ) %]
    [% SET items = biblio.items %]
    [% IF Context.Scalar(Context.Scalar(items, "filter_by_for_hold"), "count") %]
        [% IF ( holdfor ) %]
            <div class="btn-group">
                <button class="pat dropdown-toggle" data-toggle="dropdown">
                    <i class="fa fa-sticky-note-o"></i>
                    Place hold
                    <span class="caret"></span>

                </ul>
            </div>
        [% ELSE %]
            <div class="btn-group"><a id="placehold" class="pat" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber | html %]"><i class="fa fa-sticky-note-o"></i> Place hold</a></div>
        [% END %]
    [% END %]
[% END %]

[% IF Koha.Preference('ArticleRequests') %]
    <div class="btn-group"><a id="placehold" class="pat" href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% biblionumber | html %]"><i class="fa fa-file-text-o"></i> Request article</a></div>
[% END %]

[% IF ( CAN_user_acquisition_order_manage ) %]
    [% IF ( searchtoorder_basketno && searchtoorder_vendorid ) %]
        <div class="btn-group">
            <a class="pat" href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% searchtoorder_vendorid | uri %]&amp;basketno=[% searchtoorder_basketno | uri %]&amp;biblionumber=[% biblionumber | uri %]"><i class="fa fa-shopping-basket"></i> Add order</a>
        </div>
    [% END %]
[% END %]

            </fieldset>
        </div>
        <div class="modal-footer">
            <button type="submit" class="pat">Export</button>
            <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Cancel</button>
        </div>
        <input type="hidden" name="op" value="export" />




[% PROCESS 'patronfields.inc' %]
<!-- Begin Patrons Resident Search Box -->

<div id="header_search" class="fold">

    <div>
        <div id="addbooks_search" class="residentsearch">
            <form name="search" action="addbooks.pl">
                <input class="head-searchbox" type="text" name="q" id="cat_search" placeholder="Search the catalog and the reservoir" />
                <input type="submit" id="submit" value="" />
            </form>
        </div>


    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
    <div id="checkin_search" class="residentsearch">
        <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
            <input class="head-searchbox" name="barcode" id="ret_barcode" accesskey="r" type="text" placeholder="Scan a barcode to check in" />
            <input value="" type="submit" id="submit" />
        </form>
    </div>

    <div id="renew_search" class="residentsearch">
        <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
            <input class="head-searchbox" name="barcode" id="ren_barcode" type="text" placeholder="Scan a barcode to renew" />
            <input value="" type="submit" id="submit" />
        </form>
    </div>
    [% END %]

    [% INCLUDE 'catalogue-search-box.inc' %]

    <ul>
        <li><a id="icon_1" title="Search patrons" onclick="clique(this)" class="iconsearch" href="#addbooks_search"><i class="fa fa-fw fa-id-card-o"></i></a></li>[% END %]
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="button_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="button_3" title="Check in" onclick="clique(this)" class="iconsearch" href="#checkin_search"><i class="fa fa-download"></i></a></li>[% END %]
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_4" title="Renew" onclick="clique(this)" class="iconsearch" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %]
        <li><a id="icon_5" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]

        <span id="button_1" class="buttonsearch">Cataloging search</span>
        <span id="button_2" class="buttonsearch active">Check-out</span>
        <span id="button_3" class="buttonsearch">Check-in</span>
        <span id="button_4" class="buttonsearch">Renew</span>
        <span id="button_5" class="buttonsearch">Search catalog</span>
    </ul>
</div>


Lines 1-9 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue-search-box.inc (-2 / +4 lines)
1	[% IF ( CAN_user_catalogue ) %]	1	[% IF ( CAN_user_catalogue ) %]
		2	<div id="catalog_search" class="residentsearch">
2	<form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block">	3	<form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block">
3	[% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]	4	[% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
4	[% INCLUDE 'search_indexes.inc' %]	5	[% INCLUDE 'search_indexes.inc' %]
5	[% END %]	6	[% END %]
6	<input type="text" name="q" id="inputsearch" size="40" value="[% ms_value \| html %]" title="Enter the terms you wish to search for." class="query form-text head-searchbox" placeholder='Enter search keywords' />	7	<input type="text" name="q" id="search-form" value="[% ms_value \| html %]" title="Enter the terms you wish to search for." class="query form-text head-searchbox focus" placeholder='Enter search keywords' />
7	<input value="" type="submit" id="submitsearch" />	8	<input value="" type="submit" id="submit" />
8	</form>	9	</form>
		10	</div>
9	[% END %]	11	[% END %]




[% USE Koha %]
<!-- Begin Main page Resident Search Box -->

<div id="header_search" class="fold">

    [% INCLUDE 'patron-search-box.inc' %]

    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
    <div id="renew_search" class="residentsearch">
        <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
            <input class="head-searchbox focus" type="text" name="barcode" id="ren_barcode" placeholder="Scan a barcode to renew:" />
            <input value="Submit" id="submit" type="submit" />
        </form>
    </div>
    [% END %]

    [% INCLUDE 'catalogue-search-box.inc' %]

    <ul id="taille">
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_1" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Renew" onclick="clique(this)" class="iconsearch" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %]
        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
            <input name="barcode" id="inputsearch" size="40" type="text" placeholder="Enter serch keyords" />
            <input value="" type="submit" id="submitsearch" />
        </form>
    </div>
    [% END %]

        <span id="button_1" class="buttonsearch active">Check-out</span>
        <span id="button_2" class="buttonsearch">Renew</span>
        <span id="button_3" class="buttonsearch">Search catalog</span>
            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_1" onclick="toggle(this)" class="buttonsearch" href="#circ_search">Check-out</span>[% END %]
            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_3" onclick="toggle(this)" class="buttonsearch" href="#renew_search">Renew</span>[% END %]
            [% IF ( CAN_user_catalogue ) %]<span id="button_5" onclick="toggle(this)" class="buttonsearch" href="#catalog_search">Search the catalog</span>[% END %]
        </span>
    </ul>
</div>


<script type="text/javascript">
    function focusInput(){
        document.getElementsByClassName('head-searchbox').focus();
    }

    function toggle(elem){style="width: calc(301px);"
        var buttonssearch = document.getElementsByClassName('active');
        for (var i = buttonssearch.length - 1; i >= 0; i--) {
            buttonssearch[i].classList.remove('active');

            fold();
        }else{//Back
            document.getElementById('button_1').classList.add('active');
            document.getElementById('header_search').classList.remove('fold');
            document.getElementsByClassName('head-searchbox').style = '';
        }

        focusInput();
    }

    function clique(elem){
        var buttonssearch = document.getElementsByClassName('buttonsearch');
        var iconssearch = document.getElementsByClassName('iconsearch');
        var inputssearch = document.getElementsByClassName('head-searchbox');
        for (var i = buttonssearch.length - 1; i >= 0; i--) {
            buttonssearch[i].classList.remove('active');
            if (elem == iconssearch[i]){
                buttonssearch[i].classList.add('active');
            }
        }

        for (var i = inputssearch.length - 1; i >= 0; i--) {
            inputssearch[i].classList.remove('focus');

            if (elem == iconssearch[i]){
                inputssearch[i].classList.add('focus');

                taille(inputssearch[i])
            }
        }

        focusInput();
        fold();
    }

    function fold(){
        document.getElementById('header_search').classList.add('fold');
       // document.getElementsByClassName('head-searchbox').style = "width:calc(500px - 100px)";
        setTimeout(
            function(){
                var offsetWidth = document.getElementById('taille').offsetWidth +5;
                document.getElementsByClassName('head-searchbox').style = "width:calc(500px - "+offsetWidth+"px)";
            }
        , 250);
    }

    function taille(el){
        var offsetWidth = document.getElementById('taille').offsetWidth +5;
        el.style = "width:calc(500px - "+offsetWidth+"px)";
    }

    $('.btn').click(function(){
    if($(this).hasClass('active')){
        $(this).removeClass('active')
    } else {
        $(this).addClass('active')
    }
});



</script>

<!-- /header_search -->

Lines 53-60 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc (-3 / +3 lines)
53	<label id="renew_as_unseen_label" for="override_limit">Renew as "unseen" if appropriate:</label>	53	<label id="renew_as_unseen_label" for="override_limit">Renew as "unseen" if appropriate:</label>
54	<input type="checkbox" name="renew_as_unseen" id="renew_as_unseen_checkbox" value="1" />	54	<input type="checkbox" name="renew_as_unseen" id="renew_as_unseen_checkbox" value="1" />
55	[% END %]	55	[% END %]
56	<button class="btn btn-default" id="RenewCheckinChecked"><i class="fa fa-check"></i> Renew or check in selected items</button>	56	<button class="btn btn-default" id="RenewCheckinChecked" id="lientype"><i class="fa fa-check"></i> Renew or check in selected items</button>
57	<button class="btn btn-default" id="RenewAll"><i class="fa fa-book"></i> Renew all</button>	57	<button class="btn btn-default" id="RenewAll" id="lientype"><i class="fa fa-book"></i> Renew all</button>
58	[% END %]	58	[% END %]
59	</fieldset>	59	</fieldset>
60		60
Lines 81-87 Link Here
81	<input type="hidden" id="output_format" name="output_format" value="iso2709" />	81	<input type="hidden" id="output_format" name="output_format" value="iso2709" />
82	<input type="hidden" id="dont_export_item" name="dont_export_item" value="0" />	82	<input type="hidden" id="dont_export_item" name="dont_export_item" value="0" />
83	<input type="hidden" id="record_type" name="record_type" value="bibs" />	83	<input type="hidden" id="record_type" name="record_type" value="bibs" />
84	<button class="btn btn-default btn-sm" id="export_submit"><i class="fa fa-download"></i> Export</button>	84	<button class="btn btn-default btn-sm principal" id="export_submit"><i class="fa fa-download"></i> Export</button>
85	</fieldset>	85	</fieldset>
86	[% END %]	86	[% END %]
87	</div>	87	</div>




    [% patron_type_class = 'is-staff' %]
[% END %]

<div id="filters">
<div class="patroninfo [% patron_type_class | html %]">
    [% IF ( patronimages ) %]
    <h5 class="text-center">
    [% ELSE %]
    <h5>
    [% END %]

        [% IF ( patron_is_staff ) %]
        <i class="fa fa-shield fa-fw" title="Staff patron"></i>
        [% END %]

        [% END %]

        [% INCLUDE 'patron-title.inc' %]

        [% IF ( patron.dateofbirth ) %]
        <li class="patrondateofbirth">
            [% INCLUDE 'patron-age.inc' %]
        </li>
        [% END %]

    </h5>

    [% IF Koha.Preference('showLastPatron') %]

            [% END %]
        [% END %]


        <li class="patrondateofbirth">
            <span>Born:</span>
            [% INCLUDE 'patron-age.inc' %]
        </li>
        [% END %]

        [% UNLESS ( patron.address or patron.address2 ) %]
        <li><span class="empty" id="noaddressstored">No address stored.</span></li>

    </ul>
</div>

<div id="navmenulist">
    <ul>
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
            [% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% patron.borrowernumber | uri %]">Check out</a></li>

    [% IF Koha.Preference('UseRecalls') && CAN_user_recalls %]
        [% IF recallsview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/recallshistory.pl?borrowernumber=[% patron.borrowernumber | uri %]">Recalls history</a></li>
    [% END %]
</ul></div></div>

[% IF patronimages && CAN_user_tools_batch_upload_patron_images %]
<!-- Modal -->

Lines 3-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc (-2 / +6 lines)
3	<div id="navmenu">	3	<div id="navmenu">
4	<div id="navmenulist">	4	<div id="navmenulist">
5		5
6	<a id="titre" href="/cgi-bin/koha/circ/circulation-home.pl">Circulation home</a>	6	<ul>
7		7	<li>
		8	<a class="titre" href="/cgi-bin/koha/circ/circulation-home.pl">Circulation home</a>
		9	</li>
		10	</ul>
		11
8	<ul>	12	<ul>
9	<h5>Circulation</h5>	13	<h5>Circulation</h5>
10	<li><a href="/cgi-bin/koha/circ/circulation.pl">Check out</a></li>	14	<li><a href="/cgi-bin/koha/circ/circulation.pl">Check out</a></li>




[% USE Koha %]
<!-- Begin Main page Resident Search Box -->

<div id="header_search" class="fold">

    [% INCLUDE 'patron-search-box.inc' %]
    [% INCLUDE 'catalogue-search-box.inc' %]

    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
    <div id="checkin_search" class="residentsearch">
        <form action="/cgi-bin/koha/circ/returns.pl" autocomplete="off" method="post">
            <input id="ret_barcode" name="barcode" class="head-searchbox focus" accesskey="r" type="text" placeholder="Scan a barcode to check in" />
            <input value="" id="submit" type="submit"/>
        </form>
    </div>

    <div id="renew_search" class="residentsearch">
        <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
            <input class="head-searchbox" name="barcode" id="ren_barcode" accesskey="r" type="text" placeholder="Scan a barcode to renew" />
            <input value="" type="submit" id="submit" />
        </form>
    </div>
    [% END %]

    [% INCLUDE 'catalogue-search-box.inc' %]
    <div id="renew_search" class="residentsearch">
        <form method="post" action="/cgi-bin/koha/catalogue/search.pl" autocomplete="off" method="get" id="cat-search-block">
            [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
                    [% INCLUDE 'search_indexes.inc' %]
                [% END %]
            <input name="barcode" id="inputsearch" size="40" type="text" placeholder="Enter serch keyords" />
            <input value="" type="submit" id="submitsearch" />
        </form>
    </div>
    [% END %]

    <ul id="taille">
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="button_1" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="button_2" title="Check in" onclick="clique(this)" class="iconsearch" href="#checkin_search"><i class="fa fa-download"></i></a></li>[% END %]
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_3" title="Renew" onclick="clique(this)" class="iconsearch" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %]
        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_4" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]

        <span id="button_1" class="buttonsearch active">Check-out</span>
        <span id="button_2" class="buttonsearch">Check-in</span>
        <span id="button_3" class="buttonsearch">Renew</span>
        <span id="button_4" class="buttonsearch">Search catalog</span>
    </ul>
</div>


<script type="text/javascript">
    function focusInput(){
        document.getElementsByClassName('head-searchbox').focus();
    }

    function toggle(elem){style="width: calc(301px);"
        var buttonssearch = document.getElementsByClassName('active');
        for (var i = buttonssearch.length - 1; i >= 0; i--) {
            buttonssearch[i].classList.remove('active');

            fold();
        }else{//Back
            document.getElementById('button_1').classList.add('active');
            document.getElementById('header_search').classList.remove('fold');
            document.getElementsByClassName('head-searchbox').style = '';
        }

        focusInput();
    }

    function clique(elem){
        var buttonssearch = document.getElementsByClassName('buttonsearch');
        var iconssearch = document.getElementsByClassName('iconsearch');
        var inputssearch = document.getElementsByClassName('head-searchbox');
        for (var i = buttonssearch.length - 1; i >= 0; i--) {
            buttonssearch[i].classList.remove('active');
            if (elem == iconssearch[i]){
                buttonssearch[i].classList.add('active');
            }
        }

        for (var i = inputssearch.length - 1; i >= 0; i--) {
            inputssearch[i].classList.remove('focus');

            if (elem == iconssearch[i]){
                inputssearch[i].classList.add('focus');

                taille(inputssearch[i])
            }
        }

        focusInput();
        fold();
    }

    function fold(){
<<<<<<< HEAD

        document.getElementById('containersearch').classList.add('fold');
        // document.getElementById('inputsearch').style = "width:calc(500px - 100px)";

            function(){
                var offsetWidth = document.getElementById('buttonssearch').offsetWidth +5;
                document.getElementById('inputsearch').style = "width:calc(500px - "+offsetWidth+"px)";
=======
        document.getElementById('header_search').classList.add('fold');
       // document.getElementsByClassName('head-searchbox').style = "width:calc(500px - 100px)";
        setTimeout(
            function(){
                var offsetWidth = document.getElementById('taille').offsetWidth +5;
                document.getElementsByClassName('head-searchbox').style = "width:calc(500px - "+offsetWidth+"px)";
>>>>>>> Bug 30952: Search bar
            }
        , 250);
    }

    function taille(el){
        var offsetWidth = document.getElementById('taille').offsetWidth +5;
        el.style = "width:calc(500px - "+offsetWidth+"px)";
    }

    $('.btn').click(function(){
    if($(this).hasClass('active')){
        $(this).removeClass('active')
    } else {
        $(this).addClass('active')
    }
});



</script>


<!-- /header_search -->
<!-- End Main page Resident Search Box -->




[% USE Koha %]
<div id="header_search" class="fold">
<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Cities Resident Search Box -->
<div id="header_search">
	<div id="city_search" class="residentsearch">
        <form action="[% script_name | html %]" method="post">
            <input class="head-searchbox focus" type="text" name="city_name_filter" id="city_name_filter" value="[% city_name_filter | html %]" placeholder="City search:" />
            <input type="submit" name="submit" value="" id="submit" />
        </form>
	</form>
	</div>

    [% INCLUDE 'patron-search-box.inc' %]
    [% INCLUDE 'catalogue-search-box.inc' %]

    <ul>
        <li><a id="icon_1" title="Search cities" onclick="clique(this)" class="iconsearch" href="#city_search"><i class="fa fa-upload"></i></a></li>
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]

        <span class="keep_text">Search cities</span>
        <span class="keep_text">Check out</span>
        <span class="keep_text">Search the catalog</span>
    </ul>
</div>
<!-- End Cities Resident Search Box -->




[% USE Koha %]
<div class="gradient">
<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Patrons Admin Resident Search Box -->

<div id="header_search" class="fold">
	<div id="contract_description_search" class="residentsearch">
	<form action="[% script_name | html %]" method="post">
        <input class="head-searchbox" type="text" name="searchfield" id="searchfield" value="[% searchfield | html %]" placeholder="Search by contract name or/and description:"/>
		<input type="submit" class="submit" name="search" value="" />
		<input type="submit" class="submit" name="search" value="Search" />
	</form>	
	</div>


    [% INCLUDE 'catalogue-search-box.inc' %]

	<ul>
        <li><a id="icon_1" title="Search contracts" onclick="clique(this)" class="iconsearch" href="#contract_description_search"><i class="fa fa-upload"></i></a></li>
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]

        <span class="keep_text">Search contracts</span>
        <span class="keep_text">Check out</span>
        <span class="keep_text" href="#catalog_search">Search the catalog</span>
	</ul>
</div>

<!-- End Patrons Admin Resident Search Box -->




[% USE Koha %]

<div id="header_search" class="fold">
<div id="header_search">
	<div id="currency_search" class="residentsearch">
        <form action="[% script_name | html %]" method="post">
                <input class="head-searchbox" type="text" name="description" id="description" value="[% searchfield | html %]" placeholder="Currencies search:" />
                <input type="submit" id="submit" name="search" value="" />
                <input type="submit" class="submit" name="search" value="Search" />
        </form>	
	</div>

    [% INCLUDE 'patron-search-box.inc' %]
    [% INCLUDE 'catalogue-search-box.inc' %]

    <ul>
        <li><a id="icon_1" title="Check out" onclick="clique(this)" class="iconsearch" href="#currency_search"><i class="fa fa-upload"></i></a></li>
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Check out" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-upload"></i></a></li>[% END %]

        <span class="keep_text">Search currencies</span>
        <span class="keep_text">Check out</span>
        <span class="keep_text">Search the catalog</span>
    </ul>
</div>
</div><!-- /gradient -->
<!-- End Currencies Resident Search Box -->

Lines 5-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc (-1 / +1 lines)
5	[% IF ( facets_loop ) %]	5	[% IF ( facets_loop ) %]
6	<div id="search-facets">	6	<div id="search-facets">
7	<h4>Refine your search</h4>	7	<h4>Refine your search</h4>
8	<ul>	8	<ul class="cadre">
9	<li id="availability_facet">Availability<ul><li>[% IF ( available ) %]<strong>Showing only available items</strong></li><li><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi \| $raw %][% limit_cgi_not_availablity \| $raw %][% IF ( sort_by ) %]&sort_by=[% sort_by \| uri %][% END %]">Show all items</a>[% ELSE %]<a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi \| $raw %][% limit_cgi \| $raw %][% IF ( sort_by ) %]&sort_by=[% sort_by \| uri %][% END %]&limit=available">Limit to currently available items</a>[% END %]</li></ul>	9	<li id="availability_facet">Availability<ul><li>[% IF ( available ) %]<strong>Showing only available items</strong></li><li><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi \| $raw %][% limit_cgi_not_availablity \| $raw %][% IF ( sort_by ) %]&sort_by=[% sort_by \| uri %][% END %]">Show all items</a>[% ELSE %]<a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi \| $raw %][% limit_cgi \| $raw %][% IF ( sort_by ) %]&sort_by=[% sort_by \| uri %][% END %]&limit=available">Limit to currently available items</a>[% END %]</li></ul>
10	[% IF ( related ) %] <li>(related searches: [% FOREACH relate IN related %][% relate.related_search \| html %][% END %])</li>[% END %]	10	[% IF ( related ) %] <li>(related searches: [% FOREACH relate IN related %][% relate.related_search \| html %][% END %])</li>[% END %]
11	</li>	11	</li>




[% USE Koha %]
<div id="navmenu">
    <div id="navmenulist">
        <ul>
            [% IF ( CAN_user_reports_execute_reports ) %]<h5>Run reports</h5><li><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">Saved reports</a></li>[% END %]
        </ul>
        <ul>
            <h5>Reports dictionary</h5>
            <li><a href="/cgi-bin/koha/reports/dictionary.pl?phase=View%20Dictionary">View dictionary</a></li>
        </ul>
        <ul>
            <h5>Useful resources</h5>
            <li><a href="http://wiki.koha-community.org/wiki/SQL_Reports_Library" target="blank">Koha report library</a></li>
            [% SET koha_version = Koha.Version %]
            [% IF koha_version.development %]
                <li><a href="http://schema.koha-community.org/master" target="blank">Koha database schema</a></li>
            [% ELSE %]
                <li><a href="http://schema.koha-community.org/[% koha_version.major | uri %]_[% koha_version.minor | uri %]" target="blank">Koha database schema</a></li>
            [% END %]
        </ul>
    </div>
</ul>
</div>
</div>

Lines 5-21 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc (-141 / +144 lines)
5	[% USE Koha %]	5	[% USE Koha %]
6		6
7		7
8	<nav class="navbar-header">	8
9	<span>	9	<nav class="navbar">
		10
		11	<div class="navbar-header">
10	<ul id="logo">	12	<ul id="logo">
11	<a href="/cgi-bin/koha/mainpage.pl"></a>	13	<a href="/cgi-bin/koha/mainpage.pl"></a>
12	</ul>	14	</ul>
13	</span>	15	<a href="#" class="header-menu-link collapsed" data-toggle="collapse" data-target="#header" aria-expanded="false" aria-controls="header"><i class="fa fa-bars"></i> Menu</a>
		16	</div>
14		17
15	<span>	18	<div id="header" class="navbar-collapse collapse">
16	<ul id="toplevelmenu" class="nav navbar-nav">	19	<ul id="toplevelmenu" class="nav navbar-nav">
17	<a href="#" class="header-menu-link collapsed" data-toggle="collapse" data-target="#header" aria-expanded="false" aria-controls="header"><i class="fa fa-bars"></i> Menu</a>
18
19	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a></li>[% END %]	20	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a></li>[% END %]
20		21
21	[% IF CAN_user_borrowers_edit_borrowers %]<li><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a></li>[% END %]	22	[% IF CAN_user_borrowers_edit_borrowers %]<li><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a></li>[% END %]
Lines 66-74 Link Here
66	<li><a href="/cgi-bin/koha/about.pl">About Koha</a></li>	67	<li><a href="/cgi-bin/koha/about.pl">About Koha</a></li>
67	</ul>	68	</ul>
68	</li>	69	</li>
		70	<li>[% Koha.Preference('IntranetNav') \| $raw %]</li>
		71	</ul>
		72	</div>
69		73
70	[% Koha.Preference('IntranetNav') \| $raw %]	74	<div class="navbar-head">
71		75	<ul id="toplevelmenu" class="nav navbar-nav">
72	<li>	76	<li>
73	[% form %]	77	[% form %]
74	</li>	78	</li>
Lines 79-232 Link Here
79	</li>	83	</li>
80	[% END %]	84	[% END %]
81	</ul>	85	</ul>
82	</span>	86	</div>
83		87
84	<span>	88	<ul id="user-menu" class="nav navbar-nav navbar-right">
85	<ul id="user-menu" class="nav navbar-nav navbar-right">	89	[% IF ( loggedinusername ) %]
86	[% IF ( loggedinusername ) %]
87		90
88	<li class="dropdown">	91	<li class="dropdown">
89	<a href="#" id="logged-in-menu" role="button" class="dropdown-toggle" data-toggle="dropdown">	92	<a href="#" id="logged-in-menu" role="button" class="dropdown-toggle" data-toggle="dropdown">
90
91	<span id="logged-in-info-brief">
92	<i class="fa fa-user"></i>
93	</span>
94
95	<span id="logged-in-info-full">
96	[% SET is_superlibrarian = CAN_user_superlibrarian ? 'is_superlibrarian' : '' %]
97	<span class="loggedinusername [% is_superlibrarian \| html %]">[% logged_in_user.userid \| html %]</span>
98
99	[% IF ( AutoLocation ) %]
100	<brand>
101	[% Branches.GetLoggedInBranchname \| html %]
102	</brand>
103	[% ELSE %]
104	<strong>
105	<span class="logged-in-branch-name">[% Branches.GetLoggedInBranchname \| html %]<b class="caret"></b></span>
106	<span class="logged-in-branch-code content_hidden">[% Branches.GetLoggedInBranchcode \| html %]</span>
107	</strong>
108	[% END %]
109	[% IF Koha.Preference('UseCirculationDesks') && Desks.ListForLibrary.count %]
110	<span class="separator">\|</span>
111	<strong>
112	[% IF ( Desks.GetLoggedInDeskName == '' ) %]
113	<span class="logged-in-desk-name">NO DESK SET</span>
114	[% ELSE %]
115	<span class="logged-in-desk-name">[% Desks.GetLoggedInDeskName \| html %]</span>
116	<span class="logged-in-desk-id content_hidden">[% Desks.GetLoggedInDeskId \| html %]</span>
117	[% END %]
118	</strong>
119	[% END %]
120	[% IF Koha.Preference('UseCashRegisters') && !(Registers.session_register_name == '') %]
121	<span class="separator">\|</span>
122	<strong>
123	<span class="logged-in-register-name">[% Registers.session_register_name \| html %]</span>
124	<span class="logged-in-register-id content_hidden">[% Registers.session_register_id \| html %]</span>
125	</strong>
126	[% END %]
127	</span>
128	</a>
129
130	<ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="logged-in-menu">
131	<li class="loggedin-menu-label">
132	Logged in as:<br />
133	<span class="loggedinusername">[% logged_in_user.userid \| html %]</span>
134	</li>
135		93
136	<li class="loggedin-menu-label">	94	<span id="logged-in-info-brief">
137	[% IF ( AutoLocation ) %]	95	<i class="fa fa-user">
138	<brand>	96	<b class="caret"></b></i>
139	[% Branches.GetLoggedInBranchname \| html %]	97	</span>
140	</brand>
141	[% ELSE %]
142	Location: <br />
143	<span class="logged-in-branch-name">[% Branches.GetLoggedInBranchname \| html %]</span>
144	<span class="logged-in-branch-code content_hidden">[% Branches.GetLoggedInBranchcode \| html %]</span>
145	[% END %]
146	</li>
147		98
		99	<span id="logged-in-info-full">
		100	[% SET is_superlibrarian = CAN_user_superlibrarian ? 'is_superlibrarian' : '' %]
		101	<span class="loggedinusername [% is_superlibrarian \| html %]">[% logged_in_user.userid \| html %]</span>
		102
		103	[% IF ( AutoLocation ) %]
		104	<brand>
		105	[% Branches.GetLoggedInBranchname \| html %]
		106	</brand>
		107	[% ELSE %]
		108	<strong>
		109	<span class="logged-in-branch-name">[% Branches.GetLoggedInBranchname \| html %]<b class="caret"></b></span>
		110	<span class="logged-in-branch-code content_hidden">[% Branches.GetLoggedInBranchcode \| html %]</span>
		111	</strong>
		112	[% END %]
148	[% IF Koha.Preference('UseCirculationDesks') && Desks.ListForLibrary.count %]	113	[% IF Koha.Preference('UseCirculationDesks') && Desks.ListForLibrary.count %]
149	<li class="loggedin-menu-label">	114	<span class="separator">\|</span>
150	Desk: <br />	115	<strong>
151	[% IF ( Desks.GetLoggedInDeskName == '' ) %]	116	[% IF ( Desks.GetLoggedInDeskName == '' ) %]
152	<span class="logged-in-desk-name">NO DESK SET</span>	117	<span class="logged-in-desk-name">NO DESK SET</span>
153	[% ELSE %]	118	[% ELSE %]
154	<span class="logged-in-desk-name">[% Desks.GetLoggedInDeskName \| html %]</span>	119	<span class="logged-in-desk-name">[% Desks.GetLoggedInDeskName \| html %]</span>
155	<span class="logged-in-desk-id content_hidden">[% Desks.GetLoggedInDeskId \| html %]</span>	120	<span class="logged-in-desk-id content_hidden">[% Desks.GetLoggedInDeskId \| html %]</span>
156	[% END %]	121	[% END %]
157	</li>	122	</strong>
158	[% END %]	123	[% END %]
159
160	[% IF Koha.Preference('UseCashRegisters') && !(Registers.session_register_name == '') %]	124	[% IF Koha.Preference('UseCashRegisters') && !(Registers.session_register_name == '') %]
161	<li class="loggedin-menu-label">	125	<span class="separator">\|</span>
162	Register: <br />	126	<strong>
163	<span class="logged-in-register-name">[% Registers.session_register_name \| html %]</span>	127	<span class="logged-in-register-name">[% Registers.session_register_name \| html %]</span>
164	<span class="logged-in-register-id content_hidden">[% Registers.session_register_id \| html %]</span>	128	<span class="logged-in-register-id content_hidden">[% Registers.session_register_id \| html %]</span>
165	</li>	129	</strong>
166	[% END %]	130	[% END %]
167		131	</span>
168	[% IF !( Koha.Preference('IndependentBranches') && !CAN_user_superlibrarian && !CAN_user_editcatalogue_edit_catalogue ) %]	132	</a>
169	<li role="separator" class="loggedin-menu-label divider"></li>	133
170	<li>	134	<ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="logged-in-menu">
171	[% IF Koha.Preference('UseCirculationDesks') && Koha.Preference('UseCashRegisters') %]	135	<li class="loggedin-menu-label">
172	<a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library, desk and register</a>	136	Logged in as:<br />
173	[% ELSIF Koha.Preference('UseCirculationDesks') %]	137	<span class="loggedinusername">[% logged_in_user.userid \| html %]</span>
174	<a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library and desk</a>	138	</li>
175	[% ELSIF Koha.Preference('UseCashRegisters') %]	139
176	<a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library and cash register</a>	140	<li class="loggedin-menu-label">
177	[% ELSE %]	141	[% IF ( AutoLocation ) %]
178	<a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library</a>	142	<brand>
179	[% END %]	143	[% Branches.GetLoggedInBranchname \| html %]
180	</li>	144	</brand>
181	[% ELSIF Koha.Preference('UseCirculationDesks') && Koha.Preference('UseCashRegisters') %]	145	[% ELSE %]
182	<li role="separator" class="loggedin-menu-label divider"></li>	146	Location: <br />
183	<li>	147	<span class="logged-in-branch-name">[% Branches.GetLoggedInBranchname \| html %]</span>
184	<a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set desk and cash register</a>	148	<span class="logged-in-branch-code content_hidden">[% Branches.GetLoggedInBranchcode \| html %]</span>
		149	[% END %]
		150	</li>
		151
		152	[% IF Koha.Preference('UseCirculationDesks') && Desks.ListForLibrary.count %]
		153	<li class="loggedin-menu-label">
		154	Desk: <br />
		155	[% IF ( Desks.GetLoggedInDeskName == '' ) %]
		156	<span class="logged-in-desk-name">NO DESK SET</span>
		157	[% ELSE %]
		158	<span class="logged-in-desk-name">[% Desks.GetLoggedInDeskName \| html %]</span>
		159	<span class="logged-in-desk-id content_hidden">[% Desks.GetLoggedInDeskId \| html %]</span>
		160	[% END %]
		161	</li>
		162	[% END %]
		163
		164	[% IF Koha.Preference('UseCashRegisters') && !(Registers.session_register_name == '') %]
		165	<li class="loggedin-menu-label">
		166	Register: <br />
		167	<span class="logged-in-register-name">[% Registers.session_register_name \| html %]</span>
		168	<span class="logged-in-register-id content_hidden">[% Registers.session_register_id \| html %]</span>
185	</li>	169	</li>
		170	[% END %]
		171
		172	[% IF !( Koha.Preference('IndependentBranches') && !CAN_user_superlibrarian && !CAN_user_editcatalogue_edit_catalogue ) %]
		173	<li role="separator" class="loggedin-menu-label divider"></li>
		174	<li>
		175	[% IF Koha.Preference('UseCirculationDesks') && Koha.Preference('UseCashRegisters') %]
		176	<a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library, desk and register</a>
186	[% ELSIF Koha.Preference('UseCirculationDesks') %]	177	[% ELSIF Koha.Preference('UseCirculationDesks') %]
187	<li role="separator" class="loggedin-menu-label divider"></li>	178	<a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library and desk</a>
188	<li>
189	<a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set desk</a>
190	</li>
191	[% ELSIF Koha.Preference('UseCashRegisters') %]	179	[% ELSIF Koha.Preference('UseCashRegisters') %]
192	<li role="separator" class="loggedin-menu-label divider"></li>	180	<a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library and cash register</a>
193	<li>	181	[% ELSE %]
194	<a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set cash register</a>	182	<a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library</a>
195	</li>
196	[% END %]	183	[% END %]
197	[% IF EnableSearchHistory %]	184	</li>
198	<li>	185	[% ELSIF Koha.Preference('UseCirculationDesks') && Koha.Preference('UseCashRegisters') %]
199	<a class="toplinks" href="/cgi-bin/koha/catalogue/search-history.pl">Search history</a>	186	<li role="separator" class="loggedin-menu-label divider"></li>
		187	<li>
		188	<a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set desk and cash register</a>
		189	</li>
		190	[% ELSIF Koha.Preference('UseCirculationDesks') %]
		191	<li role="separator" class="loggedin-menu-label divider"></li>
		192	<li>
		193	<a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set desk</a>
		194	</li>
		195	[% ELSIF Koha.Preference('UseCashRegisters') %]
		196	<li role="separator" class="loggedin-menu-label divider"></li>
		197	<li>
		198	<a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set cash register</a>
		199	</li>
		200	[% END %]
		201	[% IF EnableSearchHistory %]
		202	<li>
		203	<a class="toplinks" href="/cgi-bin/koha/catalogue/search-history.pl">Search history</a>
		204	</li>
		205	[% END %]
		206
		207	[% IF loggedinusernumber %]
		208	<li class ="toplinks-myaccount">
		209	<a class="toplinks" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loggedinusernumber \| html %]">My account</a>
200	</li>	210	</li>
201	[% END %]	211	<li class="toplinks-mycheckouts">
202		212	<a class="toplinks" href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% loggedinusernumber \| html %]">My checkouts</a>
203	[% IF loggedinusernumber %]
204	<li class ="toplinks-myaccount">
205	<a class="toplinks" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loggedinusernumber \| html %]">My account</a>
206	</li>
207	<li class="toplinks-mycheckouts">
208	<a class="toplinks" href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% loggedinusernumber \| html %]">My checkouts</a>
209	</li>
210	[% END %]
211	<li>
212	<a id="logout" class="toplinks" href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log out</a>
213	</li>	213	</li>
214	</ul>	214	[% END %]
215	</li>	215	<li>
216		216	<a id="logout" class="toplinks" href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log out</a>
217	[% INCLUDE 'langmenu-staff-top.inc' %]	217	</li>
218		218	</ul>
219	[% ELSE %]	219	</li>
220	<li class="loggedout">	220
221	<span>	221	[% INCLUDE 'langmenu-staff-top.inc' %]
222	<a href="/cgi-bin/koha/mainpage.pl" id="login">Log in</a>	222
223	<span class="separator">\|</span>	223	[% ELSE %]
224	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>	224	<li class="loggedout">
225	</span>	225	<span>
226	</li>	226	<a href="/cgi-bin/koha/mainpage.pl" id="login">Log in</a>
227	[% END %]	227	<span class="separator">\|</span>
228	</ul>	228	</span>
229	</span>	229	</li>
		230	[% END %]
		231	</ul>
230		232
231	[% IF ( Koha.Preference('intranetbookbag') ) %]<div id="cartDetails">Your cart is empty.</div>[% END %]	233	[% IF ( Koha.Preference('intranetbookbag') ) %]<div id="cartDetails">Your cart is empty.</div>[% END %]
		234
232	</nav>	235	</nav>




[% USE Koha %]
<!-- Begin Main page Resident Search Box -->

<div id="header_search" class="fold">

    [% INCLUDE 'patron-search-box.inc' %]
        <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
            <input id="inputsearch" size="40" type="text" autocomplete="off" placeholder="Enter patron card number or partial name"  />
            <input type="hidden" name="quicksearch" value="1" />
            <input value="" type="submit" id="submitsearch" />
        </form>
    </div>
    [% END %]

    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
    <div id="checkin_search" class="residentsearch">
        <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
            <input name="barcode" id="ret_barcode" class="head-searchbox" accesskey="r" type="text" placeholder="Scan a barcode to check in" />
            <input value="" type="submit" id="submit" />
        </form>
    </div>

    <div id="renew_search" class="residentsearch">
        <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
            <input name="barcode" id="ren_barcode" class="head-searchbox" accesskey="r" type="text" placeholder="Scan a barcode to renew" />
            <input value="" type="submit" id="submit" />
        </form>
    </div>
    [% END %]

    [% IF CAN_user_borrowers_edit_borrowers %]
    <div id="patron_search" class="residentsearch">
        <form method="post" action="/cgi-bin/koha/members/member.pl">
            <input name="searchmember" id="searchmember" class="head-searchbox" type="text" placeholder="Enter patron card number or partial name" />
            <input type="hidden" name="quicksearch" value="1" />
            <input value="" type="submit" id="submit" />
        </form>
    </div>
    [% END %]

    [% INCLUDE 'catalogue-search-box.inc' %]

    <ul id="taille">
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_1" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check in" onclick="clique(this)" class="iconsearch" href="#checkin_search"><i class="fa fa-download"></i></a></li>[% END %]
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_3" title="Renew" onclick="clique(this)" class="iconsearch" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %]
        [% IF ( CAN_user_borrowers_edit_borrowers ) %]<li><a id="icon_4" title="Search patrons" onclick="clique(this)" class="iconsearch" href="#patron_search"><i class="fa fa-fw fa-id-card-o"></i></a></li>[% END %]
        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_5" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]

        <span id="button_1" class="buttonsearch active">Check-out</span>
        <span id="button_2" class="buttonsearch">Check-in</span>
        <span id="button_3" class="buttonsearch">Renew</span>
        <span id="button_4" class="buttonsearch">Search patrons</span>
        <span id="button_5" class="buttonsearch">Search catalog</span>
    </ul>
</div>



<script type="text/javascript">
    function focusInput(){
        document.getElementsByClassName('head-searchbox').focus();
    }

    function toggle(elem){style="width: calc(301px);"
        var buttonssearch = document.getElementsByClassName('active');
        for (var i = buttonssearch.length - 1; i >= 0; i--) {
            buttonssearch[i].classList.remove('active');

            fold();
        }else{//Back
            document.getElementById('button_1').classList.add('active');
            document.getElementById('header_search').classList.remove('fold');
            document.getElementsByClassName('head-searchbox').style = '';
        }

        focusInput();
    }

    function clique(elem){
        var buttonssearch = document.getElementsByClassName('buttonsearch');
        var iconssearch = document.getElementsByClassName('iconsearch');
        var inputssearch = document.getElementsByClassName('head-searchbox');
        for (var i = buttonssearch.length - 1; i >= 0; i--) {
            buttonssearch[i].classList.remove('active');
            if (elem == iconssearch[i]){
                buttonssearch[i].classList.add('active');
            }
        }

        for (var i = inputssearch.length - 1; i >= 0; i--) {
            inputssearch[i].classList.remove('focus');

            if (elem == iconssearch[i]){
                inputssearch[i].classList.add('focus');

                taille(inputssearch[i])
            }
        }

        focusInput();
        fold();
    }

    function fold(){
        document.getElementById('header_search').classList.add('fold');
       // document.getElementsByClassName('head-searchbox').style = "width:calc(500px - 100px)";
        setTimeout(
            function(){
                var offsetWidth = document.getElementById('taille').offsetWidth +5;
                document.getElementsByClassName('head-searchbox').style = "width:calc(500px - "+offsetWidth+"px)";
            }
        , 250);
    }

    function taille(el){
        var offsetWidth = document.getElementById('taille').offsetWidth +5;
        el.style = "width:calc(500px - "+offsetWidth+"px)";
    }

    $('.btn').click(function(){
    if($(this).hasClass('active')){
        $(this).removeClass('active')
    } else {
        $(this).addClass('active')
    }
});



</script>

<!-- /header_search -->

Lines 1-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc (-2 / +2 lines)
1	[% INCLUDE 'blocking_errors.inc' %]	1	[% INCLUDE 'blocking_errors.inc' %]
2	<div id="toolbar" class="btn-toolbar">	2	<div id="toolbar" class="btn-toolbar">
3	<div class="btn-group">	3	<div class="btn-group">
4	<button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button>	4	<button class="pat" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button>
5	<ul class="dropdown-menu">	5	<ul class="dropdown-menu">
6	<li><a href="/cgi-bin/koha/labels/label-edit-batch.pl?op=new">Label batch</a></li>	6	<li><a href="/cgi-bin/koha/labels/label-edit-batch.pl?op=new">Label batch</a></li>
7	<li><a href="/cgi-bin/koha/labels/label-edit-layout.pl?op=new">Layout</a></li>	7	<li><a href="/cgi-bin/koha/labels/label-edit-layout.pl?op=new">Layout</a></li>
Lines 11-17 Link Here
11	</ul>	11	</ul>
12	</div>	12	</div>
13	<div class="btn-group">	13	<div class="btn-group">
14	<button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-edit"></i> Manage <span class="caret"></span></button>	14	<button class="pat" data-toggle="dropdown"><i class="fa fa-edit"></i> Manage <span class="caret"></span></button>
15	<ul class="dropdown-menu">	15	<ul class="dropdown-menu">
16	<li><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=batch">Label batches</a></li>	16	<li><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=batch">Label batches</a></li>
17	<li><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=layout">Layouts</a></li>	17	<li><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=layout">Layouts</a></li>




[% USE Koha %]

<div id="header_search" class="fold">
        <div id="notices_search" class="residentsearch">
                <form action="/cgi-bin/koha/tools/letter.pl" method="post">
                        <input class="head-searchbox focus" type="text" name="searchfield" id="searchfield" value="" placeholder="Search existing notices:"/>
                        <input type="submit" class="submit" name="search" value="" />
                </form>
        </div>

        [% INCLUDE 'patron-search-box.inc' %]

        [% INCLUDE 'catalogue-search-box.inc' %]

	<ul>
                <li><a id="icon_1" title="Search notices" onclick="clique(this)" class="iconsearch" href="#notices_search"><i class="fa fa-upload"></i></a></li>
                [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
                [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]

                <span  id="button_1" class="buttonsearch active" >Search notices</span>
                <span id="button_2" class="buttonsearch">Check out</span>
                <span id="button_3" class="buttonsearch">Search the catalog</span>
	</ul>
</div>
</div><!-- /gradient -->
<!-- End Notices Resident Search Box -->




[% USE Koha %]
<!-- Begin Main page Resident Search Box -->

<div id="containersearch" class="fold">
    [% IF (CAN_user_borrowers) %]
    <div id="checkout_search" class="residentsearch">
        <form action="/cgi-bin/koha/circ/circulation.pl" id="patronsearch" method="post">
            <input id="inputsearch"  class="inpu" type="text" autocomplete="off" placeholder="Enter patron card number or partial name"  />
            <input type="hidden" name="quicksearch" value="1" />
            <input value="" type="submit" id="submitsearch" />
        </form>
    </div>
    [% END %]

    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
    <div id="checkin_search" class="residentsearch">
        <form action="/cgi-bin/koha/members/member.pl" id="patronsearch" method="post">
            [% IF ( PatronAutoComplete ) %]
                <div class="autocomplete">
                        <input autocomplete="off" class="inpu" id="inputsearch" name="findborrower" class="head-searchbox" type="text" placeholder="Scan a barcode to check in" />
                        <input value="" id="submitsearch" type="submit"/>

                    [% IF ( stickyduedate ) %]
                        <input type="hidden" name="duedatespec" value="[% duedatespec | html %]" />
                        <input type="hidden" name="stickyduedate" value="[% stickyduedate | html %]" />
                    [% END %]
                </div>

            [% ELSE %]
                <input id="inputsearch" name="findborrower" class="inpu head-searchbox" type="text" autocomplete="off" placeholder=Scan a barcode to check in" />
                [% IF ( stickyduedate ) %]
                <input type="hidden" name="duedatespec" value="[% duedatespec | html %]" />
                <input type="hidden" name="stickyduedate" value="[% stickyduedate | html %]" />
                [% END %]
                <input value="" id="submitsearch" type="submit" />
            [% END %]
        </form>
    </div>

    <div id="renew_search" class="residentsearch">
        <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
            <input name="barcode" id="inputsearch" class="inpu" accesskey="r" type="text" placeholder="Scan a barcode to renew" />
            <input value="" type="submit" id="submitsearch" />
        </form>
    </div>
    <div id="search_search" class="residentsearch">
        <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
            <input name="barcode" id="inputsearch" class="inpu" type="text" placeholder="Enter search keyords" />
            <input value="" type="submit" id="submitsearch" />
        </form>
    </div>
    [% END %]

    [% IF ( CAN_user_catalogue ) %]
    <div id="search_search" class="residentsearch">
        <form method="post" action="/cgi-bin/koha/catalogue/search.pl" autocomplete="off" method="get" id="cat-search-block">
            [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
                    [% INCLUDE 'search_indexes.inc' %]
                [% END %]
            <input name="barcode" class="inpu" id="inputsearch focus" type="text" placeholder="Enter search keyords" />
            <input value="" type="submit" id="submitsearch" />
        </form>
    </div>
    [% END %]

    <ul>
        <span id="buttonssearch">
           <span id="button_1" title="Check out" onclick="clique(this)" class="iconsearch"><i class="fa fa-upload"></i></span> <span id="button_2" title="Check in" onclick="clique(this)" class="iconsearch"><i class="fa fa-download"></i></span> <span id="icon_3" title="Renew" onclick="clique(this)" class="iconsearch"><i class="fa fa-retweet"></i></span> <span id="icon_4" title="Search catalog" onclick="clique(this)" class="iconsearch"><i class="fa fa-fw fa-search"></i></span>
            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_1" onclick="toggle(this)" class="buttonsearch" href="#circ_search">Check-out</span>[% END %]
            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_2" onclick="toggle(this)" class="buttonsearch" href="#checkin_search">Check-in</span>[% END %]
            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_3" onclick="toggle(this)" class="buttonsearch" href="#renew_search">Renew</span>[% END %]
            [% IF ( CAN_user_catalogue ) %]<span id="button_5" onclick="toggle(this)" class="buttonsearch active" href="#catalog_search">Search catalog</span>[% END %]
        </span>
    </ul>
</div>

<script type="text/javascript">
    function focusInput(){
        document.getElementById('inputsearch').focus();
    }

    function toggle(elem){
        var buttonssearch = document.getElementsByClassName('active');
        for (var i = buttonssearch.length - 1; i >= 0; i--) {
            buttonssearch[i].classList.remove('active');
        }

        if(elem){
            elem.classList.add('active');
            fold();
        }else{//Back
            document.getElementById('button_1').classList.add('active');
            document.getElementById('containersearch').classList.remove('fold');
            document.getElementById('inputsearch').style = '';
        }

        focusInput();
    }


    function clique(elem){
        var buttonssearch = document.getElementsByClassName('buttonsearch');
        var iconssearch = document.getElementsByClassName('iconsearch');
        var inputssearch = document.getElementsByClassName('inpu');
        for (var i = buttonssearch.length - 1; i >= 0; i--) {
            buttonssearch[i].classList.remove('active');
            if (elem == iconssearch[i]){
                buttonssearch[i].classList.add('active');
            }
        }

        for (var i = inputssearch.length - 1; i >= 0; i--) {
            inputssearch[i].classList.remove('focus');

            if (elem == iconssearch[i]){
                inputssearch[i].classList.add('focus');
            }
        }

        fold();
        focusInput();
    }

    function fold(){

        document.getElementById('containersearch').classList.add('fold');
        // document.getElementById('inputsearch').style = "width:calc(500px - 100px)";
        setTimeout(
            function(){
                var offsetWidth = document.getElementById('buttonssearch').offsetWidth +5;
                document.getElementById('inputsearch').style = "width:calc(500px - "+offsetWidth+"px)";
            }
        , 250);
    }


</script>

<!-- /header_search -->
<!-- End Main page Resident Search Box -->

Lines 2-8 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc (-1 / +1 lines)
2	[% USE AuthorisedValues %]	2	[% USE AuthorisedValues %]
3	[% BLOCK 'alt-address-style' %]	3	[% BLOCK 'alt-address-style' %]
4	<fieldset class="rows" id="memberentry_address">	4	<fieldset class="rows" id="memberentry_address">
5	<legend id="alt_address_lgd">Alternate address</legend>	5	<h3 id="alt_address_lgd">Alternate address</h3>
6	<ol>	6	<ol>
7	[% IF Koha.Preference( 'AddressFormat' ) %]	7	[% IF Koha.Preference( 'AddressFormat' ) %]
8	[% PROCESS "member-alt-address-style-${ Koha.Preference( 'AddressFormat' ) }" %]	8	[% PROCESS "member-alt-address-style-${ Koha.Preference( 'AddressFormat' ) }" %]

Lines 1-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style.inc (-1 / +1 lines)
1	[% USE Koha %]	1	[% USE Koha %]
2	[% BLOCK 'alt-contact-style' %]	2	[% BLOCK 'alt-contact-style' %]
3	<fieldset class="rows" id="memberentry_altaddress">	3	<fieldset class="rows" id="memberentry_altaddress">
4	<legend id="alt_contact_lgd">Alternate contact</legend>	4	<h3 id="alt_contact_lgd">Alternate contact</h3>
5	<ol>	5	<ol>
6	[% IF Koha.Preference( 'AddressFormat' ) %]	6	[% IF Koha.Preference( 'AddressFormat' ) %]
7	[% PROCESS "member-alt-contact-style-${ Koha.Preference( 'AddressFormat' ) }" %]	7	[% PROCESS "member-alt-contact-style-${ Koha.Preference( 'AddressFormat' ) }" %]

Lines 2-8 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc (-1 / +1 lines)
2	[% USE AuthorisedValues %]	2	[% USE AuthorisedValues %]
3	[% BLOCK 'main-address-style' %]	3	[% BLOCK 'main-address-style' %]
4	<fieldset class="rows" id="memberentry_mainaddress">	4	<fieldset class="rows" id="memberentry_mainaddress">
5	<legend id="main_address_lgd">Main address</legend>	5	<h3 id="main_address_lgd">Main address</h3>
6	<ol>	6	<ol>
7	[% IF Koha.Preference( 'AddressFormat' ) %]	7	[% IF Koha.Preference( 'AddressFormat' ) %]
8	[% PROCESS "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }" %]	8	[% PROCESS "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }" %]

Lines 98-104 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc (-1 / +1 lines)
98	<a id="searchtohold" class="pat" href="#"><i class="fa fa-search"></i> Search to hold</a>	98	<a id="searchtohold" class="pat" href="#"><i class="fa fa-search"></i> Search to hold</a>
99	[% END %]	99	[% END %]
100		100
101	<a id="addnewmessageLabel" href="#add_message_form" data-toggle="modal" class="pat"><i class="fa fa-comment-o"></i> Add message</a>	101	<a href="#add_message_form" data-toggle="modal" class="pat"><i class="fa fa-comment-o"></i> Add message</a>
102		102
103	</div>	103	</div>
104	</div>	104	</div>

Lines 6-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-age.inc (-1 / +1 lines)
6	[%- SET age = (patron.get_age != undef) ? patron.get_age : patron.age -%]	6	[%- SET age = (patron.get_age != undef) ? patron.get_age : patron.age -%]
7	[%- IF age >= 0 %]	7	[%- IF age >= 0 %]
8	[%- patron.dateofbirth \| $KohaDates -%]	8	[%- patron.dateofbirth \| $KohaDates -%]
9	<span class='age_years'>[% I18N.tnx('({age} year)', '({age} years)', age, { age => age }) \| html %]</span>	9	<span class='age_years'>[% I18N.tnx('- {age} year', '- {age} years', age, { age => age }) \| html %]</span>
10	[%- END -%]	10	[%- END -%]
11	[%- END -%]	11	[%- END -%]
12	[%- END -%]	12	[%- END -%]




[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
    <div id="circ_search" class="residentsearch">
        <form action="/cgi-bin/koha/circ/circulation.pl" id="patronsearch" method="post">
            [% IF ( PatronAutoComplete ) %]
                <div class="autocomplete">
                        <input autocomplete="off" id="findborrower" style="width: calc(291px);" name="findborrower" class="head-searchbox focus" type="text" placeholder="Enter patron card number or partial name" />
                        <input id="autocsubmit" type="submit" class="submit" value=""/>
                    
                    [% IF ( stickyduedate ) %]
                        <input type="hidden" name="duedatespec" value="[% duedatespec | html %]" />
                        <input type="hidden" name="stickyduedate" value="[% stickyduedate | html %]" />

                </div>

            [% ELSE %]
                <input id="findborrower" name="findborrower" class="head-searchbox focus" type="text" autocomplete="off" />
                [% IF ( stickyduedate ) %]
                <input type="hidden" name="duedatespec" value="[% duedatespec | html %]" />
                <input type="hidden" name="stickyduedate" value="[% stickyduedate | html %]" />
                [% END %]
                <input value="" class="submit" type="submit" />
            [% END %]
        </div>
	[% ELSE %]
            <input id="findborrower" name="findborrower" size="40" class="head-searchbox" type="text" autocomplete="off" />
            [% IF ( stickyduedate ) %]
            <input type="hidden" name="duedatespec" value="[% duedatespec | html %]" />
            <input type="hidden" name="stickyduedate" value="[% stickyduedate | html %]" />
            [% END %]
        </form>
    </div>
[% END %]
	</div>
	[% END %]

Lines 4-9 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc (+122 lines)
4	[% USE raw %]	4	[% USE raw %]
5	[% USE Asset %]	5	[% USE Asset %]
6	[% USE To %]	6	[% USE To %]
		7	[% PROCESS 'html_helpers.inc' %]
		8	[% PROCESS 'patronfields.inc' %]
		9	<!-- Begin Patrons Resident Search Box -->
		10
		11	<div id="header_search" class="fold">
		12
		13	<div id="patron_search" class="residentsearch">
		14	<form action="/cgi-bin/koha/members/member.pl" method="post">
		15	<div class="autocomplete">
		16	<input name="barcode" id="searchmember" class="head-searchbox focus" type="text" placeholder="Enter patron card number or partial name">
		17	<span class="filteraction" id="filteraction_off"> <a id="plus" href="#">[-]</a></span>
		18	<span class="filteraction" id="filteraction_on"> <a id="plus" href="#">[+]</a></span></input>
		19	<input value="" id="submitsearch" type="submit" />
		20	<input type="hidden" name="quicksearch" value="1" />
		21	</div>
7		22
8	[%# Display a simple form %]	23	[%# Display a simple form %]
9	[% BLOCK patron_search_filters_simple %]	24	[% BLOCK patron_search_filters_simple %]
Lines 167-172 Link Here
167	</thead>	182	</thead>
168	<tbody></tbody>	183	<tbody></tbody>
169	</table>	184	</table>
		185	[% INCLUDE 'patron-search-box.inc' %]
		186
		187	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
		188	<div id="checkin_search" class="residentsearch">
		189	<form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
		190	<input name="barcode" id="ret_barcode" class="head-searchbox focus" accesskey="r" type="text" placeholder="Scan a barcode to check in" />
		191	<input value="" type="submit" id="submit" />
		192	</form>
		193	</div>
		194
		195	<div id="renew_search" class="residentsearch">
		196	<form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
		197	<input name="barcode" id="ren_barcode" class="head-searchbox focus"type="text" placeholder="Scan a barcode to renew" />
		198	<input value="" type="submit" id="submit" />
		199	</form>
170	</div>	200	</div>
171		201
172	<!-- Patron preview modal -->	202	<!-- Patron preview modal -->
Lines 804-816 Link Here
804		834
805	if ( setstate ) {	835	if ( setstate ) {
806	history.pushState( null, null, "?firstletter=" + letter );	836	history.pushState( null, null, "?firstletter=" + letter );
		837	[% INCLUDE 'catalogue-search-box.inc' %]
		838
		839	<ul id="taille">
		840	<li><a id="icon_1" title="Search patrons" onclick="clique(this)" class="iconsearch" href="#patron_search"><i class="fa fa-fw fa-id-card-o"></i></a></li>
		841	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
		842	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_3" title="Check in" onclick="clique(this)" class="iconsearch" href="#checkin_search"><i class="fa fa-download"></i></a></li>[% END %]
		843	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_4" title="Renew" onclick="clique(this)" class="iconsearch" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %]
		844	[% IF ( CAN_user_catalogue ) %]<li><a id="icon_5" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
		845
		846	<span id="button_1" class="buttonsearch active">Search patrons</span>
		847	<span id="button_2" class="buttonsearch">Check-out</span>
		848	<span id="button_3" class="buttonsearch">Check-in</span>
		849	<span id="button_4" class="buttonsearch">Renew</span>
		850	<span id="button_5" class="buttonsearch">Search catalog</span>
		851	</ul>
		852	</div>
		853
		854
		855	<script type="text/javascript">
		856	function focusInput(){
		857	document.getElementsByClassName('head-searchbox').focus();
		858	}
		859
		860	function toggle(elem){style="width: calc(301px);"
		861	var buttonssearch = document.getElementsByClassName('active');
		862	for (var i = buttonssearch.length - 1; i >= 0; i--) {
		863	buttonssearch[i].classList.remove('active');
		864	}
		865
		866	if(elem){
		867	elem.classList.add('active');
		868	fold();
		869	}else{//Back
		870	document.getElementById('button_1').classList.add('active');
		871	document.getElementById('header_search').classList.remove('fold');
		872	document.getElementsByClassName('head-searchbox').style = '';
		873	}
		874
		875	focusInput();
		876	}
		877
		878	function clique(elem){
		879	var buttonssearch = document.getElementsByClassName('buttonsearch');
		880	var iconssearch = document.getElementsByClassName('iconsearch');
		881	var inputssearch = document.getElementsByClassName('head-searchbox');
		882	for (var i = buttonssearch.length - 1; i >= 0; i--) {
		883	buttonssearch[i].classList.remove('active');
		884	if (elem == iconssearch[i]){
		885	buttonssearch[i].classList.add('active');
		886	}
		887	}
		888
		889	for (var i = inputssearch.length - 1; i >= 0; i--) {
		890	inputssearch[i].classList.remove('focus');
		891
		892	if (elem == iconssearch[i]){
		893	inputssearch[i].classList.add('focus');
		894
		895	taille(inputssearch[i])
807	}	896	}
		897	}
808		898
		899	focusInput();
		900	fold();
		901	}
		902
		903	function fold(){
		904	document.getElementById('header_search').classList.add('fold');
		905	// document.getElementsByClassName('head-searchbox').style = "width:calc(500px - 100px)";
		906	setTimeout(
		907	function(){
		908	var offsetWidth = document.getElementById('taille').offsetWidth +5;
		909	document.getElementsByClassName('head-searchbox').style = "width:calc(500px - "+offsetWidth+"px)";
		910	}
		911
		912	<<<<<<< HEAD
809	patrons_table.DataTable().draw();	913	patrons_table.DataTable().draw();
810	[% IF display_search_description %]	914	[% IF display_search_description %]
811	update_search_description();	915	update_search_description();
812	[% END %]	916	[% END %]
813	}	917	}
		918	=======
		919	function taille(el){
		920	var offsetWidth = document.getElementById('taille').offsetWidth +5;
		921	el.style = "width:calc(500px - "+offsetWidth+"px)";
		922	}
		923
		924	$('.btn').click(function(){
		925	if($(this).hasClass('active')){
		926	$(this).removeClass('active')
		927	} else {
		928	$(this).addClass('active')
		929	}
		930	});
		931
		932
		933
		934	</script>
		935	>>>>>>> Bug 30952: Search bar
814		936
815	// modify parent window owner element	937	// modify parent window owner element
816	function add_user(borrowernumber, borrowername) {	938	function add_user(borrowernumber, borrowername) {





[% UNLESS ( no_add ) %]
<div id="toolbar" class="btn-toolbar">
    <div class="btn-group">
        <button class="pat" data-toggle="dropdown"><i class="fa fa-plus"></i> New patron <span class="caret"></span></button>
        <ul class="dropdown-menu">
            [% FOREACH category IN categories %]<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;categorycode=[% category.categorycode | uri %]">[% category.description | html %]</a></li>[% END %]
        </ul>
    </div>

    <div class="btn-group">
    [% IF Koha.Preference('PatronQuickAddFields') || Koha.Preference('BorrowerMandatoryField') %]
        <button class="pat" data-toggle="dropdown"><i class="fa fa-plus"></i> Quick add new patron <span class="caret"></span></button>
        <ul class="dropdown-menu">
            [% FOREACH category IN categories %]<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;categorycode=[% category.categorycode | uri %]&amp;quickadd=true">[% category.description | html %]</a></li>[% END %]
        </ul>

    [% END %]
    </div>

    <div class="btn-group">
    [% IF CAN_user_tools_manage_patron_lists %]
        <a class="pat" href="/cgi-bin/koha/patron_lists/lists.pl"><i class="fa fa-edit"></i> Patron lists</a>
    [% END %]




                [% IF ( expiry ) %]
                    <span>Patron's card expired on [% expiry | $KohaDates %]</span>
                [% END %]
                <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;destination=circ&amp;reregistration=y" id="lientype">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber | html %]" id="lientype">Edit details</a>
            </li>
        [% END %]


                        [% END %]
                    </em><br/>
                [% END %]
                <a class="btn btn-xs btn-default" href="#reldebarments" onclick="$('#debarments-tab-link').click()" id="lientype"><i class="fa fa-ban"></i> View restrictions</a>

                [% IF (noissues && CAN_user_circulate_force_checkout) %]
                    <span class="override_debarment">
                        <a href="/cgi-bin/koha/circ/circulation.pl?forceallow=1&amp;borrowernumber=[% patron.borrowernumber | uri %]" class="btn btn-xs btn-default" id="lientype">Override restriction temporarily</a>
                    </span>
                [% END %]
            </li> <!-- /.blocker -->


        [% IF ( odues ) %]
            <li class="odues blocker">
                <span class="circ-hlt">Overdues:</span>  Patron has ITEMS OVERDUE <a href="#checkouts" id="lientype">See highlighted items below</a>
            </li>
        [% END %]



[% IF ( patron_messages ) %]
    <div id="messages" class="circmessage">
        <h3>Messages</h3>
        <ul>
            [% FOREACH patron_message IN patron_messages %]
                <li>

                        <em>"[% patron_message.message | html %]"</em>
                    </span>
                    [% IF patron_message.branchcode == Branches.GetLoggedInBranchcode OR Koha.Preference('AllowAllMessageDeletion') %]
                        <a class="btn btn-link" id="lientype" href="/cgi-bin/koha/circ/del_message.pl?message_id=[% patron_message.message_id | html %]&amp;borrowernumber=[% patron_message.borrowernumber | html %]&amp;from=moremember" onclick='return confirm(_("Are you sure you want to delete this message? This cannot be undone."));'><i class="fa fa-trash"></i> Delete</a>
                    [% END %]
                </li>
            [% END %]

Lines 1-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc (-2 / +2 lines)
1	[% INCLUDE 'blocking_errors.inc' %]	1	[% INCLUDE 'blocking_errors.inc' %]
2	<div id="toolbar" class="btn-toolbar">	2	<div id="toolbar" class="btn-toolbar">
3	<div class="btn-group">	3	<div class="btn-group">
4	<button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button>	4	<button class="pat" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button>
5	<ul class="dropdown-menu">	5	<ul class="dropdown-menu">
6	<li><a href="/cgi-bin/koha/patroncards/edit-batch.pl?op=new">Card batch</a></li>	6	<li><a href="/cgi-bin/koha/patroncards/edit-batch.pl?op=new">Card batch</a></li>
7	<li><a href="/cgi-bin/koha/patroncards/image-manage.pl">Image</a></li>	7	<li><a href="/cgi-bin/koha/patroncards/image-manage.pl">Image</a></li>
Lines 11-17 Link Here
11	</ul>	11	</ul>
12	</div>	12	</div>
13	<div class="btn-group">	13	<div class="btn-group">
14	<button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-edit"></i> Manage <span class="caret"></span></button>	14	<button class="pat" data-toggle="dropdown"><i class="fa fa-edit"></i> Manage <span class="caret"></span></button>
15	<ul class="dropdown-menu">	15	<ul class="dropdown-menu">
16	<li><a href="/cgi-bin/koha/patroncards/manage.pl?card_element=batch">Card batches</a></li>	16	<li><a href="/cgi-bin/koha/patroncards/manage.pl?card_element=batch">Card batches</a></li>
17	<li><a href="/cgi-bin/koha/patroncards/image-manage.pl">Images</a></li>	17	<li><a href="/cgi-bin/koha/patroncards/image-manage.pl">Images</a></li>




[% USE Koha %]
<div id="header_search" class="fold">

<div id="header_search">
	<div id="patron_category_search" class="residentsearch">
        <form action="[% script_name | html %]" method="post">
            <input class="head-searchbox focus" type="text" name="description" value="[% searchfield | html %]" placeholder="Search by patron category name:" />
            <input type="submit" class="submit" name="search" value="" />
        </form>
	</form>	
	</div>

    [% INCLUDE 'patron-search-box.inc' %]

	[% IF ( CAN_user_catalogue ) %]
    <div id="catalog_search" class="residentsearch">
		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">

                <label class="tip" for="search-form">Enter search keywords:</label>
            [% END %]
            <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
				<input type="submit" value=""  class="submit" />
		</form>
	</div>[% END %]

	<ul>
        <li><a id="icon_1" title="Search patron categories" onclick="clique(this)" class="iconsearch" href="#patron_category_search"><i class="fa fa-upload"></i></a></li>
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]

        <span id="button_1" class="buttonsearch active">Search patron categories</span>
        <span id="button_2" class="buttonsearch">Check out</span>
        <span id="button_3" class="buttonsearch">Search the catalog</span>
	</ul>
</div>
<!-- End Patrons Admin Resident Search Box -->




[% USE Koha %]

<div id="header_search" class="fold">

    <div id="syspref_search" class="residentsearch">
        <form action="/cgi-bin/koha/admin/preferences.pl">
            <input type="hidden" name="tab" value="[% last_tab | html %]" />
            <input type="hidden" name="op" value="search" />
            <input class="head-searchbox focus" type="text" name="searchfield" id="searchfield" value="" placeholder="System preference search">
            <input type="submit" id="submit" value="" />
        </form>
	</div>

    [% INCLUDE 'patron-search-box.inc' %]

    [% INCLUDE 'catalogue-search-box.inc' %]

    <ul>
        <li><a id="icon_1" title="Search system preferences" onclick="clique(this)" class="iconsearch" href="#syspref_search"><i class="fa fa-upload"></i></a></li>
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]

        <span id="button_1" class="buttonsearch active">Search system preferences</span>
        <span id="button_2" class="buttonsearch">Check-out</span>
        <span id="button_3" class="buttonsearch">Search the catalog</span>
    </ul>
</div>





[% USE HtmlId %]
<div id="navmenu">
<div id="navmenulist">
    <ul>
        [% IF ( accounting ) %]
            <li class="active">

        </li>
    </ul>
</div>
</div>

[% BLOCK subtabs %]
    [% UNLESS ( searchfield ) %]
        [% FOREACH TAB IN TABS %]
            <ul class="sousmenu">
                [% FOREACH LINE IN TAB.LINES %]
                    [% IF ( LINE.is_group_title ) %]
                        <li><a class="pref_sublink" href="#[% LINE.title | $HtmlId %]">[% LINE.title | html %]</a></li>




<div id="toolbar" class="btn-toolbar">
    [% IF ( CAN_user_reports_create_reports ) %]
        <div class="btn-group">
            <button class="pat" data-toggle="dropdown"><i class="fa fa-plus"></i> New report <span class="caret"></span></button>
            <ul class="dropdown-menu">
                <li id="newmenuc"><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new">New guided report</a> </li>
                <li id="newsql"><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create%20report%20from%20SQL">New SQL report</a> </li>

        [% IF ( CAN_user_reports_create_reports ) %]
            [% UNLESS ( editsql ) # Do not show edit button on edit page %]
                <div class="btn-group">
                    <a id="editreport" class="pat" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id | html %]&amp;phase=Edit%20SQL">
                        <i class="fa fa-pencil"></i> Edit
                    </a>
                </div>
            [% END %]
            <div class="btn-group">
                <a class="pat" title="Duplicate this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create report from existing&amp;report_id=[% id | uri %]">
                    <i class="fa fa-copy"></i> Duplicate
                </a>
            </div>


        [% IF ( CAN_user_reports_delete_reports ) %]
            <div class="btn-group">
                <a class="pat" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id | html %]&phase=Delete%20Saved">
                    <i class="fa fa-trash"></i> Delete
                </a>
            </div>


        [% UNLESS ( errors ) # Unless there are errors saving a report %]
            <div class="btn-group">
                <a id="runreport" class="pat" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id | html %]&amp;phase=Run%20this%20report">
                    <i class="fa fa-play"></i> Run report
                </a>
            </div>
            <div class="btn-group">
                <a class="pat" href="/cgi-bin/koha/tools/scheduler.pl?id=[% id | html %]">
                    <i class="fa fa-clock-o"></i> Schedule
                </a>
            </div>


        [% IF ( mana_id && Koha.Preference('Mana') == 1 ) %]
            <div class="btn-group">
                <button class="pat" data-toggle="dropdown"> Report mistake <span class="caret"></span></button>
                <ul class="dropdown-menu">
                    [% FOREACH c IN mana_comments %]
                        <li class="mana-comment" data-id="[% c.id | $raw %]">



            <div class="btn-group">
                <button class="pat" data-toggle="dropdown" id="format"><i class="fa fa-download"></i> Download <span class="caret"></span></button>
                <ul class="dropdown-menu">
                    <li><a id="csv" href="/cgi-bin/koha/reports/guided_reports.pl?reports=1&phase=Export&amp;format=csv&amp;report_id=[% id | html %]&amp;reportname=[% name |uri %][% PROCESS params %]">[% PROCESS 'delimiter_text.inc' %]</a></li>
                    <li><a id="tab" href="/cgi-bin/koha/reports/guided_reports.pl?reports=1&phase=Export&amp;format=tab&amp;report_id=[% id | html %]&amp;reportname=[% name |uri %][% PROCESS params %]">Tab separated text</a></li>

            </div>
            <div class="btn-group">
                [% IF allresults.size %]
                    <a class="pat" href="#" data-toggle="modal" data-target="#chartModal"><i class="fa fa-bar-chart"></i> Create chart</a>
                [% ELSE %]
                    <a class="pat" href="#" data-toggle="modal" data-target="#chartModal"><i class="fa fa-bar-chart"></i> Create chart</a>
                    <a class="pat fetch_chart_data" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id | html %]&amp;phase=Run this report&amp;reportname=[% name |uri %][% PROCESS params %]&amp;want_full_chart=1"><i class="fa fa-bar-chart"></i> Fetch all data for chart</a>
                [% END %]

            </div>

                        </div>
                    </div>
                    <div class="modal-footer">
                        <button type="button" class="pat" data-dismiss="modal">Cancel</button>
                    </div>
                </div>
            </form>




[% USE Koha %]

  <div id="header_search" class="fold">

    <div id="subscription_search" class="residentsearch">
      <p class="tip">Search subscriptions:</p>

      <form action="/cgi-bin/koha/serials/serials-search.pl" method="get">
        [% IF ( routing ) %]
          <input type="hidden" name="routing" value="[% routing | html %]" />
        [% END %]
        <input type="hidden" name="searched" value="1" />
        <label for="ISSN_filter">ISSN:</label> <input type="text" size="10" maxlength="11" name="ISSN_filter" id="ISSN_filter" value="[% ISSN_filter | html %]" />

        [% IF (UNIMARC) %]
          <label for="EAN_filter">EAN:</label> <input type="text" size="20" maxlength="40" name="EAN_filter" id="EAN_filter" value="[% EAN_filter | html %]" />
        [% END %]
        <label for="title_filter">Title:</label> <input type="text" size="20" maxlength="40" name="title_filter" id="title_filter" value="[% title_filter | html %]" />
        <input value="Submit" class="submit" type="submit" /> <a href="/cgi-bin/koha/serials/serials-search.pl">Advanced search</a>
      </form>
    </div>

    [% INCLUDE 'patron-search-box.inc' %]

    [% INCLUDE 'catalogue-search-box.inc' %]

    <ul>
      <li><a id="icon_1" title="Search subscriptions" onclick="clique(this)" class="iconsearch" href="#subscription_search"><i class="fa fa-upload"></i></a></li>
      [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
      [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]

      <span id="button_1" class="buttonsearch active">Search subscriptions</span>
      <span id="button_2" class="buttonsearch">Check out</span>
      <span id="button_3" class="buttonsearch">Search the catalog</span>
    </ul>

  </div><!-- /header_search -->
</div><!-- /gradient -->
<!-- End Serials Resident Search Box -->




[% USE Koha %]

<div id="navmenu">
    <div id="navmenulist">

        <ul>
            <li>
                <a class="titre" href="/cgi-bin/koha/tools/tools-home.pl">Tools home</a>
            </li>
        </ul>

        [% IF ( CAN_user_tools_manage_patron_lists || CAN_user_clubs || CAN_user_tools_moderate_comments || CAN_user_tools_import_patrons  || CAN_user_tools_edit_notices || CAN_user_tools_edit_notice_status_triggers || CAN_user_tools_label_creator || CAN_user_tools_delete_anonymize_patrons  || CAN_user_tools_edit_patrons || CAN_user_tools_moderate_tags || ( CAN_user_tools_batch_upload_patron_images && Koha.Preference('patronimages') ) ) %]
        <ul>
            <h5>Patrons and circulation</h5>

            [% IF ( CAN_user_tools_manage_patron_lists ) %]
            <li><a href="/cgi-bin/koha/patron_lists/lists.pl">Patron lists</a></li>
            [% END %]
            [% IF (CAN_user_clubs) %]
                <li><a href="/cgi-bin/koha/clubs/clubs.pl">Patron clubs</a></li>
            [% END %]
            [% IF ( CAN_user_tools_moderate_comments ) %]
            <li><a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Comments</a></li>
            [% END %]
            [% IF ( CAN_user_tools_import_patrons ) %]
            <li><a href="/cgi-bin/koha/tools/import_borrowers.pl">Import patrons</a></li>
            [% END %]
            [% IF ( CAN_user_tools_edit_notices ) %]
            <li><a href="/cgi-bin/koha/tools/letter.pl">Notices &amp; slips</a></li>
            [% END %]
            [% IF ( CAN_user_tools_edit_notice_status_triggers ) %]
            <li><a href="/cgi-bin/koha/tools/overduerules.pl">Overdue notice/status triggers</a></li>
            [% END %]
            [% IF ( CAN_user_tools_label_creator ) %]
            <li><a href="/cgi-bin/koha/patroncards/home.pl">Patron card creator</a></li>
            [% END %]
            [% IF ( CAN_user_tools_delete_anonymize_patrons ) %]
            <li><a href="/cgi-bin/koha/tools/cleanborrowers.pl">Batch patron deletion and anonymization</a></li>
            [% END %]
            [% IF ( CAN_user_tools_edit_patrons ) %]
            <li><a href="/cgi-bin/koha/tools/modborrowers.pl">Batch patron modification</a></li>
            [% END %]
            [% IF ( CAN_user_tools_batch_extend_due_dates ) %]
            <li><a href="/cgi-bin/koha/tools/batch_extend_due_dates.pl">Batch extend due dates</a></li>
            [% END %]
            [% IF ( CAN_user_tools_moderate_tags ) %]
            <li><a href="/cgi-bin/koha/tags/review.pl">Tag moderation</a></li>
            [% END %]
            [% IF ( CAN_user_tools_batch_upload_patron_images && Koha.Preference('patronimages') ) %]
            <li><a href="/cgi-bin/koha/tools/picture-upload.pl">Upload patron images</a></li>
            [% END %]
        </ul>
        [% END %]
        [% IF ( CAN_user_tools_items_batchdel || CAN_user_tools_items_batchmod || CAN_user_tools_records_batchdel  || CAN_user_tools_records_batchmod || CAN_user_tools_export_catalog || CAN_user_tools_inventory  || CAN_user_tools_label_creator || CAN_user_tools_rotating_collections  || ( CAN_user_stockrotation_manage_rotas && Koha.Preference('StockRotation') )  || CAN_user_tools_marc_modification_templates || CAN_user_tools_stage_marc_import  || CAN_user_tools_manage_staged_marc || CAN_user_tools_upload_local_cover_images ) %]

        <ul>
            <h5>Catalog</h5>

            [% IF ( CAN_user_tools_items_batchdel ) %]
            <li><a href="/cgi-bin/koha/tools/batchMod.pl?del=1">Batch item deletion</a></li>
            [% END %]
            [% IF ( CAN_user_tools_items_batchmod ) %]
            <li><a href="/cgi-bin/koha/tools/batchMod.pl">Batch item modification</a></li>
            [% END %]
            [% IF CAN_user_tools_records_batchdel %]
            <li><a href="/cgi-bin/koha/tools/batch_delete_records.pl">Batch record deletion</a></li>
            [% END %]
            [% IF CAN_user_tools_records_batchmod %]
            <li><a href="/cgi-bin/koha/tools/batch_record_modification.pl">Batch record modification</a></li>
            [% END %]
            [% IF CAN_user_tools_items_batchmod %]
            <li><a href="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl">Automatic item modifications by age</a></li>
            [% END %]
            [% IF ( CAN_user_tools_export_catalog ) %]
            <li><a href="/cgi-bin/koha/tools/export.pl">Export data</a></li>
            [% END %]
            [% IF ( CAN_user_tools_inventory ) %]
                <li><a href="/cgi-bin/koha/tools/inventory.pl">Inventory</a></li>
            [% END %]
            [% IF ( CAN_user_tools_label_creator ) %]
            <li><a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a></li>
            <li><a href="/cgi-bin/koha/labels/spinelabel-home.pl">Quick spine label creator</a></li>
            [% END %]
            [% IF ( CAN_user_tools_rotating_collections ) %]
            <li><a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Rotating collections</a></li>
            [% END %]
            [% IF ( CAN_user_stockrotation_manage_rotas && Koha.Preference('StockRotation') ) %]
            <li><a href="/cgi-bin/koha/tools/stockrotation.pl">Stock rotation</a></li>
            [% END %]
            [% IF ( CAN_user_tools_marc_modification_templates ) %]
                <li><a href="/cgi-bin/koha/tools/marc_modification_templates.pl">Manage MARC modification templates</a></li>
            [% END %]
            [% IF ( CAN_user_tools_stage_marc_import ) %]
            <li><a href="/cgi-bin/koha/tools/stage-marc-import.pl">Stage MARC for import</a></li>
            [% END %]
            [% IF ( CAN_user_tools_manage_staged_marc ) %]
            <li><a href="/cgi-bin/koha/tools/manage-marc-import.pl">Staged MARC management</a></li>
            [% END %]
            [% IF ( CAN_user_tools_upload_local_cover_images ) %]
            <li><a href="/cgi-bin/koha/tools/upload-cover-image.pl">Upload local cover image</a></li>
            [% END %]
        </ul>
        [% END %]
        [% IF ( CAN_user_tools_edit_calendar || CAN_user_tools_manage_csv_profiles || CAN_user_tools_view_system_logs || CAN_user_tools_edit_additional_contents  || CAN_user_tools_schedule_tasks || CAN_user_tools_edit_quotes || ( Koha.ArePluginsEnabled() && CAN_user_plugins_tool )  || CAN_user_tools_upload_general_files || CAN_user_tools_access_files ) %]

        <ul>
            <h5>Additional tools</h5>

            [% IF ( CAN_user_tools_edit_calendar ) %]
            <li><a href="/cgi-bin/koha/tools/holidays.pl">Calendar</a></li>
            [% END %]
            [% IF ( CAN_user_tools_manage_csv_profiles ) %]
            <li><a href="/cgi-bin/koha/tools/csv-profiles.pl">CSV profiles</a></li>
            [% END %]
            [% IF ( CAN_user_tools_view_system_logs ) %]
            <li><a href="/cgi-bin/koha/tools/viewlog.pl">Log viewer</a></li>
            [% END %]
            [% IF ( CAN_user_tools_edit_additional_contents ) %]
            <li><a href="/cgi-bin/koha/tools/additional-contents.pl?category=news">News</a></li>
            <li><a href="/cgi-bin/koha/tools/additional-contents.pl?category=html_customizations">HTML customizations</a></li>
            [% END %]
            [% IF ( CAN_user_tools_schedule_tasks ) %]
            <li><a href="/cgi-bin/koha/tools/scheduler.pl">Task scheduler</a></li>
            [% END %]
            [% IF ( CAN_user_tools_edit_quotes ) %]
            <li><a href="/cgi-bin/koha/tools/quotes.pl">Quote editor</a></li>
            [% END %]
            [% IF ( Koha.ArePluginsEnabled() && CAN_user_plugins_tool ) %]
                <li><a href="/cgi-bin/koha/plugins/plugins-home.pl?method=tool">Tool plugins</a></li>
            [% END %]
            [% IF ( CAN_user_tools_upload_general_files ) %]
            <li><a href="/cgi-bin/koha/tools/upload.pl">Upload any file</a></li>
            [% END %]
            [% IF ( CAN_user_tools_access_files ) %]
            <li><a href="/cgi-bin/koha/tools/access_files.pl">Access files</a></li>
            [% END %]
            [% IF ( Koha.Preference('OPACReportProblem') && CAN_user_problem_reports ) %]
                <li><a href="/cgi-bin/koha/tools/problem-reports.pl">OPAC problem reports</a></li>
            [% END %]
        </ul>
        [% END %]
    </div>
</div>




[% USE Koha %]
<div id="header_search" class="fold">

<div id="header_search">
    <div id="z3950_search" class="residentsearch">
	    <form action="/cgi-bin/koha/admin/z3950servers.pl" method="post">
                <input class="head-searchbox focus" type="text" name="searchfield" id="searchfield" value="[% searchfield | html %]" placeholder="Z39.50/SRU server search:" />
                <input class="head-searchbox" type="text" name="searchfield" id="searchfield" size="40" value="[% searchfield | html %]" />
                <input type="submit" class="submit" name="search" value="Search" />
        </form>
	</div>

    [% INCLUDE 'patron-search-box.inc' %]

    [% INCLUDE 'catalogue-search-box.inc' %]

    <ul>
        <li><li><a id="icon_1" title="Search Z39.50/SRU servers" onclick="clique(this)" class="iconsearch" href="#z3950_search"><i class="fa fa-upload"></i></a></li>
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]


        <span id="button_1" class="buttonsearch active">Search Z39.50/SRU servers</span>
        <span id="button_2" class="buttonsearch">Check out</span>
        <span id="button_3" class="buttonsearch">Search the catalog</span>
    </ul>
</div>
<!-- End Members Resident Search Box -->

Lines 19-24 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt (+6 lines)
19	<a href="#" aria-current="page">About Koha</a>	19	<a href="#" aria-current="page">About Koha</a>
20	</li>	20	</li>
21	</ol>	21	</ol>
		22	<ol>
		23	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		24	</ol>
		25	<ol>
		26	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		27	</ol>
22	</nav>	28	</nav>
23		29
24	<div class="main container-fluid">	30	<div class="main container-fluid">

Lines 42-48 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt (-4 / +6 lines)
42		42
43	[% INCLUDE 'acquisitions-toolbar.inc' %]	43	[% INCLUDE 'acquisitions-toolbar.inc' %]
44		44
45	<h1>Acquisitions</h1>	45	<h2>Acquisitions</h2>
46	[% INCLUDE 'budgets-active-currency.inc' hide = 'yes' %]	46	[% INCLUDE 'budgets-active-currency.inc' hide = 'yes' %]
47	[% UNLESS ( loop_budget ) %]	47	[% UNLESS ( loop_budget ) %]
48	[% IF ( CAN_user_acquisition_period_manage ) %]	48	[% IF ( CAN_user_acquisition_period_manage ) %]
Lines 59-65 Link Here
59	[% END %]	59	[% END %]
60	<div id="acqui_acqui_home_order">	60	<div id="acqui_acqui_home_order">
61	<fieldset class="brief">	61	<fieldset class="brief">
62	<h2>Manage orders</h2>	62	<h3>Manage orders</h3>
63	<fieldset>	63	<fieldset>
64	<form name="findsupplier" action="/cgi-bin/koha/acqui/booksellers.pl" method="post">	64	<form name="findsupplier" action="/cgi-bin/koha/acqui/booksellers.pl" method="post">
65	<p>Vendor: <input type="text" size="25" name="supplier" id="supplierpage" class="focus" />	65	<p>Vendor: <input type="text" size="25" name="supplier" id="supplierpage" class="focus" />
Lines 96-105 Link Here
96		96
97	[% IF ( loop_budget ) %]	97	[% IF ( loop_budget ) %]
98		98
		99	<div id="searchresults">
		100
99	<h3>All available funds</h3>	101	<h3>All available funds</h3>
100		102
101	<div id="BudgetsAndFunds">	103	<div id="BudgetsAndFunds">
102	<div class="toolbar btn-toolbar">	104	<div class="searchheader">
103	<span class="actions">	105	<span class="actions">
104	<a href="#" id="expand_all">Expand all</a> \|	106	<a href="#" id="expand_all">Expand all</a> \|
105	<a href="#" id="collapse_all">Collapse all</a> \|	107	<a href="#" id="collapse_all">Collapse all</a> \|
Lines 206-212 Link Here
206	[% END %]	208	[% END %]
207	</tbody>	209	</tbody>
208	</table>	210	</table>
209	</div>	211	</div></div>
210	[% END %]	212	[% END %]
211		213
212	</main>	214	</main>

Lines 15-20 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt (-2 / +10 lines)
15	[%# As long as cataloging plugins rely on 'script' tags added inline, JS must be in the header %]	15	[%# As long as cataloging plugins rely on 'script' tags added inline, JS must be in the header %]
16	[% Asset.js("js/acquisitions-menu.js") \| $raw %]	16	[% Asset.js("js/acquisitions-menu.js") \| $raw %]
17	[% INCLUDE 'datatables.inc' %]	17	[% INCLUDE 'datatables.inc' %]
		18	[% formulaire = BLOCK %]
		19	[% INCLUDE 'acquisitions-search.inc' %]
		20	[% END %]
18	[% Asset.js("js/acq.js") \| $raw %]	21	[% Asset.js("js/acq.js") \| $raw %]
19	[% Asset.js("js/funds_sorts.js") \| $raw %]	22	[% Asset.js("js/funds_sorts.js") \| $raw %]
20	[% Asset.js("js/addorderiso2709.js") \| $raw %]	23	[% Asset.js("js/addorderiso2709.js") \| $raw %]
Lines 22-29 Link Here
22	</head>	25	</head>
23		26
24	<body id="acq_addorderiso2709" class="acq">	27	<body id="acq_addorderiso2709" class="acq">
25	[% INCLUDE 'header.inc' %]	28	[% INCLUDE 'header.inc' form=formulaire %]
26	[% INCLUDE 'acquisitions-search.inc' %]
27		29
28	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	30	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
29	<ol>	31	<ol>
Lines 43-48 Link Here
43	<a href="#" aria-current="page">Add orders from MARC file</a>	45	<a href="#" aria-current="page">Add orders from MARC file</a>
44	</li>	46	</li>
45	</ol>	47	</ol>
		48	<ol>
		49	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		50	</ol>
		51	<ol>
		52	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		53	</ol>
46	</nav>	54	</nav>
47		55
48	<div class="container-fluid">	56	<div class="container-fluid">

Lines 22-27 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-2 / +10 lines)
22	[% USE AuthorisedValues %]	22	[% USE AuthorisedValues %]
23	[% USE TablesSettings %]	23	[% USE TablesSettings %]
24	[% SET footerjs = 1 %]	24	[% SET footerjs = 1 %]
		25	[% formulaire = BLOCK %]
		26	[% INCLUDE 'acquisitions-search.inc' %]
		27	[% END %]
25	[% INCLUDE 'doc-head-open.inc' %]	28	[% INCLUDE 'doc-head-open.inc' %]
26	<title>[% UNLESS ( basketno ) %]New [% END %]Basket [% basketname \| html %] ([% basketno \| html %]) for [% booksellername \| html %] &rsaquo; Acquisitions &rsaquo; Koha</title>	29	<title>[% UNLESS ( basketno ) %]New [% END %]Basket [% basketname \| html %] ([% basketno \| html %]) for [% booksellername \| html %] &rsaquo; Acquisitions &rsaquo; Koha</title>
27	[% INCLUDE 'doc-head-close.inc' %]	30	[% INCLUDE 'doc-head-close.inc' %]
Lines 31-38 Link Here
31	</head>	34	</head>
32		35
33	<body id="acq_basket" class="acq">	36	<body id="acq_basket" class="acq">
34	[% INCLUDE 'header.inc' %]	37	[% INCLUDE 'header.inc' form=formulaire %]
35	[% INCLUDE 'acquisitions-search.inc' %]
36		38
37	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	39	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
38	<ol>	40	<ol>
Lines 62-67 Link Here
62	</a>	64	</a>
63	</li>	65	</li>
64	</ol>	66	</ol>
		67	<ol>
		68	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		69	</ol>
		70	<ol>
		71	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		72	</ol>
65	</nav>	73	</nav>
66		74
67	<div class="main container-fluid">	75	<div class="main container-fluid">

Lines 86-93 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt (-2 / +13 lines)
86		86
87	</head>	87	</head>
88	<body id="acq_basketgroup" class="acq">	88	<body id="acq_basketgroup" class="acq">
89	[% INCLUDE 'header.inc' %]	89	[% INCLUDE 'header.inc' form=formulaire %]
90	[% INCLUDE 'acquisitions-search.inc' %]
91		90
92	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	91	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
93	<ol>	92	<ol>
Lines 111-116 Link Here
111	</a>	110	</a>
112	</li>	111	</li>
113	</ol>	112	</ol>
		113	<ol>
		114	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		115	</ol>
		116	<ol>
		117	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		118	</ol>
114	</nav>	119	</nav>
115		120
116	[% ELSE %]	121	[% ELSE %]
Lines 123-128 Link Here
123	</a>	128	</a>
124	</li>	129	</li>
125	</ol>	130	</ol>
		131	<ol>
		132	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		133	</ol>
		134	<ol>
		135	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		136	</ol>
126	</nav>	137	</nav>
127	[% END %]	138	[% END %]
128		139

Lines 3-8 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt (-2 / +10 lines)
3	[% USE Branches %]	3	[% USE Branches %]
4	[% USE Koha %]	4	[% USE Koha %]
5	[% SET footerjs = 1 %]	5	[% SET footerjs = 1 %]
		6	[% formulaire = BLOCK %]
		7	[% INCLUDE 'acquisitions-search.inc' %]
		8	[% END %]
6	[% INCLUDE 'doc-head-open.inc' %]	9	[% INCLUDE 'doc-head-open.inc' %]
7	<title>	10	<title>
8	[% IF ( add_form ) %]	11	[% IF ( add_form ) %]
Lines 15-22 Link Here
15	</head>	18	</head>
16		19
17	<body id="acq_basketheader" class="acq">	20	<body id="acq_basketheader" class="acq">
18	[% INCLUDE 'header.inc' %]	21	[% INCLUDE 'header.inc' form=formulaire %]
19	[% INCLUDE 'acquisitions-search.inc' %]
20		22
21	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	23	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
22	<ol>	24	<ol>
Lines 45-50 Link Here
45	[% END %]	47	[% END %]
46	[% END %]	48	[% END %]
47	</ol>	49	</ol>
		50	<ol>
		51	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		52	</ol>
		53	<ol>
		54	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		55	</ol>
48	</nav>	56	</nav>
49		57
50	<div class="main container-fluid">	58	<div class="main container-fluid">

Lines 3-8 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt (-2 / +10 lines)
3	[% USE Asset %]	3	[% USE Asset %]
4	[% USE KohaDates %]	4	[% USE KohaDates %]
5	[% SET footerjs = 1 %]	5	[% SET footerjs = 1 %]
		6	[% formulaire = BLOCK %]
		7	[% INCLUDE 'acquisitions-search.inc' %]
		8	[% END %]
6	[% INCLUDE 'doc-head-open.inc' %]	9	[% INCLUDE 'doc-head-open.inc' %]
7	<title>Search for vendor [% supplier \| html %] &rsaquo; Koha</title>	10	<title>Search for vendor [% supplier \| html %] &rsaquo; Koha</title>
8	[% INCLUDE 'doc-head-close.inc' %]	11	[% INCLUDE 'doc-head-close.inc' %]
Lines 14-21 Link Here
14	</head>	17	</head>
15		18
16	<body id="acq_booksellers" class="acq">	19	<body id="acq_booksellers" class="acq">
17	[% INCLUDE 'header.inc' %]	20	[% INCLUDE 'header.inc' form=formulaire %]
18	[% INCLUDE 'acquisitions-search.inc' %]
19		21
20	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	22	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
21	<ol>	23	<ol>
Lines 31-36 Link Here
31	</a>	33	</a>
32	</li>	34	</li>
33	</ol>	35	</ol>
		36	<ol>
		37	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		38	</ol>
		39	<ol>
		40	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		41	</ol>
34	</nav>	42	</nav>
35		43
36	<div class="main container-fluid">	44	<div class="main container-fluid">

Lines 23-28 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt (+6 lines)
23	<a href="#" aria-current="page">Cancel order</a>	23	<a href="#" aria-current="page">Cancel order</a>
24	</li>	24	</li>
25	</ol>	25	</ol>
		26	<ol>
		27	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		28	</ol>
		29	<ol>
		30	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		31	</ol>
26	</nav>	32	</nav>
27		33
28	<div class="main container-fluid">	34	<div class="main container-fluid">

Lines 3-8 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt (-2 / +10 lines)
3	[% USE Koha %]	3	[% USE Koha %]
4	[% USE KohaDates %]	4	[% USE KohaDates %]
5	[% SET footerjs = 1 %]	5	[% SET footerjs = 1 %]
		6	[% formulaire = BLOCK %]
		7	[% INCLUDE 'acquisitions-search.inc' %]
		8	[% END %]
6	[% INCLUDE 'doc-head-open.inc' %]	9	[% INCLUDE 'doc-head-open.inc' %]
7	<title>	10	<title>
8	[% UNLESS blocking_error %]	11	[% UNLESS blocking_error %]
Lines 18-25 Acquisitions &rsaquo; Koha Link Here
18		21
19	<body id="acq_duplicate_orders" class="acq">	22	<body id="acq_duplicate_orders" class="acq">
20		23
21	[% INCLUDE 'header.inc' %]	24	[% INCLUDE 'header.inc' form=formulaire %]
22	[% INCLUDE 'acquisitions-search.inc' %]
23		25
24	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	26	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
25	<ol>	27	<ol>
Lines 43-48 Acquisitions &rsaquo; Koha Link Here
43	</li>	45	</li>
44	[% END %]	46	[% END %]
45	</ol>	47	</ol>
		48	<ol>
		49	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		50	</ol>
		51	<ol>
		52	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		53	</ol>
46	</nav>	54	</nav>
47		55
48	<div class="main container-fluid">	56	<div class="main container-fluid">

Lines 1-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt (-2 / +11 lines)
		1
		2	[% formulaire = BLOCK %]
		3	[% INCLUDE 'acquisitions-search.inc' %]
		4	[% END %]
1	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
2	<title>Basket ([% basketno \| html %]) &rsaquo; Acquisitions &rsaquo; Koha</title>	6	<title>Basket ([% basketno \| html %]) &rsaquo; Acquisitions &rsaquo; Koha</title>
3	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]
4		8
5	</head>	9	</head>
6	<body id="acq_edi_ean" class="acq">	10	<body id="acq_edi_ean" class="acq">
7	[% INCLUDE 'header.inc' %]	11	[% INCLUDE 'header.inc' form=formulaire %]
8	[% INCLUDE 'acquisitions-search.inc' %]
9		12
10	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	13	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
11	<ol>	14	<ol>
Lines 19-24 Link Here
19	<a href="#" aria-current="page">Basket ([% basketno \| html %])</a>	22	<a href="#" aria-current="page">Basket ([% basketno \| html %])</a>
20	</li>	23	</li>
21	</ol>	24	</ol>
		25	<ol>
		26	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		27	</ol>
		28	<ol>
		29	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		30	</ol>
22	</nav>	31	</nav>
23		32
24	<div class="main container-fluid">	33	<div class="main container-fluid">

Lines 1-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt (-2 / +11 lines)
		1
		2	[% formulaire = BLOCK %]
		3	[% INCLUDE 'acquisitions-search.inc' %]
		4	[% END %]
1	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
2	<title>EDIFACT message display &rsaquo; Acquisitions &rsaquo; Koha</title>	6	<title>EDIFACT message display &rsaquo; Acquisitions &rsaquo; Koha</title>
3	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]
4	</head>	8	</head>
5	<body id="acq_edifactmsgs" class="acq">	9	<body id="acq_edifactmsgs" class="acq">
6	[% INCLUDE 'header.inc' %]	10	[% INCLUDE 'header.inc' form=formulaire %]
7	[% INCLUDE 'acquisitions-search.inc' %]
8		11
9		12
10	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	13	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
Lines 19-24 Link Here
19	<a href="#" aria-current="page">EDIFACT messages</a>	22	<a href="#" aria-current="page">EDIFACT messages</a>
20	</li>	23	</li>
21	</ol>	24	</ol>
		25	<ol>
		26	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		27	</ol>
		28	<ol>
		29	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		30	</ol>
22	</nav>	31	</nav>
23		32
24	<div class="main container-fluid">	33	<div class="main container-fluid">




[% USE TablesSettings %]
[% USE Branches %]
[% SET footerjs = 1 %]
[% formulaire = BLOCK %]
    [% INCLUDE 'acquisitions-search.inc' %]
[% END %]
[% INCLUDE 'doc-head-open.inc' %]
<title>[% IF ( order_loop ) %]Orders search &rsaquo; Search results[% ELSE %]Order search[% END %] &rsaquo; Acquisitions &rsaquo; Koha</title>
[% INCLUDE 'doc-head-close.inc' %]
</head>

<body id="acq_histsearch" class="acq">
[% INCLUDE 'header.inc' form=formulaire %]
[% INCLUDE 'acquisitions-search.inc' %]

<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
    <ol>

            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
        </li>

        [% IF ( order_loop ) %]
        <li>
            <a href="/cgi-bin/koha/acqui/histsearch.pl">Orders search</a>
        </li>
        <li>
            <a href="#" aria-current="page">
                Search results
            </a>
        </li>
        [% ELSE %]
        <li>
            <a href="#" aria-current="page">
                Order search
            </a>
        </li>
        [% END %]
    </ol>
    <ol>
        [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
    </ol>
    <ol>
        <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
    </ol>
</nav>


Lines 2-15 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt (-2 / +10 lines)
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE KohaDates %]	3	[% USE KohaDates %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE 'acquisitions-search.inc' %]
		7	[% END %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	<title>Files &rsaquo; Invoice &rsaquo; Acquisitions &rsaquo; Koha</title>	9	<title>Files &rsaquo; Invoice &rsaquo; Acquisitions &rsaquo; Koha</title>
7	[% INCLUDE 'doc-head-close.inc' %]	10	[% INCLUDE 'doc-head-close.inc' %]
8	</head>	11	</head>
9		12
10	<body id="acq_invoice_files" class="acq">	13	<body id="acq_invoice_files" class="acq">
11	[% INCLUDE 'header.inc' %]	14	[% INCLUDE 'header.inc' form=formulaire %]
12	[% INCLUDE 'acquisitions-search.inc' %]
13		15
14		16
15	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	17	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
Lines 30-35 Link Here
30	<a href="#" aria-current="page">Files</a>	32	<a href="#" aria-current="page">Files</a>
31	</li>	33	</li>
32	</ol>	34	</ol>
		35	<ol>
		36	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		37	</ol>
		38	<ol>
		39	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		40	</ol>
33	</nav>	41	</nav>
34		42
35	<div class="main container-fluid">	43	<div class="main container-fluid">

Lines 36-41 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt (+6 lines)
36	<a href="#" aria-current="page">[% invoicenumber \| html %]</a>	36	<a href="#" aria-current="page">[% invoicenumber \| html %]</a>
37	</li>	37	</li>
38	</ol>	38	</ol>
		39	<ol>
		40	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		41	</ol>
		42	<ol>
		43	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		44	</ol>
39	</nav>	45	</nav>
40		46
41	<div class="main container-fluid">	47	<div class="main container-fluid">





                [% INCLUDE 'blocking_errors.inc' %]

      <h2>Invoices</h2>
      [% IF ( do_search ) %]
        [% IF invoices %]
          [% BLOCK invoices_table %]
            [% IF closed %]
                [% SET tab = 'closed' %]
            [% ELSE %]
                [% SET tab = 'opened' %]
            [% END %]
          <input type="checkbox" style="vertical-align: middle;" id="show_only_subscription_[% tab | html %]" class="show_only_subscription" data-tableid="[% tab | html %]resultst"/>
          <label for="show_only_subscription_[% tab | html %]">
            Show only subscriptions
          </label>
          <table id="[% tab | html %]resultst" class="result">
            <thead>
              <tr>
                [% IF CAN_user_acquisition_merge_invoices %]
                  <th>&nbsp;</th>
                [% END %]
                <th>&nbsp;</th>
                <th>Invoice number</th>
                <th>Vendor</th>
                <th>Shipment date</th>
                <th>Billing date</th>
                <th>Received bibliographic records</th>
                <th>Received items</th>
                <th>Status</th>
                <th>&nbsp;</th>
              </tr>
            </thead>
            <tbody>
              [% FOREACH invoice IN invoices %]
                <tr data-invoiceid="[% invoice.invoiceid | html %]" data-booksellerid="[% invoice.booksellerid | html %]" data-shipmentdate="[% invoice.shipmentdate | $KohaDates %]" data-billingdate="[% invoice.billingdate | $KohaDates %]" data-shipmentcost="[% invoice.shipmentcost | html %]" data-shipment_budgetid="[% invoice.shipmentcost_budgetid | html %]" data-closedate="[% invoice.closedate | $KohaDates %]">
                  [% IF CAN_user_acquisition_merge_invoices %]
                      <td>[% invoice.is_linked_to_subscriptions | html %]</td>
                  [% END %]
                  <td><input type="checkbox" class="select-invoice" value="[% invoice.invoiceid | html %]" /></td>
                  <td><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid | uri %]">[% invoice.invoicenumber | html %]</a></td>
                  <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% invoice.booksellerid | uri %]">[% invoice.suppliername | html %]</a></td>
                  <td data-order="[% invoice.shipmentdate | html %]">
                      [% invoice.shipmentdate | $KohaDates %]
                  </td>
                  <td data-order="[% invoice.billingdate | html %]">
                      [% invoice.billingdate | $KohaDates %]
                  </td>
                  <td>[% invoice.receivedbiblios | html %]</td>
                  <td>[% invoice.receiveditems | html %]</td>
                  <td>
                    [% IF invoice.closedate %]
                      Closed on [% invoice.closedate | $KohaDates %]
                    [% ELSE %]
                      Open
                    [% END %]
                  </td>
                  <td>

                      <div class="btn-group dropup">
                          <a class="btn btn-default btn-xs dropdown-toggle" id="invoiceactions[% invoice.invoiceid | html %]" role="button" data-toggle="dropdown" href="#">
                             Actions <b class="caret"></b>
                          </a>
                          <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="invoiceactions[% invoice.invoiceid | html %]">
                              <li><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid | uri %]"><i class="fa fa-search"></i> Details</a></li>
                            [% IF invoice.closedate %]
                                [% IF CAN_user_acquisition_reopen_closed_invoices %]
                                    <li><a href="invoice.pl?op=reopen&amp;invoiceid=[% invoice.invoiceid | uri %]&amp;referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]"><i class="fa fa-refresh"></i> Reopen</a></li>
                                [% END %]
                            [% ELSE %]
                                [% SET tab = 'opened' %]
                            [% END %]

                                            <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
                                        </li>

<<<<<<< HEAD
                                        <li>
                                            <label for="merge_shipmentcost">Shipment cost:</label>
                                            <input type="text" size="10" id="merge_shipmentcost" name="shipmentcost" value="" />

            </aside>
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
    </div> <!-- /.row -->
=======
<div class="col-sm-2 col-sm-pull-10">
<aside>
<div id="filters">
    <form action="" method="get">
      <fieldset class="sidebar brief">
        <h4>Search filters</h4>
        <ol>
          <li>
            <p for="invoicenumber">Invoice number
            <input type="text" id="invoicenumber" name="invoicenumber" value="[% invoicenumber | html %]" class="focus" /></p>
          </li>
          <li>
            <p for="supplier">Vendor:
            <select id="supplier" name="supplierid">
              <option value="">All</option>
              [% FOREACH supplier IN suppliers_loop %]
                [% IF ( supplier.selected ) %]
                  <option selected="selected" value="[% supplier.booksellerid | html %]">[% supplier.suppliername | html %]</option>
                [% ELSE %]
                  <option value="[% supplier.booksellerid | html %]">[% supplier.suppliername | html %]</option>
                [% END %]
              [% END %]
            </select></p>
          </li>
          <li>
            <fieldset>
              <label>Shipment date</label>
              <ol>
                <li>
                  <p for="shipmentdatefrom">From:
                  <input type="text" id="shipmentdatefrom" name="shipmentdatefrom" size="10" value="[% shipmentdatefrom | $KohaDates %]" class="flatpickr" data-date_to="shipmentdateto" />
                  <div class="hint">[% INCLUDE 'date-format.inc' %]</div></p>
                </li>
                <li>
                  <p for="shipmentdateto">To:
                  <input type="text" id="shipmentdateto" name="shipmentdateto" size="10" value="[% shipmentdateto | $KohaDates %]" class="flatpickr" />
                  <div class="hint">[% INCLUDE 'date-format.inc' %]</div></p>
                </li>
              </ol>
            </fieldset>
          </li>
          <li>
            <fieldset>
              <label>Billing date</label>
              <ol>
                <li>
                  <p for="billingdatefrom">From:
                  <input type="text" id="billingdatefrom" name="billingdatefrom" size="10" value="[% billingdatefrom | $KohaDates %]" class="flatpickr" data-date_to="billingdateto" />
                  <div class="hint">[% INCLUDE 'date-format.inc' %]</div></p>
                </li>
                <li>
                  <p for="billingdateto">To:
                  <input type="text" id="billingdateto" name="billingdateto" size="10" value="[% billingdateto | $KohaDates %]" class="flatpickr" />
                  <div class="hint">[% INCLUDE 'date-format.inc' %]</div></p>
                </li>
              </ol>
            </fieldset>
          </li>
          <li>
            <p for="isbneanissn">ISBN / EAN / ISSN:
            <input type="text" id="isbneanissn" name="isbneanissn" value="[% isbneanissn | html %]" /></p>
          </li>
          <li>
            <p for="title">Title:
            <input type="text" id="title" name="title" value="[% title | html %]" /></p>
          </li>
          <li>
            <p for="author">Author:
            <input type="text" id="author" name="author" value="[% author | html %]" /></p>
          </li>
          <li>
            <p for="publisher">Publisher:
            <input type="text" id="publisher" name="publisher" value="[% publisher | html %]" /></p>
          </li>
          <li>
            <p for="publicationyear">Publication year:
            <input type="text" id="publicationyear" name="publicationyear" value="[% publicationyear | html %]" /></p>
          </li>
          <li>
            <p for="branch">Library:
            <select id="branch" name="branch">
              <option value="">All</option>
              [%# FIXME Should not we filter the libraries %]
              [% PROCESS options_for_libraries libraries => Branches.all( selected => branch, unfiltered => 1 ) %]
            </select></p>
          </li>
        </ol>
        <fieldset class="action">
          <input type="submit" class="principal" value="Search" />
        </fieldset>
      </fieldset>
      <input type="hidden" name="op" id="op" value="do_search" />
    </form>
    [% INCLUDE 'acquisitions-menu.inc' %]
    </div>
  </aside>
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
</div> <!-- /.row -->
>>>>>>> Bug 30952: Search bar

[% MACRO jsinclude BLOCK %]
    [% Asset.js("js/acquisitions-menu.js") | $raw %]

Lines 29-34 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt (-9 / +18 lines)
29	<a href="#" aria-current="page">Late orders</a>	29	<a href="#" aria-current="page">Late orders</a>
30	</li>	30	</li>
31	</ol>	31	</ol>
		32	<ol>
		33	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		34	</ol>
		35	<ol>
		36	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		37	</ol>
32	</nav>	38	</nav>
33		39
34	<div class="main container-fluid">	40	<div class="main container-fluid">
Lines 36-42 Link Here
36	<div class="col-sm-10 col-sm-push-2">	42	<div class="col-sm-10 col-sm-push-2">
37	<main>	43	<main>
38		44
39	<h1>[% IF bookseller_filter %][% bookseller_filter.name \| html %] : [% END %]Late orders</h1>	45	<h2>[% IF bookseller_filter %][% bookseller_filter.name \| html %] : [% END %]Late orders</h2>
40	<div id="acqui_lateorders">	46	<div id="acqui_lateorders">
41		47
42	[% IF error_claim %]	48	[% IF error_claim %]
Lines 225-230 Link Here
225		231
226	<div class="col-sm-2 col-sm-pull-10">	232	<div class="col-sm-2 col-sm-pull-10">
227	<aside>	233	<aside>
		234	<div id="filters">
228	<form action="lateorders.pl" method="get">	235	<form action="lateorders.pl" method="get">
229	<fieldset class="brief">	236	<fieldset class="brief">
230	<h4>Filter results:</h4>	237	<h4>Filter results:</h4>
Lines 232-248 Link Here
232	[% IF ( ERROR_LOO.delay_digits ) %]<p class="error">The number of days ([% ERROR_LOO.bad_delay \| html %]) must be a number between 0 and 999.</p>[% END %]	239	[% IF ( ERROR_LOO.delay_digits ) %]<p class="error">The number of days ([% ERROR_LOO.bad_delay \| html %]) must be a number between 0 and 999.</p>[% END %]
233	[% END %]	240	[% END %]
234	<ol>	241	<ol>
235	<li><label for="delay">Order date:</label><input size="3" maxlength="3" id="delay" type="text" name="delay" value="[% delay \| html %]" /> days ago</li>	242	<li><p for="delay">Order date:<input size="3" maxlength="3" id="delay" type="text" name="delay" value="[% delay \| html %]" /> days ago</p></li>
236	<li><label for="from">Estimated delivery date from: </label>	243	<li><p for="from">Estimated delivery date from:
237	<input type="text" size="10" id="from" name="estimateddeliverydatefrom" value="[% estimateddeliverydatefrom \| html %]" class="flatpickr" data-date_to="to"/>	244	<input type="text" size="10" id="from" name="estimateddeliverydatefrom" value="[% estimateddeliverydatefrom \| html %]" class="flatpickr" data-date_to="to"/>
238	<div class="hint">[% INCLUDE 'date-format.inc' %]</div>	245	<div class="hint">[% INCLUDE 'date-format.inc' %]</div></p>
239	</li>	246	</li>
240	<li><label for="to">To: </label>	247	<li><p for="to">To:
241	<input type="text" size="10" id="to" name="estimateddeliverydateto" value="[% estimateddeliverydateto \| html %]" class="flatpickr" />	248	<input type="text" size="10" id="to" name="estimateddeliverydateto" value="[% estimateddeliverydateto \| html %]" class="flatpickr" />
242	<div class="hint">[% INCLUDE 'date-format.inc' %]</div>	249	<div class="hint">[% INCLUDE 'date-format.inc' %]</div></p>
243	</li>	250	</li>
244		251
245	<li><label for="booksellerid">Vendor:</label>	252	<li><p for="booksellerid">Vendor:
246	<select id="booksellerid" tabindex="" name="booksellerid">	253	<select id="booksellerid" tabindex="" name="booksellerid">
247	<option value=""></option>	254	<option value=""></option>
248	[% FOREACH bookseller IN booksellers %]	255	[% FOREACH bookseller IN booksellers %]
Lines 252-263 Link Here
252	<option value="[% bookseller.id \| html %]">[% bookseller.name \| html %]</option>	259	<option value="[% bookseller.id \| html %]">[% bookseller.name \| html %]</option>
253	[% END %]	260	[% END %]
254	[% END %]	261	[% END %]
255	</select>	262	</select></p>
		263	</li>
256	</ol>	264	</ol>
257	<fieldset class="action"><input type="submit" value="Filter" /></fieldset>	265	<fieldset class="action"><input type="submit" class="principal" value="Filter" /></fieldset>
258	</fieldset>	266	</fieldset>
259	</form>	267	</form>
260	[% INCLUDE 'acquisitions-menu.inc' %]	268	[% INCLUDE 'acquisitions-menu.inc' %]
		269	</div>
261	</aside>	270	</aside>
262	</div> <!-- /.col-sm-2.col-sm-pull-10 -->	271	</div> <!-- /.col-sm-2.col-sm-pull-10 -->
263	</div>	272	</div>

Lines 32-37 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt (+6 lines)
32	</a>	32	</a>
33	</li>	33	</li>
34	</ol>	34	</ol>
		35	<ol>
		36	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		37	</ol>
		38	<ol>
		39	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		40	</ol>
35	</nav>	41	</nav>
36		42
37	<div class="main container-fluid">	43	<div class="main container-fluid">

Lines 5-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-2 / +10 lines)
5	[% USE Price %]	5	[% USE Price %]
6	[% USE ItemTypes %]	6	[% USE ItemTypes %]
7	[% SET footerjs = 1 %]	7	[% SET footerjs = 1 %]
		8	[% formulaire = BLOCK %]
		9	[% INCLUDE 'acquisitions-search.inc' %]
		10	[% END %]
8	[% INCLUDE 'doc-head-open.inc' %]	11	[% INCLUDE 'doc-head-open.inc' %]
9	<title>[% IF ( ordernumber ) %]Modify order details (line #[% ordernumber \| html %])[% ELSE %]New order[% END %] &rsaquo; Basket [% basketno \| html %] &rsaquo; Acquisitions &rsaquo; Koha</title>	12	<title>[% IF ( ordernumber ) %]Modify order details (line #[% ordernumber \| html %])[% ELSE %]New order[% END %] &rsaquo; Basket [% basketno \| html %] &rsaquo; Acquisitions &rsaquo; Koha</title>
10	[% INCLUDE 'doc-head-close.inc' %]	13	[% INCLUDE 'doc-head-close.inc' %]
Lines 12-19 Link Here
12		15
13	<body id="acq_neworderempty" class="acq">	16	<body id="acq_neworderempty" class="acq">
14		17
15	[% INCLUDE 'header.inc' %]	18	[% INCLUDE 'header.inc' form=formulaire %]
16	[% INCLUDE 'acquisitions-search.inc' %]
17		19
18	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	20	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
19	<ol>	21	<ol>
Lines 44-49 Link Here
44	</li>	46	</li>
45	[% END %]	47	[% END %]
46	</ol>	48	</ol>
		49	<ol>
		50	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		51	</ol>
		52	<ol>
		53	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		54	</ol>
47	</nav>	55	</nav>
48		56
49	[% INCLUDE 'blocking_errors.inc' %]	57	[% INCLUDE 'blocking_errors.inc' %]

Lines 1-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt (-2 / +12 lines)
		1
		2	[% formulaire = BLOCK %]
		3	[% INCLUDE 'acquisitions-search.inc' %]
		4	[% END %]
		5
1	[% INCLUDE 'doc-head-open.inc' %]	6	[% INCLUDE 'doc-head-open.inc' %]
2	<title>Duplicate warning &rsaquo; Basket [% basketno \| html %] &rsaquo; Acquisitions &rsaquo; Koha</title>	7	<title>Duplicate warning &rsaquo; Basket [% basketno \| html %] &rsaquo; Acquisitions &rsaquo; Koha</title>
3	[% INCLUDE 'doc-head-close.inc' %]	8	[% INCLUDE 'doc-head-close.inc' %]
4	</head>	9	</head>
5	<body id="acq_neworderempty_duplicate" class="acq">	10	<body id="acq_neworderempty_duplicate" class="acq">
6		11
7	[% INCLUDE 'header.inc' %]	12	[% INCLUDE 'header.inc' form=formulaire %]
8	[% INCLUDE 'acquisitions-search.inc' %]
9		13
10		14
11	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	15	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
Lines 25-30 Link Here
25	</a>	29	</a>
26	</li>	30	</li>
27	</ol>	31	</ol>
		32	<ol>
		33	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		34	</ol>
		35	<ol>
		36	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		37	</ol>
28	</nav>	38	</nav>
29		39
30	<div class="main container-fluid">	40	<div class="main container-fluid">

Lines 5-18 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt (-2 / +10 lines)
5	[% USE Koha %]	5	[% USE Koha %]
6	[% PROCESS 'i18n.inc' %]	6	[% PROCESS 'i18n.inc' %]
7	[% SET footerjs = 1 %]	7	[% SET footerjs = 1 %]
		8	[% formulaire = BLOCK %]
		9	[% INCLUDE 'acquisitions-search.inc' %]
		10	[% END %]
8	[% INCLUDE 'doc-head-open.inc' %]	11	[% INCLUDE 'doc-head-open.inc' %]
9	<title>Serials [% biblionumber \| html %] &rsaquo; Koha</title>	12	<title>Serials [% biblionumber \| html %] &rsaquo; Koha</title>
10	[% INCLUDE 'doc-head-close.inc' %]	13	[% INCLUDE 'doc-head-close.inc' %]
11	</head>	14	</head>
12		15
13	<body id="acq_newordersubscription" class="acq">	16	<body id="acq_newordersubscription" class="acq">
14	[% INCLUDE 'header.inc' %]	17	[% INCLUDE 'header.inc' form=formulaire %]
15	[% INCLUDE 'acquisitions-search.inc' %]
16		18
17	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	19	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
18	<ol>	20	<ol>
Lines 34-39 Link Here
34	</a>	36	</a>
35	</li>	37	</li>
36	</ol>	38	</ol>
		39	<ol>
		40	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		41	</ol>
		42	<ol>
		43	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		44	</ol>
37	</nav>	45	</nav>
38		46
39	<div class="main container-fluid">	47	<div class="main container-fluid">

Lines 4-17 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt (-2 / +10 lines)
4	[% USE Asset %]	4	[% USE Asset %]
5	[% PROCESS 'i18n.inc' %]	5	[% PROCESS 'i18n.inc' %]
6	[% SET footerjs = 1 %]	6	[% SET footerjs = 1 %]
		7	[% formulaire = BLOCK %]
		8	[% INCLUDE 'suggestions-add-search.inc' %]
		9	[% END %]
7	[% INCLUDE 'doc-head-open.inc' %]	10	[% INCLUDE 'doc-head-open.inc' %]
8	<title>Add order from a suggestion &rsaquo; Acquisitions &rsaquo; Koha</title>	11	<title>Add order from a suggestion &rsaquo; Acquisitions &rsaquo; Koha</title>
9	[% INCLUDE 'doc-head-close.inc' %]	12	[% INCLUDE 'doc-head-close.inc' %]
10	</head>	13	</head>
11		14
12	<body id="acq_newordersuggestion" class="acq">	15	<body id="acq_newordersuggestion" class="acq">
13	[% INCLUDE 'header.inc' %]	16	[% INCLUDE 'header.inc' form=formulaire %]
14	[% INCLUDE 'suggestions-add-search.inc' %]
15		17
16	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	18	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
17	<ol>	19	<ol>
Lines 33-38 Link Here
33	</a>	35	</a>
34	</li>	36	</li>
35	</ol>	37	</ol>
		38	<ol>
		39	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		40	</ol>
		41	<ol>
		42	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		43	</ol>
36	</nav>	44	</nav>
37		45
38	<div class="main container-fluid">	46	<div class="main container-fluid">

Lines 5-18 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt (-2 / +10 lines)
5	[% USE Price %]	5	[% USE Price %]
6	[% PROCESS 'i18n.inc' %]	6	[% PROCESS 'i18n.inc' %]
7	[% SET footerjs = 1 %]	7	[% SET footerjs = 1 %]
		8	[% formulaire = BLOCK %]
		9	[% INCLUDE 'acquisitions-search.inc' %]
		10	[% END %]
8	[% INCLUDE 'doc-head-open.inc' %]	11	[% INCLUDE 'doc-head-open.inc' %]
9	<title>Ordered &rsaquo; Acquisitions &rsaquo; Koha</title>	12	<title>Ordered &rsaquo; Acquisitions &rsaquo; Koha</title>
10	[% INCLUDE 'doc-head-close.inc' %]	13	[% INCLUDE 'doc-head-close.inc' %]
11	</head>	14	</head>
12		15
13	<body id="acq_ordered" class="acq">	16	<body id="acq_ordered" class="acq">
14	[% INCLUDE 'header.inc' %]	17	[% INCLUDE 'header.inc' form=formulaire %]
15	[% INCLUDE 'acquisitions-search.inc' %]
16		18
17		19
18	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	20	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
Lines 29-34 Link Here
29	</a>	31	</a>
30	</li>	32	</li>
31	</ol>	33	</ol>
		34	<ol>
		35	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		36	</ol>
		37	<ol>
		38	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		39	</ol>
32	</nav>	40	</nav>
33		41
34	<div class="main container-fluid">	42	<div class="main container-fluid">

Lines 7-20 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt (-2 / +10 lines)
7	[% USE ItemTypes %]	7	[% USE ItemTypes %]
8	[% USE Price %]	8	[% USE Price %]
9	[% SET footerjs = 1 %]	9	[% SET footerjs = 1 %]
		10	[% formulaire = BLOCK %]
		11	[% INCLUDE 'acquisitions-search.inc' %]
		12	[% END %]
10	[% INCLUDE 'doc-head-open.inc' %]	13	[% INCLUDE 'doc-head-open.inc' %]
11	<title>Receipt summary for : [% name \| html %] [% IF ( invoice ) %]invoice, [% invoice \| html %][% END %] &rsaquo; Acquisitions &rsaquo; Koha</title>	14	<title>Receipt summary for : [% name \| html %] [% IF ( invoice ) %]invoice, [% invoice \| html %][% END %] &rsaquo; Acquisitions &rsaquo; Koha</title>
12	[% INCLUDE 'doc-head-close.inc' %]	15	[% INCLUDE 'doc-head-close.inc' %]
13	</head>	16	</head>
14		17
15	<body id="acq_orderreceive" class="acq">	18	<body id="acq_orderreceive" class="acq">
16	[% INCLUDE 'header.inc' %]	19	[% INCLUDE 'header.inc' form=formulaire %]
17	[% INCLUDE 'acquisitions-search.inc' %]
18		20
19	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	21	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
20	<ol>	22	<ol>
Lines 35-40 Link Here
35	</a>	37	</a>
36	</li>	38	</li>
37	</ol>	39	</ol>
		40	<ol>
		41	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		42	</ol>
		43	<ol>
		44	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		45	</ol>
38	</nav>	46	</nav>
39		47
40	<div class="main container-fluid">	48	<div class="main container-fluid">

Lines 6-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-2 / +10 lines)
6	[% USE currency = format('%.2f') -%]	6	[% USE currency = format('%.2f') -%]
7	[% PROCESS 'i18n.inc' %]	7	[% PROCESS 'i18n.inc' %]
8	[% SET footerjs = 1 %]	8	[% SET footerjs = 1 %]
		9	[% formulaire = BLOCK %]
		10	[% INCLUDE 'acquisitions-search.inc' %]
		11	[% END %]
9	[% INCLUDE 'doc-head-open.inc' %]	12	[% INCLUDE 'doc-head-open.inc' %]
10	<title>	13	<title>
11	[% IF ( invoiceclosedate ) %]	14	[% IF ( invoiceclosedate ) %]
Lines 19-26 Link Here
19	</head>	22	</head>
20		23
21	<body id="acq_parcel" class="acq">	24	<body id="acq_parcel" class="acq">
22	[% INCLUDE 'header.inc' %]	25	[% INCLUDE 'header.inc' form=formulaire %]
23	[% INCLUDE 'acquisitions-search.inc' %]
24		26
25	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	27	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
26	<ol>	28	<ol>
Lines 46-51 Link Here
46	</li>	48	</li>
47	[% END %]	49	[% END %]
48	</ol>	50	</ol>
		51	<ol>
		52	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		53	</ol>
		54	<ol>
		55	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		56	</ol>
49	</nav>	57	</nav>
50		58
51		59

Lines 2-15 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt (-2 / +10 lines)
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE KohaDates %]	3	[% USE KohaDates %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE 'acquisitions-search.inc' %]
		7	[% END %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	<title>Receive shipment from vendor [% name \| html %] &rsaquo; Acquisitions &rsaquo; Koha</title>	9	<title>Receive shipment from vendor [% name \| html %] &rsaquo; Acquisitions &rsaquo; Koha</title>
7	[% INCLUDE 'doc-head-close.inc' %]	10	[% INCLUDE 'doc-head-close.inc' %]
8	</head>	11	</head>
9		12
10	<body id="acq_parcels" class="acq">	13	<body id="acq_parcels" class="acq">
11	[% INCLUDE 'header.inc' %]	14	[% INCLUDE 'header.inc' form=formulaire %]
12	[% INCLUDE 'acquisitions-search.inc' %]
13		15
14	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	16	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
15	<ol>	17	<ol>
Lines 28-33 Link Here
28	</a>	30	</a>
29	</li>	31	</li>
30	</ol>	32	</ol>
		33	<ol>
		34	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		35	</ol>
		36	<ol>
		37	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		38	</ol>
31	</nav>	39	</nav>
32		40
33	<div class="main container-fluid">	41	<div class="main container-fluid">

Lines 5-18 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt (-2 / +10 lines)
5	[% USE Price %]	5	[% USE Price %]
6	[% PROCESS 'i18n.inc' %]	6	[% PROCESS 'i18n.inc' %]
7	[% SET footerjs = 1 %]	7	[% SET footerjs = 1 %]
		8	[% formulaire = BLOCK %]
		9	[% INCLUDE 'acquisitions-search.inc' %]
		10	[% END %]
8	[% INCLUDE 'doc-head-open.inc' %]	11	[% INCLUDE 'doc-head-open.inc' %]
9	<title>Spent &rsaquo; Acquisitions &rsaquo; Koha</title>	12	<title>Spent &rsaquo; Acquisitions &rsaquo; Koha</title>
10	[% INCLUDE 'doc-head-close.inc' %]	13	[% INCLUDE 'doc-head-close.inc' %]
11	</head>	14	</head>
12		15
13	<body id="acq_spent" class="acq">	16	<body id="acq_spent" class="acq">
14	[% INCLUDE 'header.inc' %]	17	[% INCLUDE 'header.inc' form=formulaire %]
15	[% INCLUDE 'acquisitions-search.inc' %]
16		18
17		19
18	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	20	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
Lines 29-34 Link Here
29	</a>	31	</a>
30	</li>	32	</li>
31	</ol>	33	</ol>
		34	<ol>
		35	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		36	</ol>
		37	<ol>
		38	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		39	</ol>
32	</nav>	40	</nav>
33		41
34	<div class="main container-fluid">	42	<div class="main container-fluid">

Lines 88-101 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt (-2 / +10 lines)
88	[% END %]	88	[% END %]
89		89
90	[% SET footerjs = 1 %]	90	[% SET footerjs = 1 %]
		91	[% formulaire = BLOCK %]
		92	[% INCLUDE 'acquisitions-search.inc' %]
		93	[% END %]
91	[% INCLUDE 'doc-head-open.inc' %]	94	[% INCLUDE 'doc-head-open.inc' %]
92	<title>Vendor [% name \| html %] &rsaquo; Koha</title>	95	<title>Vendor [% name \| html %] &rsaquo; Koha</title>
93	[% INCLUDE 'doc-head-close.inc' %]	96	[% INCLUDE 'doc-head-close.inc' %]
94	</head>	97	</head>
95		98
96	<body id="acq_supplier" class="acq">	99	<body id="acq_supplier" class="acq">
97	[% INCLUDE 'header.inc' %]	100	[% INCLUDE 'header.inc' form=formulaire %]
98	[% INCLUDE 'acquisitions-search.inc' %]
99		101
100	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	102	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
101	<ol>	103	<ol>
Lines 130-135 Link Here
130	</li>	132	</li>
131	[% END %]	133	[% END %]
132	</ol>	134	</ol>
		135	<ol>
		136	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		137	</ol>
		138	<ol>
		139	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		140	</ol>
133	</nav>	141	</nav>
134		142
135	<div class="main container-fluid">	143	<div class="main container-fluid">

Lines 3-16 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt (-2 / +10 lines)
3	[% USE Koha %]	3	[% USE Koha %]
4	[% PROCESS 'i18n.inc' %]	4	[% PROCESS 'i18n.inc' %]
5	[% SET footerjs = 1 %]	5	[% SET footerjs = 1 %]
		6	[% formulaire = BLOCK %]
		7	[% INCLUDE 'acquisitions-search.inc' %]
		8	[% END %]
6	[% INCLUDE 'doc-head-open.inc' %]	9	[% INCLUDE 'doc-head-open.inc' %]
7	<title>[% IF ( booksellername ) %]Orders with uncertain prices for vendor [% booksellername \| html %][% ELSE %]Orders with uncertain prices[% END %] &rsaquo; Acquisitions &rsaquo; Koha</title>	10	<title>[% IF ( booksellername ) %]Orders with uncertain prices for vendor [% booksellername \| html %][% ELSE %]Orders with uncertain prices[% END %] &rsaquo; Acquisitions &rsaquo; Koha</title>
8	[% INCLUDE 'doc-head-close.inc' %]	11	[% INCLUDE 'doc-head-close.inc' %]
9	</head>	12	</head>
10		13
11	<body id="acq_uncertainprice" class="acq">	14	<body id="acq_uncertainprice" class="acq">
12	[% INCLUDE 'header.inc' %]	15	[% INCLUDE 'header.inc' form=formulaire %]
13	[% INCLUDE 'acquisitions-search.inc' %]
14		16
15	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	17	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
16	<ol>	18	<ol>
Lines 37-42 Link Here
37	</li>	39	</li>
38	[% END %]	40	[% END %]
39	</ol>	41	</ol>
		42	<ol>
		43	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		44	</ol>
		45	<ol>
		46	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		47	</ol>
40	</nav>	48	</nav>
41		49
42	<div class="main container-fluid">	50	<div class="main container-fluid">

Lines 2-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt (-2 / +10 lines)
2	[% USE Asset %]	2	[% USE Asset %]
3	[% PROCESS 'i18n.inc' %]	3	[% PROCESS 'i18n.inc' %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE 'acquisitions-search.inc' %]
		7	[% END %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	<title>[% IF ( opsearch ) %]Order from external source[% ELSE %]Search results &rsaquo; Acquisitions &rsaquo; Order from external source[% END %] &rsaquo; Koha</title>	9	<title>[% IF ( opsearch ) %]Order from external source[% ELSE %]Search results &rsaquo; Acquisitions &rsaquo; Order from external source[% END %] &rsaquo; Koha</title>
7		10
Lines 40-47 tr.selected td { Link Here
40	</head>	43	</head>
41		44
42	<body id="acq_z3950_search" class="acq">	45	<body id="acq_z3950_search" class="acq">
43	[% INCLUDE 'header.inc' %]	46	[% INCLUDE 'header.inc' form=formulaire %]
44	[% INCLUDE 'acquisitions-search.inc' %]
45		47
46	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	48	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
47	<ol>	49	<ol>
Lines 74-79 tr.selected td { Link Here
74	</li>	76	</li>
75	[% END %]	77	[% END %]
76	</ol>	78	</ol>
		79	<ol>
		80	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		81	</ol>
		82	<ol>
		83	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		84	</ol>
77	</nav>	85	</nav>
78		86
79	<div class="main container-fluid">	87	<div class="main container-fluid">

Lines 1-5 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt (-9 / +12 lines)
1	[% USE AuthorisedValues %]	1	[% USE AuthorisedValues %]
2	[% SET footerjs = 1 %]	2	[% SET footerjs = 1 %]
		3	[% formulaire = BLOCK %]
		4	[% INCLUDE 'cat-search.inc' %]
		5	[% END %]
3	[% INCLUDE 'doc-head-open.inc' %]	6	[% INCLUDE 'doc-head-open.inc' %]
4	<title>	7	<title>
5	[% SWITCH op %]	8	[% SWITCH op %]
Lines 14-20 Link Here
14	[% show_marcfield = marcfield_tables.grep('^' _ tablename _ '$').size ? 1 : 0 %]	17	[% show_marcfield = marcfield_tables.grep('^' _ tablename _ '$').size ? 1 : 0 %]
15		18
16	<body id="ser_add_fields" class="ser">	19	<body id="ser_add_fields" class="ser">
17	[% INCLUDE 'header.inc' %]	20	[% INCLUDE 'header.inc' form=formulaire %]
18		21
19	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	22	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
20	<ol>	23	<ol>
Lines 111-117 Link Here
111		114
112	[% IF op == 'list_tables' %]	115	[% IF op == 'list_tables' %]
113	[% IF CAN_user_acquisitions_order_manage \|\| CAN_user_serials_edit_subscription %]	116	[% IF CAN_user_acquisitions_order_manage \|\| CAN_user_serials_edit_subscription %]
114	<h1>Additional fields</h1>	117	<h2>Additional fields</h2>
115	<p>Select a table:</p>	118	<p>Select a table:</p>
116	[% BLOCK table_option %]	119	[% BLOCK table_option %]
117	<li><a href="?tablename=[% value \| uri %]">[% content \| html %] (<span class="ex">[% value \| html %]</span>)</a></li>	120	<li><a href="?tablename=[% value \| uri %]">[% content \| html %] (<span class="ex">[% value \| html %]</span>)</a></li>
Lines 128-134 Link Here
128	Additional permissions in the acquisitions or serials modules are required for editing additional fields	131	Additional permissions in the acquisitions or serials modules are required for editing additional fields
129	[% END %]	132	[% END %]
130	[% ELSIF op == 'list' %]	133	[% ELSIF op == 'list' %]
131	<h1>Additional fields for '[% tablename \| html %]'</h1>	134	<h2>Additional fields for '[% tablename \| html %]'</h2>
132	[% IF fields %]	135	[% IF fields %]
133	<table id="fieldst">	136	<table id="fieldst">
134	<thead>	137	<thead>
Lines 154-161 Link Here
154	[% IF field.searchable %]Yes[% ELSE %]No[% END %]	157	[% IF field.searchable %]Yes[% ELSE %]No[% END %]
155	</td>	158	</td>
156	<td class="actions">	159	<td class="actions">
157	<a class="btn btn-default btn-xs" href="?op=add_form&field_id=[% field.id \| html %]"><i class="fa fa-pencil"></i> Edit</a>	160	<a class="btn btn-default btn-xs" id="lientype" href="?op=add_form&field_id=[% field.id \| html %]"><i class="fa fa-pencil"></i> Edit</a>
158	<a class="confirmdelete btn btn-default btn-xs" href="?op=delete&field_id=[% field.id \| uri %]&tablename=[% tablename \| uri %]"><i class="fa fa-trash"></i> Delete</a>	161	<a class="confirmdelete btn btn-default btn-xs" id="lientype" href="?op=delete&field_id=[% field.id \| uri %]&tablename=[% tablename \| uri %]"><i class="fa fa-trash"></i> Delete</a>
159	</td>	162	</td>
160	</tr>	163	</tr>
161	[% END %]	164	[% END %]
Lines 166-174 Link Here
166	[% END %]	169	[% END %]
167	[% ELSIF op == 'add_form' %]	170	[% ELSIF op == 'add_form' %]
168	[% IF field %]	171	[% IF field %]
169	<h1>Modify field</h1>	172	<h2>Modify field</h2>
170	[% ELSE %]	173	[% ELSE %]
171	<h1>Add field</h1>	174	<h2>Add field</h2>
172	[% END %]	175	[% END %]
173	<form action="" name="add_form" id="add_field" method="post">	176	<form action="" name="add_form" id="add_field" method="post">
174	<fieldset class="rows">	177	<fieldset class="rows">
Lines 200-215 Link Here
200	[% END %]	203	[% END %]
201	</li>	204	</li>
202	</ol>	205	</ol>
203	</fieldset>
204	<fieldset class="action">	206	<fieldset class="action">
205	[% IF field %]	207	[% IF field %]
206	<input type="hidden" name="field_id" value="[% field.id \| html %]" />	208	<input type="hidden" name="field_id" value="[% field.id \| html %]" />
207	[% END %]	209	[% END %]
208	<input type="hidden" name="tablename" value="[% tablename \| html %]" />	210	<input type="hidden" name="tablename" value="[% tablename \| html %]" />
209	<input type="hidden" name="op" value="add" />	211	<input type="hidden" name="op" value="add" />
210	<input type="submit" value="Save" />	212	<input type="submit" class="principal" value="Save" />
211	<a href="?tablename=[% tablename \| uri %]" class="cancel">Cancel</a>	213	<a href="?tablename=[% tablename \| uri %]" class="cancel">Cancel</a>
212	</fieldset>	214	</fieldset>
		215	</fieldset>
213	</form>	216	</form>
214	[% END %]	217	[% END %]
215		218




[% USE Koha %]
[% SET footerjs = 1 %]
[% formulaire = BLOCK %]
    [% INCLUDE 'prefs-admin-search.inc' %]
[% END %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Administration &rsaquo; Koha</title>
[% INCLUDE 'doc-head-close.inc' %]
</head>
<body id="admin_admin-home" class="admin">
[% INCLUDE 'header.inc' form=formulaire %]

<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
    <ol>

                [% IF ( Koha.Preference('Mana') == 2 ) %]
                    <div class="dialog message">
                        <h4>Share content with Mana KB?</h4>
                        <p> You haven't decided if you want to activate Mana Knowledge Base. <a href=/cgi-bin/koha/admin/share_content.pl id="lientype">Change your Mana KB settings</a>.</p>
                    </div>
                [% END %]
            [% END %]

Lines 2-14 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt (-2 / +10 lines)
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE Koha %]	3	[% USE Koha %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE ''prefs-admin-search.inc' %]
		7	[% END %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	<title>Advanced editor shortcuts &rsaquo; Administration &rsaquo; Koha</title>	9	<title>Advanced editor shortcuts &rsaquo; Administration &rsaquo; Koha</title>
7	[% INCLUDE 'doc-head-close.inc' %]	10	[% INCLUDE 'doc-head-close.inc' %]
8	</head>	11	</head>
9	<body id="adveditor_shortcuts" class="admin">	12	<body id="adveditor_shortcuts" class="admin">
10	[% INCLUDE 'header.inc' %]	13	[% INCLUDE 'header.inc' form=formulaire %]
11	[% INCLUDE 'prefs-admin-search.inc' %]
12	[% PROCESS 'keyboard_shortcuts.inc' %]	14	[% PROCESS 'keyboard_shortcuts.inc' %]
13		15
14	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	16	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
Lines 23-28 Link Here
23	<a href="#" aria-current="page">Advanced editor shortcuts</a>	25	<a href="#" aria-current="page">Advanced editor shortcuts</a>
24	</li>	26	</li>
25	</ol>	27	</ol>
		28	<ol>
		29	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		30	</ol>
		31	<ol>
		32	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		33	</ol>
26	</nav>	34	</nav>
27		35
28	<div class="main container-fluid">	36	<div class="main container-fluid">

Lines 3-8 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt (-69 / +65 lines)
3	[% USE KohaDates %]	3	[% USE KohaDates %]
4	[% USE Price %]	4	[% USE Price %]
5	[% SET footerjs = 1 %]	5	[% SET footerjs = 1 %]
		6	[% formulaire = BLOCK %]
		7	[% INCLUDE 'budgets-admin-search.inc' %]
		8	[% END %]
6	[%- BLOCK action_menu %]	9	[%- BLOCK action_menu %]
7	<div class="btn-group dropup">	10	<div class="btn-group dropup">
8	<a class="btn btn-default btn-xs dropdown-toggle" id="budgetmenu_[% block_budget.budget_period_id \| html %]" role="button" data-toggle="dropdown" href="#">	11	<a class="btn btn-default btn-xs dropdown-toggle" id="budgetmenu_[% block_budget.budget_period_id \| html %]" role="button" data-toggle="dropdown" href="#">
Lines 72-79 Link Here
72		75
73	<body id="admin_aqbudgetperiods" class="admin">	76	<body id="admin_aqbudgetperiods" class="admin">
74		77
75	[% INCLUDE 'header.inc' %]	78	[% INCLUDE 'header.inc' form=formulaire %]
76	[% INCLUDE 'budgets-admin-search.inc' %]
77		79
78	<!-- ################################################################################# -->	80	<!-- ################################################################################# -->
79	<!-- BREADCRUMBS -->	81	<!-- BREADCRUMBS -->
Lines 167-172 Link Here
167	</li>	169	</li>
168	[% END %]	170	[% END %]
169	</ol>	171	</ol>
		172	<ol>
		173	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		174	</ol>
		175	<ol>
		176	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		177	</ol>
170	</nav>	178	</nav>
171		179
172	<div class="main container-fluid">	180	<div class="main container-fluid">
Lines 230-241 Link Here
230	</li>	238	</li>
231		239
232	</ol>	240	</ol>
233	</fieldset>
234
235	<fieldset class="action">	241	<fieldset class="action">
236	<input type="submit" value="Save" />	242	<input type="submit" class="principal" value="Save" />
237	<a class="cancel" href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id \| html %]">Cancel</a>	243	<a class="cancel" href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id \| html %]">Cancel</a>
238	</fieldset>	244	</fieldset>
		245	</fieldset>
		246
239		247
240	</form>	248	</form>
241		249
Lines 302-319 Link Here
302	[% IF ( budget_period_locked ) %]<input type="checkbox" checked="checked" id="budget_period_locked" name="budget_period_locked" value="1" />[% ELSE %] <input type="checkbox" id="budget_period_locked" name="budget_period_locked" value="1"/> [% END %]	310	[% IF ( budget_period_locked ) %]<input type="checkbox" checked="checked" id="budget_period_locked" name="budget_period_locked" value="1" />[% ELSE %] <input type="checkbox" id="budget_period_locked" name="budget_period_locked" value="1"/> [% END %]
303	</li>	311	</li>
304	</ol>	312	</ol>
305	</fieldset>
306
307	<fieldset class="action">	313	<fieldset class="action">
308	<!-- "save changes" button -->	314	<!-- "save changes" button -->
309	<!-- ###################################### -->	315	<!-- ###################################### -->
310	<input type="submit" value="Save" />	316	<input type="submit" class="principal" value="Save" />
311	[% IF ( budget_period_id ) %]	317	[% IF ( budget_period_id ) %]
312	<a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id \| uri %]" class="cancel">Cancel</a>	318	<a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id \| uri %]" class="cancel">Cancel</a>
313	[% ELSE %]	319	[% ELSE %]
314	<a href="/cgi-bin/koha/admin/aqbudgetperiods.pl" class="cancel">Cancel</a>	320	<a href="/cgi-bin/koha/admin/aqbudgetperiods.pl" class="cancel">Cancel</a>
315	[% END %]	321	[% END %]
316	</fieldset>	322	</fieldset>
		323	</fieldset>
		324
317		325
318	</form>	326	</form>
319		327
Lines 364-369 Link Here
364	<span>There are no unreceived orders for this budget.</span>	372	<span>There are no unreceived orders for this budget.</span>
365	<a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Back</a>	373	<a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Back</a>
366	[% ELSE %]	374	[% ELSE %]
		375	<div id="searchresults">
367	<h3>The unreceived orders from the following funds will be moved</h3>	376	<h3>The unreceived orders from the following funds will be moved</h3>
368	Fund list of budget <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id \| uri %]">[% budget_period_description \| html %]</a>:	377	Fund list of budget <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id \| uri %]">[% budget_period_description \| html %]</a>:
369	<table id="budgeth">	378	<table id="budgeth">
Lines 386-391 Link Here
386	[% END %]	395	[% END %]
387	</tbody>	396	</tbody>
388	</table>	397	</table>
		398	</div>
389	<form action="/cgi-bin/koha/admin/aqbudgetperiods.pl" name="f" method="post" id="move_form">	399	<form action="/cgi-bin/koha/admin/aqbudgetperiods.pl" name="f" method="post" id="move_form">
390	<fieldset class="rows">	400	<fieldset class="rows">
391	<ol>	401	<ol>
Lines 403-419 Link Here
403	<input type="checkbox" name="move_remaining_unspent" id="move_remaining_unspent" />	413	<input type="checkbox" name="move_remaining_unspent" id="move_remaining_unspent" />
404	</li>	414	</li>
405	</ol>	415	</ol>
406	</fieldset>
407	<fieldset class="action">	416	<fieldset class="action">
408	<input type="hidden" name="op" value="close_confirmed" />	417	<input type="hidden" name="op" value="close_confirmed" />
409	<input type="hidden" name="budget_period_id" value="[% budget_period_id \| html %]" />	418	<input type="hidden" name="budget_period_id" value="[% budget_period_id \| html %]" />
410	<input type="submit" value="Move unreceived orders" />	419	<input type="submit" class="principal" value="Move unreceived orders" />
411	<a class="cancel" href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Cancel</a>	420	<a class="cancel" href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Cancel</a>
412	</fieldset>	421	</fieldset>
		422	</fieldset>
413	</form>	423	</form>
414	[% END %]	424	[% END %]
415	[% ELSIF closed %]	425	[% ELSIF closed %]
416	<h1>Budget [% budget_period_description \| html %] closed</h1>	426	<h2>Budget [% budget_period_description \| html %] closed</h2>
		427	<div id="searchresults">
		428
417	<h3>Report after moving unreceived orders from budget [% from_budget_period.budget_period_description \| html %] ([% from_budget_period.budget_period_startdate \| $KohaDates %] - [% from_budget_period.budget_period_enddate \| $KohaDates %]) to [% to_budget_period.budget_period_description \| html %] ([% to_budget_period.budget_period_startdate \| $KohaDates %] - [% to_budget_period.budget_period_enddate \| $KohaDates%])</h3>	429	<h3>Report after moving unreceived orders from budget [% from_budget_period.budget_period_description \| html %] ([% from_budget_period.budget_period_startdate \| $KohaDates %] - [% from_budget_period.budget_period_enddate \| $KohaDates %]) to [% to_budget_period.budget_period_description \| html %] ([% to_budget_period.budget_period_startdate \| $KohaDates %] - [% to_budget_period.budget_period_enddate \| $KohaDates%])</h3>
418		430
419	<table id="closed_report">	431	<table id="closed_report">
Lines 459-464 Link Here
459	[% END %]	471	[% END %]
460	</tbody>	472	</tbody>
461	</table>	473	</table>
		474	</div>
462	<a class="cancel" href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Back</a>	475	<a class="cancel" href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Back</a>
463	[% END %]	476	[% END %]
464		477
Lines 472-477 Link Here
472		485
473	[% INCLUDE 'budgets-active-currency.inc' %]	486	[% INCLUDE 'budgets-active-currency.inc' %]
474		487
		488	<div id="searchresults">
475	<div id="budgetsTabs" class="toptabs">	489	<div id="budgetsTabs" class="toptabs">
476	<ul class="nav nav-tabs" role="tablist">	490	<ul class="nav nav-tabs" role="tablist">
477	<li role="presentation" class="active">	491	<li role="presentation" class="active">
Lines 494-557 Link Here
494	<th>Total</th>	508	<th>Total</th>
495	<th class="noExport">Actions</th>	509	<th class="noExport">Actions</th>
496	</tr>	510	</tr>
497	</thead>	511	[% END %]
498	<tbody>	512	</tbody>
499	[% FOREACH period_active IN period_active_loop %]	513	</table>
500	<tr>	514	[% ELSE %]
501	<td><a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% period_active.budget_period_id \| uri %]" title="View funds for [% period_active.budget_period_description \| html %]">[% period_active.budget_period_description \| html %]</a></td>	515	No active budgets
502	<td data-order="[% period_active.budget_period_startdate \| html %]">[% period_active.budget_period_startdate \| $KohaDates %]</td>	516	[% END %]
503	<td data-order="[% period_active.budget_period_enddate \| html %]">[% period_active.budget_period_enddate \| $KohaDates %]</td>	517	</div>
504	<td>	518	<div id="inactive">
505	[% IF ( period_active.budget_period_locked ) %]	519	[% IF ( period_inactive_loop ) %]
506	<i class="fa fa-lock"></i> Locked</span>	520	<table id="inactiveperiodst">
507	[% END %]	521	<thead>
508	</td>	522	<tr>
509	<td class="data">[% period_active.budget_period_total \| $Price %]</td>	523	<th>Budget name</th>
510	<td>	524	<th>Start date</th>
511	[% PROCESS action_menu block_budget=period_active %]	525	<th>End date</th>
512	</td>	526	<th>Locked</th>
513	</tr>	527	<th>Total</th>
514	[% END %]	528	<th class="noExport">Actions</th>
515	</tbody>	529	</tr>
516	</table>	530	</thead>
517	[% ELSE %]	531	<tbody>
518	No active budgets	532	[% FOREACH period_loo IN period_inactive_loop %]
519	[% END %]	533	<tr>
520	</div>	534	<td><a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% period_loo.budget_period_id \| uri %]" title="View funds for [% period_loo.budget_period_description \| html %]">[% period_loo.budget_period_description \| html %]</a></td>
521	<div id="inactive" role="tabpanel" class="tab-pane">	535	<td data-order="[% period_loo.budget_period_startdate \| html %]">[% period_loo.budget_period_startdate \| $KohaDates %]</td>
522	[% IF ( period_inactive_loop ) %]	536	<td data-order="[% period_loo.budget_period_enddate \| html %]">[% period_loo.budget_period_enddate \| $KohaDates %]</td>
523	<table id="inactiveperiodst">	537	<td>[% IF ( period_loo.budget_period_locked ) %]<i class="fa fa-lock"></i> Locked[% END %]</td>
524	<thead>	538	<td class="data">[% period_loo.budget_period_total \| $Price %]</td>
525	<tr>	539	<td>
526	<th>Budget name</th>	540	[% PROCESS action_menu block_budget=period_loo %]
527	<th>Start date</th>	541	</td>
528	<th>End date</th>	542	</tr>
529	<th>Locked</th>	543	[% END %]
530	<th>Total</th>	544	</tbody>
531	<th class="noExport">Actions</th>	545	</table>
532	</tr>	546	[% ELSE %]
533	</thead>	547	No inactive budgets
534	<tbody>	548	[% END %]
535	[% FOREACH period_loo IN period_inactive_loop %]	549	</div>
536	<tr>	550	</div></div>
537	<td><a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% period_loo.budget_period_id \| uri %]" title="View funds for [% period_loo.budget_period_description \| html %]">[% period_loo.budget_period_description \| html %]</a></td>
538	<td data-order="[% period_loo.budget_period_startdate \| html %]">[% period_loo.budget_period_startdate \| $KohaDates %]</td>
539	<td data-order="[% period_loo.budget_period_enddate \| html %]">[% period_loo.budget_period_enddate \| $KohaDates %]</td>
540	<td>[% IF ( period_loo.budget_period_locked ) %]<i class="fa fa-lock"></i> Locked[% END %]</td>
541	<td class="data">[% period_loo.budget_period_total \| $Price %]</td>
542	<td>
543	[% PROCESS action_menu block_budget=period_loo %]
544	</td>
545	</tr>
546	[% END %]
547	</tbody>
548	</table>
549	[% ELSE %]
550	No inactive budgets
551	[% END %]
552	</div>
553	</div> <!-- /.tab-content -->
554	</div>
555	[% END %]	551	[% END %]
556		552
557	</main>	553	</main>




[% USE Branches %]
[% USE Price %]
[% SET footerjs = 1 %]
[% formulaire = BLOCK %]
    [% INCLUDE 'budgets-admin-search.inc' %]
[% END %]
[% INCLUDE 'doc-head-open.inc' %]

<title>[% IF op == 'add_form' %][% IF ( budget_id ) %]Modify fund[% IF ( budget_name ) %] '[% budget_name | html %]'[% END %][% ELSE %]Add fund[% END %] &rsaquo;[% END %] Funds &rsaquo; Administration &rsaquo; Koha</title>

</head>

<body id="admin_aqbudgets" class="admin">
[% INCLUDE 'header.inc' form=formulaire %]
[% INCLUDE 'budgets-admin-search.inc' %]

<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
    <ol>
        <li>
            <a href="/cgi-bin/koha/mainpage.pl">Home</a>
        </li>
        <li>
            <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
        </li>
        <li>
            <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a>
        </li>

        [% IF op == 'list' %]
            [% IF budget_period_id %]
                <li>
                    <a href="#" aria-current="page">
                        Funds for '[% budget_period_description | html %]'
                    </a>
                </li>
            [% ELSE %]
                <li>
                    <a href="#" aria-current="page">
                        All funds
                    </a>
                </li>
            [% END %]
        [% END %]

        [% IF op == 'add_form' %]
            <li>
                <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | uri %]">Funds</a>
                    All funds
                </a>
            </li>
            [% IF ( budget_id ) %]
                <li>
                    <a href="#" aria-current="page">
                    Modify fund
                        [% IF ( budget_name ) %] '[% budget_name | html %]'[% END %]
                    </a>
                </li>
            [% ELSE %]
                <li>
                    <a href="#" aria-current="page">
                        Add fund
                    </a>
                </li>
            [% END %]
        [% END %]
    [% END %]

        [% IF op == 'delete_confirm' %]
        <li>
            <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | uri %]">Funds</a>
        </li>
        [% IF ( budget_id ) %]
            <li>
                <a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a>
                Modify fund
                    [% IF ( budget_name ) %] '[% budget_name | html %]'[% END %]
                </a>
            </li>
        [% ELSE %]
            <li>
                <a href="#" aria-current="page">
                    Delete fund?
                </a>
            </li>
        [% END %]
    [% END %]

    [% IF op == 'delete_confirm' %]
        <li>
            <a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a>
        </li>
        <li>
            <a href="#" aria-current="page">
                Delete fund?
            </a>
        </li>
    [% END %]
    </ol>
        <ol>
            [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
        </ol>
        <ol>
            <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
        </ol>
</nav>

<div class="main container-fluid">


[% IF op == 'list' %]

<h2>
  [% IF budget_period_id %]
    Funds for '[% budget_period_description | html %]'
  [% ELSE %]
    All funds
  [% END %]
</h2>

[% INCLUDE 'budgets-active-currency.inc' %]


            </span>
        </div>
    [% END %]
<div id=="searchresults">
<table id="budgeth" class="group">
    <thead>
        <tr>

    [% END %]
    </tbody>
</table>
</div>

[% ELSE %]
    <p>No fund found</p>

[% IF op == 'add_form' && !error_not_authorised_to_modify %]
<form action="/cgi-bin/koha/admin/aqbudgets.pl" id="edit_fund" name="Aform" method="post">
    <fieldset class="rows">
    <h3>[% IF ( budget_id ) %]Modify[% ELSE %]Add[% END %] Fund
    [% IF ( budget_period_description ) %]
        [% budget_name | html %] for Budget '[% budget_period_description | html %]'
    [% END %]
    </h3>
    </legend>

    <input type="hidden" name="op" value="add_validate" />
    <input type="hidden" name="checked" value="0" />

    [% IF ( budget_id ) %]
        <input type="hidden" name="budget_id" value="[% budget_id | html %]" />
    [% END %]
    </fieldset>

    <fieldset class="action">
        <input type="submit" class="principal" value="Submit" /> <a class="cancel" href="/cgi-bin/koha/admin/aqbudgets.pl">Cancel</a>
        <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" />
    </fieldset>
    </fieldset>

</form>

[% END %] <!-- add_form -->


        <div class="col-sm-2 col-sm-pull-10">
            <aside>
            <div id="filters">

[% IF op == 'list' %]
  <form action="/cgi-bin/koha/admin/aqbudgets.pl" method="get">

    <h4>Fund filters</h4>
        <ol>
        <li>
            <p for="filter_budgetbranch2">Library:
            <select name="filter_budgetbranch" id="filter_budgetbranch2">
                <option value=""></option>
                [% PROCESS options_for_libraries libraries => Branches.all( selected => selected_branchcode, unfiltered => 1 ) %]
            </select></p>
        </li>
        <li class="radio">

        <p for="show_mine">Show my funds only:
            [% IF ( show_mine ) %]
                <input type="checkbox" id="show_mine"  name="show_mine" value="1" checked="checked" />
            [% ELSE %]
                <input type="checkbox" id="show_mine"  name="show_mine" value="1" />
        [% END %]</p>
        </li>

        [% IF periods %]
          <li>
            <p for="periods">Budget:
            <select id="periods" name="budget_period_id">
              <option value="">All budgets</option>
              [% FOR period IN periods %]

                  <option value="[% period.budget_period_id | html %]">[% period.budget_period_description | html %]</option>
                [% END %]
              [% END %]
            </select></p>
          </li>
        [% END %]
        </ol>

        <input type="hidden" name="op" value="list" />
        <input type="submit" class="principal" name="filter" value="Go" />
    </fieldset>
</form>[% END %]

                [% INCLUDE 'acquisitions-menu.inc' %]
                </div>
            </aside>
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
     </div> <!-- /.row -->

Lines 2-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt (-2 / +10 lines)
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE KohaDates %]	3	[% USE KohaDates %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE 'contracts-admin-search.inc' %]
		7	[% END %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	<title>	9	<title>
7	[% IF ( add_form ) %]	10	[% IF ( add_form ) %]
Lines 18-25 Link Here
18	</head>	21	</head>
19		22
20	<body id="acq_aqcontract" class="acq">	23	<body id="acq_aqcontract" class="acq">
21	[% INCLUDE 'header.inc' %]	24	[% INCLUDE 'header.inc' form=formulaire %]
22	[% INCLUDE 'contracts-admin-search.inc' %]
23		25
24	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	26	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
25	<ol>	27	<ol>
Lines 93-98 Link Here
93	</li>	95	</li>
94	[% END %]	96	[% END %]
95	</ol>	97	</ol>
		98	<ol>
		99	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		100	</ol>
		101	<ol>
		102	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		103	</ol>
96	</nav>	104	</nav>
97		105
98	<div class="main container-fluid">	106	<div class="main container-fluid">

Lines 2-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt (-17 / +27 lines)
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE Price %]	3	[% USE Price %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE 'budgets-admin-search.inc' %]
		7	[% END %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	[% PROCESS 'budget_planning.inc' %]	9	[% PROCESS 'budget_planning.inc' %]
7	<title>Planning for [% budget_period_description \| html %] [% PROCESS planning plan=authcat %] &rsaquo; Funds &rsaquo; Budgets &rsaquo; Administration &rsaquo; Koha</title>	10	<title>Planning for [% budget_period_description \| html %] [% PROCESS planning plan=authcat %] &rsaquo; Funds &rsaquo; Budgets &rsaquo; Administration &rsaquo; Koha</title>
Lines 10-17 Link Here
10	</head>	13	</head>
11		14
12	<body id="admin_aqplan" class="admin">	15	<body id="admin_aqplan" class="admin">
13	[% INCLUDE 'header.inc' %]	16	[% INCLUDE 'header.inc' form=formulaire %]
14	[% INCLUDE 'budgets-admin-search.inc' %]
15		17
16	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	18	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
17	<ol>	19	<ol>
Lines 31-36 Link Here
31	<a href="#" aria-current="page">Planning</a>	33	<a href="#" aria-current="page">Planning</a>
32	</li>	34	</li>
33	</ol>	35	</ol>
		36	<ol>
		37	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		38	</ol>
		39	<ol>
		40	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		41	</ol>
34	</nav>	42	</nav>
35		43
36	<div class="main container-fluid">	44	<div class="main container-fluid">
Lines 164-172 Link Here
164		172
165	<input type="hidden" name="budget_period_id" value="[% budget_period_id \| html %]" />	173	<input type="hidden" name="budget_period_id" value="[% budget_period_id \| html %]" />
166	[% IF ( budget_period_locked ) %]	174	[% IF ( budget_period_locked ) %]
167	<!-- <input STYLE="background: gray;" type="submit" value="Save" disabled="disabled"/> -->	175	<!-- <input STYLE="background: gray;" class="principal" type="submit" value="Save" disabled="disabled"/> -->
168	[% ELSE %]	176	[% ELSE %]
169	<input type="hidden" name="op" value="save" />	177	<input type="hidden" name="op" class="principal" value="save" />
170	<fieldset class="action"><input type="submit" value="Save"/></fieldset>	178	<fieldset class="action"><input type="submit" value="Save"/></fieldset>
171	[% END %]	179	[% END %]
172		180
Lines 197-202 Link Here
197		205
198	<div class="col-sm-2 col-sm-pull-10">	206	<div class="col-sm-2 col-sm-pull-10">
199	<aside>	207	<aside>
		208	<div id="filters">
200		209
201	<form method="post" action="/cgi-bin/koha/admin/aqplan.pl">	210	<form method="post" action="/cgi-bin/koha/admin/aqplan.pl">
202	<input type="hidden" name="budget_period_id" value="[% budget_period_id \| html %]" />	211	<input type="hidden" name="budget_period_id" value="[% budget_period_id \| html %]" />
Lines 212-218 Link Here
212	[% END %]	221	[% END %]
213	<ol>	222	<ol>
214	<li>	223	<li>
215	<label for="authcat"> Select planning type:</label>	224	<p for="authcat"> Select planning type:
216	<select name="authcat" id="authcat">	225	<select name="authcat" id="authcat">
217	[% FOREACH value IN authcat_dropbox.values %]	226	[% FOREACH value IN authcat_dropbox.values %]
218	[% IF ( value == authcat_dropbox.default ) %]	227	[% IF ( value == authcat_dropbox.default ) %]
Lines 221-258 Link Here
221	<option value="[% value \| html %]">[% PROCESS planning_types type=value %]</option>	230	<option value="[% value \| html %]">[% PROCESS planning_types type=value %]</option>
222	[% END %]	231	[% END %]
223	[% END %]	232	[% END %]
224	</select>	233	</select></p>
225	</li>	234	</li>
226	<li class="radio">	235	<li class="radio"><p for="show_mine">
227	[% IF ( show_mine ) %]	236	[% IF ( show_mine ) %]
228	<input type="checkbox" id="show_mine" name="show_mine" value="1" checked="checked" />	237	<input type="checkbox" id="show_mine" name="show_mine" value="1" checked="checked" />
229	[% ELSE %]	238	[% ELSE %]
230	<input type="checkbox" id="show_mine" name="show_mine" value="1" />	239	<input type="checkbox" id="show_mine" name="show_mine" value="1" />
231	[% END %]	240	[% END %]
232	<label for="show_mine">Show my funds only</label>	241	Show my funds only</p>
233	</li>	242	</li>
234		243
235	<li class="radio">	244	<li class="radio"><p for="show_active">
236	[% IF ( show_active ) %]	245	[% IF ( show_active ) %]
237	<input type="checkbox" id="show_active" name="show_active" value="1" checked="checked" />	246	<input type="checkbox" id="show_active" name="show_active" value="1" checked="checked" />
238	[% ELSE %]	247	[% ELSE %]
239	<input type="checkbox" id="show_active" name="show_active" value="1" />	248	<input type="checkbox" id="show_active" name="show_active" value="1" />
240	[% END %]	249	[% END %]
241	<label for="show_active">Show active funds only</label>	250	Show active funds only</p>
242	</li>	251	</li>
243		252
244		253
245	<li class="radio">	254	<li class="radio"><p for="show_actual">
246	[% IF ( show_actual ) %]	255	[% IF ( show_actual ) %]
247	<input type="checkbox" id="show_actual" name="show_actual" value="1" checked="checked" />	256	<input type="checkbox" id="show_actual" name="show_actual" value="1" checked="checked" />
248	[% ELSE %]	257	[% ELSE %]
249	<input type="checkbox" id="show_actual" name="show_actual" value="1" />	258	<input type="checkbox" id="show_actual" name="show_actual" value="1" />
250	[% END %]	259	[% END %]
251	<label for="show_actual">Show actual/estimated values</label>	260	Show actual/estimated values</p>
252	</li>	261	</li>
253	</ol>	262	</ol>
254	<fieldset class="action">	263	<fieldset class="action">
255	<input type="submit" name="option_submit" value="Submit" />	264	<input type="submit" class="principal" name="option_submit" value="Submit" />
256	<input type="hidden" name="budget_period_id" value="[% budget_period_id \| html %]" />	265	<input type="hidden" name="budget_period_id" value="[% budget_period_id \| html %]" />
257	</fieldset>	266	</fieldset>
258	</fieldset>	267	</fieldset>
Lines 262-269 Link Here
262	<fieldset class="brief">	271	<fieldset class="brief">
263	<h4>Export</h4>	272	<h4>Export</h4>
264	<ol>	273	<ol>
265	<li><label for="basename">Output to a file named: </label><input type="text" name="basename" id="basename" value="Export" /></li>	274	<li><p for="basename">Output to a file named: <input type="text" name="basename" id="basename" value="Export" /></p></li>
266	<li><label class="inline" for="MIME">Into an application</label>	275	<li><p class="inline" for="MIME">Into an application
267	<select name="MIME" id="MIME">	276	<select name="MIME" id="MIME">
268	[% FOREACH value IN CGIextChoice %]	277	[% FOREACH value IN CGIextChoice %]
269	<option value="[% value \| html %]">[% value \| html %]</option>	278	<option value="[% value \| html %]">[% value \| html %]</option>
Lines 273-282 Link Here
273	[% FOREACH value IN CGIsepChoice %]	282	[% FOREACH value IN CGIsepChoice %]
274	<option value="[% value \| html %]">[% value \| html %]</option>	283	<option value="[% value \| html %]">[% value \| html %]</option>
275	[% END %]	284	[% END %]
276	</select>	285	</select></p>
277	</li>	286	</li>
278	</ol>	287	</ol>
279	<fieldset class="action"> <input type="submit" value="Submit"/>	288	<fieldset class="action"> <input type="submit" class="principal" value="Submit"/>
280	<input type="hidden" name="budget_period_id" value="[% budget_period_id \| html %]" />	289	<input type="hidden" name="budget_period_id" value="[% budget_period_id \| html %]" />
281	<input type="hidden" name="report_name" value="[% report_name \| html %]" />	290	<input type="hidden" name="report_name" value="[% report_name \| html %]" />
282	<input type="hidden" name="output" value="file" /></fieldset>	291	<input type="hidden" name="output" value="file" /></fieldset>
Lines 287-292 Link Here
287	[% END %]	296	[% END %]
288		297
289	[% INCLUDE 'acquisitions-menu.inc' %]	298	[% INCLUDE 'acquisitions-menu.inc' %]
		299	</div>
290	</aside>	300	</aside>
291	</div> <!-- /.col-sm-2.col-sm-pull-10 -->	301	</div> <!-- /.col-sm-2.col-sm-pull-10 -->
292	</div> <!-- /.row -->	302	</div> <!-- /.row -->

Lines 2-15 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt (-11 / +22 lines)
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE Koha %]	3	[% USE Koha %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE 'prefs-admin-search.inc' %]
		7	[% END %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	<title>Audio alerts &rsaquo; Administration &rsaquo; Koha</title>	9	<title>Audio alerts &rsaquo; Administration &rsaquo; Koha</title>
7	[% INCLUDE 'doc-head-close.inc' %]	10	[% INCLUDE 'doc-head-close.inc' %]
8	</head>	11	</head>
9		12
10	<body id="admin_audio_alerts" class="admin">	13	<body id="admin_audio_alerts" class="admin">
11	[% INCLUDE 'header.inc' %]	14	[% INCLUDE 'header.inc' form=formulaire %]
12	[% INCLUDE 'prefs-admin-search.inc' %]
13		15
14	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	16	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
15	<ol>	17	<ol>
Lines 25-30 Link Here
25	</a>	27	</a>
26	</li>	28	</li>
27	</ol>	29	</ol>
		30	<ol>
		31	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		32	</ol>
		33	<ol>
		34	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		35	</ol>
28	</nav>	36	</nav>
29		37
30	<div class="main container-fluid">	38	<div class="main container-fluid">
Lines 32-44 Link Here
32	<div class="col-sm-10 col-sm-push-2">	40	<div class="col-sm-10 col-sm-push-2">
33	<main>	41	<main>
34		42
35	<div id="toolbar" class="btn-toolbar">	43	<div id="toolbar" class="btn-toolbar"><div>
36	<a class="btn btn-default" id="newalert" href="/cgi-bin/koha/admin/audio_alerts.pl"><i class="fa fa-plus"></i> New alert</a>	44	<a class="pat" id="newalert" href="/cgi-bin/koha/admin/audio_alerts.pl"><i class="fa fa-plus"></i> New alert</a>
37	</div>	45	</div></div>
38		46
39	<form id="new-alert-form" action="audio_alerts.pl" method="post" class="validated">	47	<form id="new-alert-form" action="audio_alerts.pl" method="post" class="validated">
40	<fieldset class="rows">	48	<fieldset class="rows">
41	<legend><h1><span class="create-alert">Add new alert</span><span class="edit-alert">Edit alert</span></h1></legend>	49	<legend><h1><span class="create-alert">Add new alert</span><span class="edit-alert">Edit alert</span></h1></legend>
		50	<h3><span class="create-alert">Add new alert</span><span class="edit-alert">Edit alert</span></h3>
42		51
43	<input id="id" name="id" type="hidden" value="" />	52	<input id="id" name="id" type="hidden" value="" />
44	<ol>	53	<ol>
Lines 78-92 Link Here
78	</select>	87	</select>
79	</li>	88	</li>
80	</ol>	89	</ol>
81	</fieldset>
82	<fieldset class="action">	90	<fieldset class="action">
83	<input id="save-alert" type="submit" value="Submit" />	91	<input id="save-alert" class="principal" type="submit" value="Submit" />
84	<a href="#" id="cancel-edit" class="cancel cancel-edit">Cancel</a>	92	<a href="#" id="cancel-edit" class="cancel cancel-edit">Cancel</a>
85	</fieldset>	93	</fieldset>
		94	</fieldset>
86	</form>	95	</form>
87		96
88	<form id="delete-alert-form" action="audio_alerts.pl" method="post">	97	<form id="delete-alert-form" action="audio_alerts.pl" method="post">
89	<h1>Audio alerts</h1>	98	<h2>Audio alerts</h2>
90	[%IF !( Koha.Preference('AudioAlerts') ) %]	99	[%IF !( Koha.Preference('AudioAlerts') ) %]
91	<div class="dialog alert">	100	<div class="dialog alert">
92	<h3>Audio alerts are disabled</h3>	101	<h3>Audio alerts are disabled</h3>
Lines 97-102 Link Here
97	[% END %]	106	[% END %]
98	</div>	107	</div>
99	[% END %]	108	[% END %]
		109	<div id="searchresults">
100	<table id="audio-alerts-table">	110	<table id="audio-alerts-table">
101	<thead id="audio-alerts-table-head">	111	<thead id="audio-alerts-table-head">
102	<tr>	112	<tr>
Lines 134-149 Link Here
134	<td>[% a.selector \| html %]</td>	144	<td>[% a.selector \| html %]</td>
135	<td>[% a.sound \| html %]</td>	145	<td>[% a.sound \| html %]</td>
136	<td>	146	<td>
137	<a class="btn btn-default btn-xs edit" data-soundid="[% a.id \| html %]" data-precedence="[% a.precedence \| html %]" data-selector="[% a.selector \| html %]" data-sound="[% a.sound \| html %]"><i class="fa fa-pencil"></i> Edit</a></td>	147	<a class="btn btn-default btn-xs edit" data-soundid="[% a.id \| html %]" data-precedence="[% a.precedence \| html %]" data-selector="[% a.selector \| html %]" data-sound="[% a.sound \| html %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a></td>
138	</tr>	148	</tr>
139	[% END %]	149	[% END %]
140	</tbody>	150	</tbody>
141	</table>	151	</table>
		152	</form>
142		153
143	<p>	154	<p>
144	<button id="delete-alerts" type="submit" class="btn btn-default disabled"><i class="fa fa-trash"></i> Delete selected alerts</button>	155	<button id="delete-alerts" type="submit" class="btn btn-default disabled principal"><i class="fa fa-trash"></i> Delete selected alerts</button>
145	</p>	156	</p>
146	</form>	157	</div>
147	</main>	158	</main>
148	</div> <!-- /.col-sm-10.col-sm-push-2 -->	159	</div> <!-- /.col-sm-10.col-sm-push-2 -->
149		160

Lines 1-14 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt (-2 / +10 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'prefs-admin-search.inc' %]
		6	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
5	<title>Authority MARC subfield structure &rsaquo; Administration &rsaquo; Koha</title>	8	<title>Authority MARC subfield structure &rsaquo; Administration &rsaquo; Koha</title>
6	[% INCLUDE 'doc-head-close.inc' %]	9	[% INCLUDE 'doc-head-close.inc' %]
7	</head>	10	</head>
8		11
9	<body id="admin_auth_subfields_structure" class="admin">	12	<body id="admin_auth_subfields_structure" class="admin">
10	[% INCLUDE 'header.inc' %]	13	[% INCLUDE 'header.inc' form=formulaire %]
11	[% INCLUDE 'prefs-admin-search.inc' %]
12		14
13	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	15	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
14	<ol>	16	<ol>
Lines 70-75 Link Here
70	[% END %]	72	[% END %]
71	[% END %]	73	[% END %]
72	</ol>	74	</ol>
		75	<ol>
		76	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		77	</ol>
		78	<ol>
		79	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		80	</ol>
73	</nav>	81	</nav>
74		82
75	<div class="main container-fluid">	83	<div class="main container-fluid">

Lines 2-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt (-2 / +10 lines)
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE AuthorisedValues %]	3	[% USE AuthorisedValues %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE 'prefs-admin-search.inc' %]
		7	[% END %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	<title>	9	<title>
7	[% IF ( add_form ) %]	10	[% IF ( add_form ) %]
Lines 38-45 Authority MARC framework &rsaquo; Administration &rsaquo; Koha Link Here
38	</head>	41	</head>
39		42
40	<body id="admin_auth_tag_structure" class="admin">	43	<body id="admin_auth_tag_structure" class="admin">
41	[% INCLUDE 'header.inc' %]	44	[% INCLUDE 'header.inc'' form=formulaire %]
42	[% INCLUDE 'prefs-admin-search.inc' %]
43		45
44	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	46	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
45	<ol>	47	<ol>
Lines 158-163 Authority MARC framework &rsaquo; Administration &rsaquo; Koha Link Here
158	[% END %]	160	[% END %]
159	[% END %]	161	[% END %]
160	</ol>	162	</ol>
		163	<ol>
		164	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		165	</ol>
		166	<ol>
		167	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		168	</ol>
161	</nav>	169	</nav>
162		170
163	<div class="main container-fluid">	171	<div class="main container-fluid">

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt (-18 / +27 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'prefs-admin-search.inc' %]
		6	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
5	<title>	8	<title>
6	[% IF op == 'add_form' %]	9	[% IF op == 'add_form' %]
Lines 38-45 Link Here
38	</head>	41	</head>
39		42
40	<body id="admin_authorised_values" class="admin">	43	<body id="admin_authorised_values" class="admin">
41	[% INCLUDE 'header.inc' %]	44	[% INCLUDE 'header.inc' form=formulaire %]
42	[% INCLUDE 'prefs-admin-search.inc' %]
43		45
44	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	46	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
45	<ol>	47	<ol>
Lines 94-99 Link Here
94	</li>	96	</li>
95	[% END # /IF op == 'add_form' %]	97	[% END # /IF op == 'add_form' %]
96	</ol>	98	</ol>
		99	<ol>
		100	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		101	</ol>
		102	<ol>
		103	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		104	</ol>
97	</nav> <!-- /#breadcrumbs -->	105	</nav> <!-- /#breadcrumbs -->
98		106
99	<div class="main container-fluid">	107	<div class="main container-fluid">
Lines 102-112 Link Here
102	<main>	110	<main>
103		111
104	[% IF op == 'add_form' %]	112	[% IF op == 'add_form' %]
105	<h1>	113	<h2>
106	[% IF ( action_modify ) %]Modify authorized value[% END %]	114	[% IF ( action_modify ) %]Modify authorized value[% END %]
107	[% IF ( action_add_value ) %]New authorized value[% END %]	115	[% IF ( action_add_value ) %]New authorized value[% END %]
108	[% IF ( action_add_category ) %]New category[% END %]	116	[% IF ( action_add_category ) %]New category[% END %]
109	</h1>	117	</h2>
110		118
111	[% IF ( action_modify ) %]	119	[% IF ( action_modify ) %]
112	<div class="note">	120	<div class="note">
Lines 239-267 Link Here
239	</div> <!-- /.tab-content -->	247	</div> <!-- /.tab-content -->
240	</div> <!-- /#icons -->	248	</div> <!-- /#icons -->
241	[% END # /IF action_add_category %]	249	[% END # /IF action_add_category %]
242	</fieldset>
243
244	<fieldset class="action">	250	<fieldset class="action">
245	<input type="hidden" name="id" value="[% av.id \| html %]" />	251	<input type="hidden" name="id" value="[% av.id \| html %]" />
246	<input type="submit" value="Save" />	252	<input type="submit" class="principal" value="Save" />
247	<a class="cancel" href="/cgi-bin/koha/admin/authorised_values.pl?searchfield=[% category_name \| url %]">Cancel</a>	253	<a class="cancel" href="/cgi-bin/koha/admin/authorised_values.pl?searchfield=[% category_name \| url %]">Cancel</a>
248	</fieldset>	254	</fieldset>
		255	</fieldset>
		256
249	</form>	257	</form>
250	[% END # /IF op == 'add_form' %]	258	[% END # /IF op == 'add_form' %]
251		259
252	[% IF op == 'list' %]	260	[% IF op == 'list' %]
253	<div id="toolbar" class="btn-toolbar">	261	<div id="toolbar" class="btn-toolbar">
254	<a id="addcat" class="btn btn-default" href= "/cgi-bin/koha/admin/authorised_values.pl?op=add_form"><i class="fa fa-plus"> </i> New category</a>	262	<div>
		263	<a id="addcat" class="pat" href= "/cgi-bin/koha/admin/authorised_values.pl?op=add_form"><i class="fa fa-plus"> </i> New category</a>
255	[% IF ( searchfield ) %]	264	[% IF ( searchfield ) %]
256	<a id="addauth" class="btn btn-default" href= "/cgi-bin/koha/admin/authorised_values.pl?op=add_form&category=[% category.category_name \| url %]"><i class="fa fa-plus"> </i> New authorized value for [% category.category_name \| html %]</a>	265	<a class="pat" href= "/cgi-bin/koha/admin/authorised_values.pl?op=add_form&category=[% category.category_name \| url %]"><i class="fa fa-plus"> </i> New authorized value for [% category.category_name \| html %]</a>
257	[% END %]	266	[% END %]
258	</div>	267	</div></div>
259		268
260	[% IF ( searchfield ) %]	269	[% IF ( searchfield ) %]
261	<h1>Authorized values for category [% category.category_name \| html %]</h1>	270	<h2>Authorized values for category [% category.category_name \| html %]</h2>
262	[% PROCESS category_descriptions code_category = category.category_name %]	271	[% PROCESS category_descriptions code_category = category.category_name %]
263	[% ELSE %]	272	[% ELSE %]
264	<h1>Authorized values</h1>	273	<h2>Authorized values</h2>
265	[% END %]	274	[% END %]
266		275
267	[% IF ( searchfield ) %]	276	[% IF ( searchfield ) %]
Lines 303-310 Link Here
303	</div>	312	</div>
304	[% END # /FOR m IN messages %]	313	[% END # /FOR m IN messages %]
305		314
		315	<div id="searchresults">
306	[% IF ( searchfield ) %]	316	[% IF ( searchfield ) %]
307
308	<form action="/cgi-bin/koha/admin/authorised_values.pl" method="get" id="category">	317	<form action="/cgi-bin/koha/admin/authorised_values.pl" method="get" id="category">
309	<p>	318	<p>
310	<label for="category_search">Show category: </label>	319	<label for="category_search">Show category: </label>
Lines 360-367 Link Here
360	No limitation	369	No limitation
361	[% END # /IF loo.branches.size > 0 %]	370	[% END # /IF loo.branches.size > 0 %]
362	</td>	371	</td>
363	<td class="actions"><a href="/cgi-bin/koha/admin/authorised_values.pl?op=add_form&id=[% loo.id \| uri %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>	372	<td class="actions"><a href="/cgi-bin/koha/admin/authorised_values.pl?op=add_form&id=[% loo.id \| uri %]" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-pencil"></i> Edit</a>
364	<a class="delete btn btn-default btn-xs" href="/cgi-bin/koha/admin/authorised_values.pl?op=delete&searchfield=[% searchfield \| uri %]&id=[% loo.id \| uri %]"><i class="fa fa-trash"></i> Delete</a></td>	373	<a class="delete btn btn-default btn-xs" href="/cgi-bin/koha/admin/authorised_values.pl?op=delete&searchfield=[% searchfield \| uri %]&id=[% loo.id \| uri %]" id="lientype"><i class="fa fa-trash"></i> Delete</a></td>
365	</tr>	374	</tr>
366	[% END # /FOREACH loop %]	375	[% END # /FOREACH loop %]
367	</tbody>	376	</tbody>
Lines 372-384 Link Here
372	<form action="/cgi-bin/koha/admin/authorised_values.pl" method="get">	381	<form action="/cgi-bin/koha/admin/authorised_values.pl" method="get">
373	<input type="hidden" name="op" value="add_form" />	382	<input type="hidden" name="op" value="add_form" />
374	<input type="hidden" name="category" value="[% category.category_name \| html %]" />	383	<input type="hidden" name="category" value="[% category.category_name \| html %]" />
375	<button type="submit"><i class="fa fa-plus"></i> Add a new authorized value</button>	384	<button type="submit" id="lientype"><i class="fa fa-plus"></i> Add a new authorized value</button>
376	</form>	385	</form>
377	[% UNLESS category.is_system %]	386	[% UNLESS category.is_system %]
378	<form id="delete_category" action="/cgi-bin/koha/admin/authorised_values.pl" method="post">	387	<form id="delete_category" action="/cgi-bin/koha/admin/authorised_values.pl" method="post">
379	<input type="hidden" name="op" value="delete_category" />	388	<input type="hidden" name="op" value="delete_category" />
380	<input type="hidden" name="category_name" value="[% category.category_name \| html %]" />	389	<input type="hidden" name="category_name" value="[% category.category_name \| html %]" />
381	<button type="submit"><i class="fa fa-plus"></i> Delete category '[% category.category_name \| html %]' </button>	390	<button type="submit" id="lientype"><i class="fa fa-plus"></i> Delete category '[% category.category_name \| html %]' </button>
382	</form>	391	</form>
383	[% END %]	392	[% END %]
384	</div>	393	</div>
Lines 408-414 Link Here
408	[% END # /FOR c %]	417	[% END # /FOR c %]
409	</tbody>	418	</tbody>
410	</table> <!-- /#categoriest -->	419	</table> <!-- /#categoriest -->
411		420	</div>
412	[% END # /IF ( searchfield )%]	421	[% END # /IF ( searchfield )%]
413		422
414	[% END # /IF op == 'list' %]	423	[% END # /IF op == 'list' %]

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt (-11 / +20 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'prefs-admin-search.inc' %]
		6	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
5	<title>	8	<title>
6	[% IF op == 'add_form' %]	9	[% IF op == 'add_form' %]
Lines 16-23 Authority types &rsaquo; Administration &rsaquo; Koha Link Here
16	</head>	19	</head>
17		20
18	<body id="admin_authtypes" class="admin">	21	<body id="admin_authtypes" class="admin">
19	[% INCLUDE 'header.inc' %]	22	[% INCLUDE 'header.inc' form=formulaire %]
20	[% INCLUDE 'prefs-admin-search.inc' %]
21		23
22	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	24	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
23	<ol>	25	<ol>
Lines 58-63 Authority types &rsaquo; Administration &rsaquo; Koha Link Here
58	</li>	60	</li>
59	[% END %]	61	[% END %]
60	</ol>	62	</ol>
		63	<ol>
		64	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		65	</ol>
		66	<ol>
		67	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		68	</ol>
61	</nav>	69	</nav>
62		70
63	<div class="main container-fluid">	71	<div class="main container-fluid">
Lines 91-105 Authority types &rsaquo; Administration &rsaquo; Koha Link Here
91	[% IF op == 'add_form' %]	99	[% IF op == 'add_form' %]
92	<form action="/cgi-bin/koha/admin/authtypes.pl" name="Aform" method="post" class="validated">	100	<form action="/cgi-bin/koha/admin/authtypes.pl" name="Aform" method="post" class="validated">
93	<fieldset class="rows">	101	<fieldset class="rows">
94	<legend>	102	<h3>
95	<h1>
96	[% IF authority_type.authtypecode.defined %]	103	[% IF authority_type.authtypecode.defined %]
97	Modify authority type	104	Modify authority type
98	[% ELSE %]	105	[% ELSE %]
99	New authority type	106	New authority type
100	[% END %]	107	[% END %]
101	</h1>	108	</h3>
102	</legend>
103	<ol>	109	<ol>
104	<li>	110	<li>
105	[% IF authority_type.authtypecode.defined %]	111	[% IF authority_type.authtypecode.defined %]
Lines 133-143 Authority types &rsaquo; Administration &rsaquo; Koha Link Here
133	[% END %]	139	[% END %]
134	</li>	140	</li>
135	</ol>	141	</ol>
136	</fieldset>
137	<fieldset class="action">	142	<fieldset class="action">
138	<input type="submit" value="Submit" />	143	<input type="submit" class="principal" value="Submit" />
139	<a class="cancel" href="/cgi-bin/koha/admin/authtypes.pl">Cancel</a>	144	<a class="cancel" href="/cgi-bin/koha/admin/authtypes.pl">Cancel</a>
140	</fieldset>	145	</fieldset>
		146	</fieldset>
141	</form>	147	</form>
142	[% END %]	148	[% END %]
143		149
Lines 163-173 Authority types &rsaquo; Administration &rsaquo; Koha Link Here
163		169
164	[% IF op == 'list' %]	170	[% IF op == 'list' %]
165	<div id="toolbar" class="btn-toolbar">	171	<div id="toolbar" class="btn-toolbar">
166	<a id="authtype" class="btn btn-default" href="/cgi-bin/koha/admin/authtypes.pl?op=add_form"><i class="fa fa-plus"></i> New authority type</a>	172	<div>
167	</div>	173	<a id="authtype" class="pat" href="/cgi-bin/koha/admin/authtypes.pl?op=add_form"><i class="fa fa-plus"></i> New authority type</a>
		174	</div></div>
168		175
169	<h1>Authority types</h1>	176	<h2>Authority types</h2>
170	<p>Define authority types, then authority MARC structure in the same way you define itemtypes and bibliographic MARC tag structure. Authority values are managed through plugins</p>	177	<p>Define authority types, then authority MARC structure in the same way you define itemtypes and bibliographic MARC tag structure. Authority values are managed through plugins</p>
		178	<div id="searchresults">
171	<table id="authtypes">	179	<table id="authtypes">
172	<thead>	180	<thead>
173	<tr>	181	<tr>
Lines 254-259 Authority types &rsaquo; Administration &rsaquo; Koha Link Here
254	[% END %]	262	[% END %]
255	<tbody>	263	<tbody>
256	</table>	264	</table>
		265	</div>
257	[% END %]	266	[% END %]
258		267
259	</main>	268	</main>

Lines 3-8 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt (-5 / +15 lines)
3	[% USE Asset %]	3	[% USE Asset %]
4	[% USE KohaDates %]	4	[% USE KohaDates %]
5	[% SET footerjs = 1 %]	5	[% SET footerjs = 1 %]
		6	[% formulaire = BLOCK %]
		7	[% INCLUDE 'prefs-admin-search.inc' %]
		8	[% END %]
6	[% BLOCK show_job_status %]	9	[% BLOCK show_job_status %]
7	[% SWITCH job.status %]	10	[% SWITCH job.status %]
8	[% CASE "new" %]	11	[% CASE "new" %]
Lines 58-65 Link Here
58	</head>	61	</head>
59		62
60	<body id="admin_background_jobs" class="admin">	63	<body id="admin_background_jobs" class="admin">
61	[% INCLUDE 'header.inc' %]	64	[% INCLUDE 'header.inc' form=formulaire %]
62	[% INCLUDE 'prefs-admin-search.inc' %]
63		65
64	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	66	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
65	<ol>	67	<ol>
Lines 89-94 Link Here
89	</li>	91	</li>
90	[% END %]	92	[% END %]
91	</ol>	93	</ol>
		94	<ol>
		95	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		96	</ol>
		97	<ol>
		98	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		99	</ol>
92	</nav>	100	</nav>
93		101
94	<div class="main container-fluid">	102	<div class="main container-fluid">
Lines 108-114 Link Here
108	[% END %]	116	[% END %]
109		117
110	[% IF op == 'view' %]	118	[% IF op == 'view' %]
111	<h1>Details of job #[% job.id \| html %]</h1>	119	<h2>Details of job #[% job.id \| html %]</h2>
112		120
113	[% PROCESS "background_jobs/${job.type}.inc" %]	121	[% PROCESS "background_jobs/${job.type}.inc" %]
114		122
Lines 157-162 Link Here
157	<h1>Background jobs</h1>	165	<h1>Background jobs</h1>
158		166
159	[% IF jobs.count %]	167	[% IF jobs.count %]
		168	<div id="searchresults">
160	<table id="table_background_jobs">	169	<table id="table_background_jobs">
161	<thead>	170	<thead>
162	<tr>	171	<tr>
Lines 185-199 Link Here
185	<td>[% job.started_on\| $KohaDates with_hours = 1 %]</td>	194	<td>[% job.started_on\| $KohaDates with_hours = 1 %]</td>
186	<td>[% job.ended_on\| $KohaDates with_hours = 1 %]</td>	195	<td>[% job.ended_on\| $KohaDates with_hours = 1 %]</td>
187	<td class="actions">	196	<td class="actions">
188	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/background_jobs.pl?op=view&id=[% job.id \| html %]"><i class="fa fa-eye"></i> View</a>	197	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/background_jobs.pl?op=view&id=[% job.id \| html %]" id="lientype"><i class="fa fa-eye"></i> View</a>
189	[% IF job.status == 'new' \|\| job.status == 'started' %]	198	[% IF job.status == 'new' \|\| job.status == 'started' %]
190	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/background_jobs.pl?op=cancel&id=[% job.id \| html %]"><i class="fa fa-trash"></i> Cancel</a>	199	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/background_jobs.pl?op=cancel&id=[% job.id \| html %]" id="lientype"><i class="fa fa-trash"></i> Cancel</a>
191	[% END %]	200	[% END %]
192	</td>	201	</td>
193	</tr>	202	</tr>
194	[% END %]	203	[% END %]
195	</tbody>	204	</tbody>
196	</table>	205	</table>
		206	</div>
197	[% ELSE %]	207	[% ELSE %]
198	<div class="dialog message">	208	<div class="dialog message">
199	There are no background jobs yet.	209	There are no background jobs yet.

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt (-10 / +21 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'prefs-admin-search.inc' %]
		6	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
5	<title>	8	<title>
6	[% IF op == 'add_form' %]	9	[% IF op == 'add_form' %]
Lines 16-23 MARC frameworks &rsaquo; Administration &rsaquo; Koha Link Here
16	</head>	19	</head>
17		20
18	<body id="admin_biblio_framework" class="admin">	21	<body id="admin_biblio_framework" class="admin">
19	[% INCLUDE 'header.inc' %]	22	[% INCLUDE 'header.inc' form=formulaire %]
20	[% INCLUDE 'prefs-admin-search.inc' %]
21		23
22	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	24	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
23	<ol>	25	<ol>
Lines 64-69 MARC frameworks &rsaquo; Administration &rsaquo; Koha Link Here
64	</li>	66	</li>
65	[% END %]	67	[% END %]
66	</ol>	68	</ol>
		69	<ol>
		70	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		71	</ol>
		72	<ol>
		73	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		74	</ol>
67	</nav>	75	</nav>
68		76
69	<div class="main container-fluid">	77	<div class="main container-fluid">
Lines 98-109 MARC frameworks &rsaquo; Administration &rsaquo; Koha Link Here
98		106
99	[% IF op == 'list'%]	107	[% IF op == 'list'%]
100	<div id="toolbar" class="btn-toolbar">	108	<div id="toolbar" class="btn-toolbar">
101	<a class="btn btn-default" id="newframework" href="/cgi-bin/koha/admin/biblio_framework.pl?op=add_form"><i class="fa fa-plus"></i> New framework</a>	109	<div>
102	</div>	110	<a class="pat" id="newframework" href="/cgi-bin/koha/admin/biblio_framework.pl?op=add_form"><i class="fa fa-plus"></i> New framework</a>
		111	</div></div>
103	[% END %]	112	[% END %]
104		113
105	[% IF op == 'add_form' %]	114	[% IF op == 'add_form' %]
106	<h1>[% IF framework %]Modify framework text[% ELSE %]Add framework[% END %]</h1>	115	<h2>[% IF framework %]Modify framework text[% ELSE %]Add framework[% END %]</h2>
107	<form action="/cgi-bin/koha/admin/biblio_framework.pl" name="Aform" method="post" class="validated">	116	<form action="/cgi-bin/koha/admin/biblio_framework.pl" name="Aform" method="post" class="validated">
108	<input type="hidden" name="op" value="add_validate" />	117	<input type="hidden" name="op" value="add_validate" />
109	<fieldset class="rows">	118	<fieldset class="rows">
Lines 127-135 MARC frameworks &rsaquo; Administration &rsaquo; Koha Link Here
127	<span class="required">Required</span>	136	<span class="required">Required</span>
128	</li>	137	</li>
129	</ol>	138	</ol>
130	</fieldset>
131	<fieldset class="action">	139	<fieldset class="action">
132	<input type="submit" value="Submit" class="submit" />	140	<input type="submit" value="Submit" class="principal" />
		141	</fieldset>
133	</fieldset>	142	</fieldset>
134	</form>	143	</form>
135	[% END %]	144	[% END %]
Lines 158-165 MARC frameworks &rsaquo; Administration &rsaquo; Koha Link Here
158	[% END %]	167	[% END %]
159		168
160	[% IF op == 'list' %]	169	[% IF op == 'list' %]
161	<h1>MARC frameworks</h1>	170	<h2>MARC frameworks</h2>
162		171
		172	<div id="searchresults">
163	<table id="table_biblio_frameworks">	173	<table id="table_biblio_frameworks">
164	<thead>	174	<thead>
165	<tr>	175	<tr>
Lines 174-180 MARC frameworks &rsaquo; Administration &rsaquo; Koha Link Here
174	<td>Default framework</td>	184	<td>Default framework</td>
175	<td>	185	<td>
176	<div class="btn-group dropup">	186	<div class="btn-group dropup">
177	<a class="btn btn-default btn-xs dropdown-toggle" id="frameworkactions[% loo.frameworkcode \| html %]" role="button" data-toggle="dropdown" href="#">	187	<a class="btn btn-default btn-xs dropdown-toggle" id="frameworkactions[% loo.frameworkcode \| html %]" role="button" data-toggle="dropdown" href="#" id=""lientype">
178	Actions <b class="caret"></b>	188	Actions <b class="caret"></b>
179	</a>	189	</a>
180	<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="frameworkactions[% loo.frameworkcode \| html %]">	190	<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="frameworkactions[% loo.frameworkcode \| html %]">
Lines 242-248 MARC frameworks &rsaquo; Administration &rsaquo; Koha Link Here
242	<td>[% loo.frameworktext \| html %]</td>	252	<td>[% loo.frameworktext \| html %]</td>
243	<td>	253	<td>
244	<div class="btn-group dropup">	254	<div class="btn-group dropup">
245	<a class="btn btn-default btn-xs dropdown-toggle" id="frameworkactions[% loo.frameworkcode \| html %]" role="button" data-toggle="dropdown" href="#">	255	<a class="btn btn-default btn-xs dropdown-toggle" id="lientype" role="button" data-toggle="dropdown" href="#">
246	Actions <b class="caret"></b>	256	Actions <b class="caret"></b>
247	</a>	257	</a>
248	<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="frameworkactions[% loo.frameworkcode \| html %]">	258	<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="frameworkactions[% loo.frameworkcode \| html %]">
Lines 308-313 MARC frameworks &rsaquo; Administration &rsaquo; Koha Link Here
308		318
309	[% END %]	319	[% END %]
310	</table>	320	</table>
		321	</div>
311		322
312	[% END %]	323	[% END %]
313		324

Lines 2-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt (-5 / +16 lines)
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE Branches %]	3	[% USE Branches %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
		5	[% SET footerjs = 1 %]
		6	[% formulaire = BLOCK %]
		7	[% INCLUDE 'prefs-admin-search.inc' %]
		8	[% END %]
5	[% INCLUDE 'doc-head-open.inc' %]	9	[% INCLUDE 'doc-head-open.inc' %]
6	<title>Library checkin and transfer policy &rsaquo; Administration &rsaquo; Koha</title>	10	<title>Library checkin and transfer policy &rsaquo; Administration &rsaquo; Koha</title>
7	[% INCLUDE 'doc-head-close.inc' %]	11	[% INCLUDE 'doc-head-close.inc' %]
Lines 9-16 Link Here
9	</head>	13	</head>
10		14
11	<body id="admin_branch_transfer_limits" class="admin">	15	<body id="admin_branch_transfer_limits" class="admin">
12	[% INCLUDE 'header.inc' %]	16	[% INCLUDE 'header.inc' form=formulaire %]
13	[% INCLUDE 'prefs-admin-search.inc' %]
14		17
15	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	18	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
16	<ol>	19	<ol>
Lines 26-31 Link Here
26	</a>	29	</a>
27	</li>	30	</li>
28	</ol>	31	</ol>
		32	<ol>
		33	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		34	</ol>
		35	<ol>
		36	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		37	</ol>
29	</nav>	38	</nav>
30		39
31	<div class="main container-fluid">	40	<div class="main container-fluid">
Lines 33-39 Link Here
33	<div class="col-sm-10 col-sm-push-2">	42	<div class="col-sm-10 col-sm-push-2">
34	<main>	43	<main>
35		44
36	<h1>Library [% branchcode \| html %] - [% Branches.GetName( branchcode ) \| html %] Checkin and transfer policy</h1>	45	<h2>Library [% branchcode \| html %] - [% Branches.GetName( branchcode ) \| html %] Checkin and transfer policy</h2>
37	<form method="get" action="/cgi-bin/koha/admin/branch_transfer_limits.pl" id="selectlibrary">	46	<form method="get" action="/cgi-bin/koha/admin/branch_transfer_limits.pl" id="selectlibrary">
38	<label for="branchselect">Select a library :</label>	47	<label for="branchselect">Select a library :</label>
39	<select name="branchcode" id="branchselect">	48	<select name="branchcode" id="branchselect">
Lines 42-54 Link Here
42	</form>	51	</form>
43		52
44	<p class="help">Check the boxes for the libraries you allow your items to be transferred to.</p>	53	<p class="help">Check the boxes for the libraries you allow your items to be transferred to.</p>
		54	<div id="searchresults">
45	<fieldset>	55	<fieldset>
46	[% IF ( limitType == 'ccode' ) %]<strong>For all collection codes: </strong>[% ELSE %]<strong>For all item types: </strong>[% END %]	56	[% IF ( limitType == 'ccode' ) %]<strong>For all collection codes: </strong>[% ELSE %]<strong>For all item types: </strong>[% END %]
47	<a id="CheckAll" href="#"><i class="fa fa-check"></i> Select all</a>	57	<a id="CheckAll" href="#"><i class="fa fa-check"></i> Select all</a>
48	\|	58	\|
49	<a id="UncheckAll" href="#"><i class="fa fa-remove"></i> Clear all</a>	59	<a id="UncheckAll" href="#"><i class="fa fa-remove"></i> Clear all</a>
50	\|	60	\|
51	<a href="/cgi-bin/koha/admin/transfer_limits.pl">Switch to advanced editor</a>	61	<a href="/cgi-bin/koha/admin/transfer_limits.pl" id="lientype">Switch to advanced editor</a>
52	</fieldset>	62	</fieldset>
53		63
54		64
Lines 99-108 Link Here
99	<fieldset class="action">	109	<fieldset class="action">
100	<input type="hidden" name="updateLimits" value="1" />	110	<input type="hidden" name="updateLimits" value="1" />
101	<input type="hidden" name="branchcode" value="[% branchcode \| html %]" />	111	<input type="hidden" name="branchcode" value="[% branchcode \| html %]" />
102	<input type="submit" value="Save" />	112	<input type="submit" class="principal" value="Save" />
103	<a class="cancel" href="/cgi-bin/koha/admin/admin-home.pl">Cancel</a>	113	<a class="cancel" href="/cgi-bin/koha/admin/admin-home.pl">Cancel</a>
104	</fieldset>	114	</fieldset>
105	</form>	115	</form>
		116	</div>
106	</div>	117	</div>
107		118
108	</main>	119	</main>

Lines 2-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt (-8 / +19 lines)
2	[% USE raw %]	2	[% USE raw %]
3	[% USE Asset %]	3	[% USE Asset %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE 'prefs-admin-search.inc' %]
		7	[% END %]
5	[% USE TablesSettings %]	8	[% USE TablesSettings %]
6	[% INCLUDE 'doc-head-open.inc' %]	9	[% INCLUDE 'doc-head-open.inc' %]
7	<title>	10	<title>
Lines 18-25 Libraries &rsaquo; Administration &rsaquo; Koha Link Here
18	</head>	21	</head>
19		22
20	<body id="admin_branches" class="admin">	23	<body id="admin_branches" class="admin">
21	[% INCLUDE 'header.inc' %]	24	[% INCLUDE 'header.inc' form=formulaire %]
22	[% INCLUDE 'prefs-admin-search.inc' %]
23		25
24	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	26	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
25	<ol>	27	<ol>
Lines 66-71 Libraries &rsaquo; Administration &rsaquo; Koha Link Here
66	</li>	68	</li>
67	[% END %]	69	[% END %]
68	</ol>	70	</ol>
		71	<ol>
		72	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		73	</ol>
		74	<ol>
		75	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		76	</ol>
69	</nav>	77	</nav>
70		78
71	<div class="main container-fluid">	79	<div class="main container-fluid">
Lines 119-132 Libraries &rsaquo; Administration &rsaquo; Koha Link Here
119		127
120	[% IF op == 'list' %]	128	[% IF op == 'list' %]
121	<div id="toolbar" class="btn-toolbar">	129	<div id="toolbar" class="btn-toolbar">
122	<a class="btn btn-default" id="newbranch" href="/cgi-bin/koha/admin/branches.pl?op=add_form"><i class="fa fa-plus"></i> New library</a>	130	<div>
123	</div>	131	<a class="pat" id="newbranch" href="/cgi-bin/koha/admin/branches.pl?op=add_form"><i class="fa fa-plus"></i> New library</a>
		132	</div></div>
124	[% END %]	133	[% END %]
125		134
		135	<div id="searchresults">
126	[% IF op == 'add_form' %]	136	[% IF op == 'add_form' %]
127	<h1>[% IF library %]Modify library[% ELSE %]New library[% END %]</h1>	137	<h1>[% IF library %]Modify library[% ELSE %]New library[% END %]</h1>
128	<form action="/cgi-bin/koha/admin/branches.pl" id="Aform" name="Aform" class="validated" method="post">	138	<form action="/cgi-bin/koha/admin/branches.pl" id="Aform" name="Aform" class="validated" method="post">
129	<fieldset class="rows">	139	<fieldset>
130	<input type="hidden" name="op" value="add_validate" />	140	<input type="hidden" name="op" value="add_validate" />
131	[% IF library %]	141	[% IF library %]
132	<input type="hidden" name="is_a_modif" value="1" />	142	<input type="hidden" name="is_a_modif" value="1" />
Lines 155-161 Libraries &rsaquo; Administration &rsaquo; Koha Link Here
155	</ol>	165	</ol>
156	</fieldset>	166	</fieldset>
157	[% IF categories %]	167	[% IF categories %]
158	<fieldset class="rows"><legend>Group(s):</legend>	168	<fieldset><legend>Group(s):</legend>
159	<ol>	169	<ol>
160	[% FOREACH category IN categories %]	170	[% FOREACH category IN categories %]
161	<li>	171	<li>
Lines 171-177 Libraries &rsaquo; Administration &rsaquo; Koha Link Here
171	</ol>	181	</ol>
172	</fieldset>	182	</fieldset>
173	[% END %]	183	[% END %]
174	<fieldset class="rows">	184	<fieldset>
175	<ol>	185	<ol>
176	<li><label for="branchaddress1">Address line 1: </label><input type="text" name="branchaddress1" id="branchaddress1" size="60" value="[% library.branchaddress1 \| html %]" /></li>	186	<li><label for="branchaddress1">Address line 1: </label><input type="text" name="branchaddress1" id="branchaddress1" size="60" value="[% library.branchaddress1 \| html %]" /></li>
177	<li><label for="branchaddress2">Address line 2: </label><input type="text" name="branchaddress2" id="branchaddress2" size="60" value="[% library.branchaddress2 \| html %]" /></li>	187	<li><label for="branchaddress2">Address line 2: </label><input type="text" name="branchaddress2" id="branchaddress2" size="60" value="[% library.branchaddress2 \| html %]" /></li>
Lines 280-286 Libraries &rsaquo; Administration &rsaquo; Koha Link Here
280	</ol>	290	</ol>
281	</fieldset>	291	</fieldset>
282	<fieldset class="action">	292	<fieldset class="action">
283	<input type="submit" value="Submit" />	293	<input type="submit" class="principal" value="Submit" />
284	<a class="cancel" href="/cgi-bin/koha/admin/branches.pl">Cancel</a>	294	<a class="cancel" href="/cgi-bin/koha/admin/branches.pl">Cancel</a>
285	</fieldset>	295	</fieldset>
286	</form>	296	</form>
Lines 323-328 Libraries &rsaquo; Administration &rsaquo; Koha Link Here
323	<div class="dialog message">There are no libraries defined. <a href="/cgi-bin/koha/admin/branches.pl?op=add_form">Start defining libraries</a>.</div>	333	<div class="dialog message">There are no libraries defined. <a href="/cgi-bin/koha/admin/branches.pl?op=add_form">Start defining libraries</a>.</div>
324	[% END %]	334	[% END %]
325	[% END %]	335	[% END %]
		336	</div>
326		337
327	</main>	338	</main>
328	</div> <!-- /.col-sm-10.col-sm-push-2 -->	339	</div> <!-- /.col-sm-10.col-sm-push-2 -->

Lines 3-8 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt (-2 / +10 lines)
3	[% USE Branches %]	3	[% USE Branches %]
4	[% USE Price %]	4	[% USE Price %]
5	[% SET footerjs = 1 %]	5	[% SET footerjs = 1 %]
		6	[% formulaire = BLOCK %]
		7	[% INCLUDE 'prefs-admin-search.inc' %]
		8	[% END %]
6	[% INCLUDE 'doc-head-open.inc' %]	9	[% INCLUDE 'doc-head-open.inc' %]
7	<title>	10	<title>
8	[% IF op == 'add_form' %]	11	[% IF op == 'add_form' %]
Lines 18-25 Cash registers &rsaquo; Administration &rsaquo; Koha Link Here
18	</head>	21	</head>
19		22
20	<body id="admin_cash_registers" class="admin">	23	<body id="admin_cash_registers" class="admin">
21	[% INCLUDE 'header.inc' %]	24	[% INCLUDE 'header.inc' form=formulaire %]
22	[% INCLUDE 'prefs-admin-search.inc' %]
23		25
24	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	26	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
25	<ol>	27	<ol>
Lines 65-70 Cash registers &rsaquo; Administration &rsaquo; Koha Link Here
65	</li>	67	</li>
66	[% END %]	68	[% END %]
67	</ol>	69	</ol>
		70	<ol>
		71	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		72	</ol>
		73	<ol>
		74	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		75	</ol>
68	</nav>	76	</nav>
69		77
70	<div class="main container-fluid">	78	<div class="main container-fluid">

Lines 6-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt (-13 / +23 lines)
6	[% USE Price %]	6	[% USE Price %]
7	[% USE TablesSettings %]	7	[% USE TablesSettings %]
8	[% SET footerjs = 1 %]	8	[% SET footerjs = 1 %]
		9	[% formulaire = BLOCK %]
		10	[% INCLUDE 'patrons-admin-search.inc' %]
		11	[% END %]
9	[% INCLUDE 'doc-head-open.inc' %]	12	[% INCLUDE 'doc-head-open.inc' %]
10	<title>[% IF op == 'add_form' %][% IF ( categorycode ) %]Modify category '[% categorycode \| html %]'[% ELSE %]New category[% END %][% END %]	13	<title>[% IF op == 'add_form' %][% IF ( categorycode ) %]Modify category '[% categorycode \| html %]'[% ELSE %]New category[% END %][% END %]
11	[% IF op == 'delete_confirm' %][% IF ( patrons_in_category > 0 ) %]Cannot delete: category [% categorycode \| html %] in use[% ELSE %]Confirm deletion of category '[% categorycode \| html %]'[% END %][% END %] &rsaquo; Patron categories &rsaquo; Administration &rsaquo; Koha	14	[% IF op == 'delete_confirm' %][% IF ( patrons_in_category > 0 ) %]Cannot delete: category [% categorycode \| html %] in use[% ELSE %]Confirm deletion of category '[% categorycode \| html %]'[% END %][% END %] &rsaquo; Patron categories &rsaquo; Administration &rsaquo; Koha
Lines 15-22 Link Here
15	</head>	18	</head>
16		19
17	<body id="admin_categorie" class="admin">	20	<body id="admin_categorie" class="admin">
18	[% INCLUDE 'header.inc' %]	21	[% INCLUDE 'header.inc' form=formulaire %]
19	[% INCLUDE 'patrons-admin-search.inc' %]
20		22
21	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	23	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
22	<ol>	24	<ol>
Lines 84-89 Link Here
84	</li>	86	</li>
85	[% END %]	87	[% END %]
86	</ol>	88	</ol>
		89	<ol>
		90	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		91	</ol>
		92	<ol>
		93	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		94	</ol>
87	</nav>	95	</nav>
88		96
89	<div class="main container-fluid">	97	<div class="main container-fluid">
Lines 119-127 Link Here
119	<input type="hidden" name="op" value="add_validate" />	127	<input type="hidden" name="op" value="add_validate" />
120	<input type="hidden" name="checked" value="0" />	128	<input type="hidden" name="checked" value="0" />
121	[% IF category %]	129	[% IF category %]
122	<h1>Modify category [% categorycode \| html %]</h1>	130	<h2>Modify category [% categorycode \| html %]</h2>
123	[% ELSE %]	131	[% ELSE %]
124	<h1>New category</h1>	132	<h2>New category</h2>
125	[% END %]	133	[% END %]
126	<fieldset class="rows">	134	<fieldset class="rows">
127	<ol>	135	<ol>
Lines 143-151 Link Here
143	<span class="required">Required</span>	151	<span class="required">Required</span>
144	</li>	152	</li>
145	<li>	153	<li>
146	<span class="label">Enrollment period: </span>
147	<fieldset>	154	<fieldset>
148	<legend>Choose one</legend>	155	<legend>Enrollment period</legend>
149	<ol>	156	<ol>
150	<li>	157	<li>
151	<label for="enrolmentperiod">In months: </label>	158	<label for="enrolmentperiod">In months: </label>
Lines 410-416 Link Here
410	<div class="hint">If <i>Yes</i>, holds placed by patrons of this category will not be given priority</div>	417	<div class="hint">If <i>Yes</i>, holds placed by patrons of this category will not be given priority</div>
411	</li>	418	</li>
412	</ol>	419	</ol>
413	</fieldset>
414		420
415	[% IF ( EnhancedMessagingPreferences ) %]	421	[% IF ( EnhancedMessagingPreferences ) %]
416	<fieldset class="rows">	422	<fieldset class="rows">
Lines 419-427 Link Here
419	</fieldset>	425	</fieldset>
420	[% END %]	426	[% END %]
421	<fieldset class="action">	427	<fieldset class="action">
422	<input type="submit" value="Save" />	428	<input type="submit" class="principal" value="Save" />
423	<a href="/cgi-bin/koha/admin/categories.pl" class="cancel">Cancel</a>	429	<a href="/cgi-bin/koha/admin/categories.pl" class="cancel">Cancel</a>
424	</fieldset>	430	</fieldset>
		431	</fieldset>
425	</form>	432	</form>
426	[% END %]	433	[% END %]
427		434
Lines 509-518 Link Here
509	[% IF op == 'list' %]	516	[% IF op == 'list' %]
510		517
511	<div id="toolbar" class="btn-toolbar">	518	<div id="toolbar" class="btn-toolbar">
512	<a class="btn btn-default" id="newcategory" href="/cgi-bin/koha/admin/categories.pl?op=add_form"><i class="fa fa-plus"></i> New category</a>	519	<div>
513	</div>	520	<a class="pat" id="newcategory" href="/cgi-bin/koha/admin/categories.pl?op=add_form"><i class="fa fa-plus"></i> New category</a>
		521	</div></div>
514		522
515	<h1>Patron categories</h1>	523	<h2>Patron categories</h2>
		524	<div id="searchresults">
516	[% IF searchfield %]	525	[% IF searchfield %]
517	You searched for [% searchfield \| html %]</span>	526	You searched for [% searchfield \| html %]</span>
518	[% END %]	527	[% END %]
Lines 673-680 Link Here
673	[% END %]	682	[% END %]
674	</td>	683	</td>
675	<td class="actions">	684	<td class="actions">
676	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/categories.pl?op=add_form&categorycode=[% category.categorycode \|uri %]"><i class="fa fa-pencil"></i> Edit</a>	685	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/categories.pl?op=add_form&categorycode=[% category.categorycode \|uri %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a>
677	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/categories.pl?op=delete_confirm&categorycode=[% category.categorycode \|uri %]"><i class="fa fa-trash"></i> Delete</a>	686	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/categories.pl?op=delete_confirm&categorycode=[% category.categorycode \|uri %]" id="lientype"><i class="fa fa-trash"></i> Delete</a>
678	</td>	687	</td>
679	</tr>	688	</tr>
680	[% END %]	689	[% END %]
Lines 683-688 Link Here
683	[% ELSE %]	692	[% ELSE %]
684	<div class="dialog alert">No categories have been defined. <a href="/cgi-bin/koha/admin/categories.pl?op=add_form">Create a new category</a>.</div>	693	<div class="dialog alert">No categories have been defined. <a href="/cgi-bin/koha/admin/categories.pl?op=add_form">Create a new category</a>.</div>
685	[% END %]	694	[% END %]
		695	</div>
686	[% END %]	696	[% END %]
687		697
688	</main>	698	</main>

Lines 1-14 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt (-3 / +11 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'prefs-admin-search.inc' %]
		6	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
5	<title>MARC check	8	<title>MARC check
6	[% IF ( total ) %] :[% total \| html %] errors found[% ELSE %] : Configuration OK![% END %] &rsaquo; Administration &rsaquo; Koha</title>	9	[% IF ( total ) %] :[% total \| html %] errors found[% ELSE %] : Configuration OK![% END %] &rsaquo; Administration &rsaquo; Koha</title>
7	[% INCLUDE 'doc-head-close.inc' %]	10	[% INCLUDE 'doc-head-close.inc' %]
8	</head>	11	</head>
9	<body id="admin_checkmarc" class="admin">	12	<body id="admin_checkmarc" class="admin">
10	[% INCLUDE 'header.inc' %]	13	[% INCLUDE 'header.inc' form=formulaire %]
11	[% INCLUDE 'prefs-admin-search.inc' %]
12		14
13	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	15	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
14	<ol>	16	<ol>
Lines 29-34 Link Here
29	</a>	31	</a>
30	</li>	32	</li>
31	</ol>	33	</ol>
		34	<ol>
		35	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		36	</ol>
		37	<ol>
		38	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		39	</ol>
32	</nav>	40	</nav>
33		41
34	<div class="main container-fluid">	42	<div class="main container-fluid">
Lines 36-42 Link Here
36	<div class="col-sm-10 col-sm-push-2">	44	<div class="col-sm-10 col-sm-push-2">
37	<main>	45	<main>
38		46
39	<h1>MARC bibliographic framework test</h1>	47	<h2>MARC bibliographic framework test</h2>
40	<table>	48	<table>
41	<tr>	49	<tr>
42	<th>Test</th>	50	<th>Test</th>

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt (-10 / +21 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'cities-admin-search.inc' %]
		6	[% END %]
4	[% USE TablesSettings %]	7	[% USE TablesSettings %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	<title>	9	<title>
Lines 19-26 Link Here
19	</head>	22	</head>
20		23
21	<body id="admin_cities" class="admin">	24	<body id="admin_cities" class="admin">
22	[% INCLUDE 'header.inc' %]	25	[% INCLUDE 'header.inc' form=formulaire %]
23	[% INCLUDE 'cities-admin-search.inc' %]
24		26
25	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	27	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
26	<ol>	28	<ol>
Lines 63-68 Link Here
63	</li>	65	</li>
64	[% END %]	66	[% END %]
65	</ol>	67	</ol>
		68	<ol>
		69	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		70	</ol>
		71	<ol>
		72	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		73	</ol>
66	</nav>	74	</nav>
67		75
68	<div class="main container-fluid">	76	<div class="main container-fluid">
Lines 95-103 Link Here
95		103
96	[% IF op == 'add_form' %]	104	[% IF op == 'add_form' %]
97	[% IF city %]	105	[% IF city %]
98	<h1>Modify a city</h1>	106	<h2>Modify a city</h2>
99	[% ELSE %]	107	[% ELSE %]
100	<h1>New city</h1>	108	<h2>New city</h2>
101	[% END %]	109	[% END %]
102		110
103	<form action="/cgi-bin/koha/admin/cities.pl" name="Aform" method="post" class="validated">	111	<form action="/cgi-bin/koha/admin/cities.pl" name="Aform" method="post" class="validated">
Lines 126-137 Link Here
126	<input type="text" name="city_country" id="city_country" size="80" maxlength="100" value="[% city.city_country \| html %]" />	134	<input type="text" name="city_country" id="city_country" size="80" maxlength="100" value="[% city.city_country \| html %]" />
127	</li>	135	</li>
128	</ol>	136	</ol>
129	</fieldset>
130
131	<fieldset class="action">	137	<fieldset class="action">
132	<input type="submit" value="Submit" />	138	<input type="submit" class="principal" value="Submit" />
133	<a class="cancel" href="/cgi-bin/koha/admin/cities.pl">Cancel</a>	139	<a class="cancel" href="/cgi-bin/koha/admin/cities.pl">Cancel</a>
134	</fieldset>	140	</fieldset>
		141	</fieldset>
		142
135	</form>	143	</form>
136	[% END %]	144	[% END %]
137		145
Lines 169-176 Link Here
169	[% IF op == 'list' %]	177	[% IF op == 'list' %]
170		178
171	<div id="toolbar" class="btn-toolbar">	179	<div id="toolbar" class="btn-toolbar">
172	<a class="btn btn-default" id="newcity" href="/cgi-bin/koha/admin/cities.pl?op=add_form"><i class="fa fa-plus"></i> New city</a>	180	<div>
173	</div>	181	<a class="pat" id="newcity" href="/cgi-bin/koha/admin/cities.pl?op=add_form"><i class="fa fa-plus"></i> New city</a>
		182	</div></div>
174		183
175	<h1>Cities</h1>	184	<h1>Cities</h1>
176	[% IF city_name_filter %]	185	[% IF city_name_filter %]
Lines 178-183 Link Here
178	[% END %]	187	[% END %]
179		188
180	[% IF cities_count > 0 %]	189	[% IF cities_count > 0 %]
		190	<div id="searchresults">
181	<div class="table_cities_table_controls"></div>	191	<div class="table_cities_table_controls"></div>
182	<table id="table_cities">	192	<table id="table_cities">
183	<thead>	193	<thead>
Lines 191-199 Link Here
191	</tr>	201	</tr>
192	</thead>	202	</thead>
193	</table>	203	</table>
		204	</div>
194	[% ELSE %]	205	[% ELSE %]
195	<div class="dialog message">	206	<div class="dialog message">
196	There are no cities defined. <a href="/cgi-bin/koha/admin/cities.pl?op=add_form">Create a new city</a>.	207	There are no cities defined. <a href="/cgi-bin/koha/admin/cities.pl?op=add_form" id="lientype">Create a new city</a>.
197	</div>	208	</div>
198	[% END %]	209	[% END %]
199	[% END %]	210	[% END %]

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt (-23 / +38 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'prefs-admin-search.inc' %]
		6	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
5	<title>	8	<title>
6	[% IF op == 'add_source' %]	9	[% IF op == 'add_source' %]
Lines 33-40 Classification sources &rsaquo; Administration &rsaquo; Koha Link Here
33	</head>	36	</head>
34		37
35	<body id="admin_classsources" class="admin">	38	<body id="admin_classsources" class="admin">
36	[% INCLUDE 'header.inc' %]	39	[% INCLUDE 'header.inc' form=formulaire %]
37	[% INCLUDE 'prefs-admin-search.inc' %]
38		40
39	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	41	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
40	<ol>	42	<ol>
Lines 96-101 Classification sources &rsaquo; Administration &rsaquo; Koha Link Here
96	[% END %]	98	[% END %]
97		99
98	</ol>	100	</ol>
		101	<ol>
		102	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		103	</ol>
		104	<ol>
		105	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		106	</ol>
99	</nav>	107	</nav>
100		108
101	<div class="main container-fluid">	109	<div class="main container-fluid">
Lines 205-215 Classification sources &rsaquo; Administration &rsaquo; Koha Link Here
205	<span class="required">Required</span>	213	<span class="required">Required</span>
206	</li>	214	</li>
207	</ol>	215	</ol>
208	</fieldset>
209	<fieldset class="action">	216	<fieldset class="action">
210	<input type="submit" value="Save" />	217	<input type="submit" class="principal" value="Save" />
211	<a class="cancel" href="/cgi-bin/koha/admin/classsources.pl">Cancel</a>	218	<a class="cancel" href="/cgi-bin/koha/admin/classsources.pl">Cancel</a>
212	</fieldset>	219	</fieldset>
		220	</fieldset>
213	</form>	221	</form>
214	[% END %]	222	[% END %]
215		223
Lines 251-260 Classification sources &rsaquo; Administration &rsaquo; Koha Link Here
251	<span class="required">Required</span>	259	<span class="required">Required</span>
252	</li>	260	</li>
253	</ol>	261	</ol>
254	</fieldset>
255	<fieldset class="action">	262	<fieldset class="action">
256	<input type="submit" value="Save" />	263	<input type="submit" class="principal" value="Save" />
257	<a class="cancel" href="/cgi-bin/koha/admin/classsources.pl">Cancel</a>	264	<a class="c
		265	</fieldset>ancel" href="/cgi-bin/koha/admin/classsources.pl">Cancel</a>
258	</fieldset>	266	</fieldset>
259	</form>	267	</form>
260	[% END %]	268	[% END %]
Lines 325-347 Classification sources &rsaquo; Administration &rsaquo; Koha Link Here
325	</div>	333	</div>
326	</li>	334	</li>
327	</ol>	335	</ol>
328	</fieldset>
329	<fieldset class="action">	336	<fieldset class="action">
330	<input type="submit" value="Save" />	337	<input type="submit" class="principal" value="Save" />
331	<a class="cancel" href="/cgi-bin/koha/admin/classsources.pl">Cancel</a>	338	<a class="cancel" href="/cgi-bin/koha/admin/classsources.pl">Cancel</a>
332	</fieldset>	339	</fieldset>
		340	</fieldset>
333	</form>	341	</form>
334	[% END %]	342	[% END %]
335		343
336	[% IF op == 'list' %]	344	[% IF op == 'list' %]
337		345
338	<div id="toolbar" class="btn-toolbar">	346	<div id="toolbar" class="btn-toolbar">
339	<a class="btn btn-default" id="newsource" href="[% script_name \| url %]?op=add_source"><i class="fa fa-plus"></i> New classification source</a>	347	<div>
340	<a class="btn btn-default" id="newrule" href="[% script_name \| url %]?op=add_sort_rule"><i class="fa fa-plus"></i> New filing rule</a>	348	<a class="pat" id="newsource" href="[% script_name \| url %]?op=add_source"><i class="fa fa-plus"></i> New classification source</a>
341	<a class="btn btn-default" id="newrule" href="[% script_name \| url %]?op=add_split_rule"><i class="fa fa-plus"></i> New splitting rule</a>	349	<a class="pat" id="newrule" href="[% script_name \| url %]?op=add_sort_rule"><i class="fa fa-plus"></i> New filing rule</a>
342	</div>	350	<a class="pat" id="newrule" href="[% script_name \| url %]?op=add_split_rule"><i class="fa fa-plus"></i> New splitting rule</a>
343	<h1>Classification configuration</h1>	351	</div></div>
344	<h2>Classification sources</h2>	352	<h2>Classification configuration</h2>
		353	<div id="searchresults">
		354	<h3>Classification sources</h3>
345	<table>	355	<table>
346	<tr>	356	<tr>
347	<th>Code</th>	357	<th>Code</th>
Lines 359-372 Classification sources &rsaquo; Administration &rsaquo; Koha Link Here
359	<td>[% class_source.class_sort_rule \| html %]</td>	369	<td>[% class_source.class_sort_rule \| html %]</td>
360	<td>[% class_source.class_split_rule \| html %]</td>	370	<td>[% class_source.class_split_rule \| html %]</td>
361	<td class="actions">	371	<td class="actions">
362	<a class="btn btn-default btn-xs" href="[% script_name \| url %]?op=add_source&cn_source=[% class_source.cn_source \| uri %]"><i class="fa fa-pencil"></i> Edit</a>	372	<a class="btn btn-default btn-xs" href="[% script_name \| url %]?op=add_source&cn_source=[% class_source.cn_source \| uri %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a>
363	<a class="btn btn-default btn-xs delete_class_source" href="[% script_name \| url %]?op=delete_source_confirmed&cn_source=[% class_source.cn_source \| uri%]"><i class="fa fa-trash"></i> Delete</a>	373	<a class="btn btn-default btn-xs delete_class_source" href="[% script_name \| url %]?op=delete_source_confirmed&cn_source=[% class_source.cn_source \| uri%]" id="lientype"><i class="fa fa-trash"></i> Delete</a>
364	</td>	374	</td>
365	</tr>	375	</tr>
366	[% END %]	376	[% END %]
367	</table>	377	</table>
		378	</div>
368		379
369	<h2>Classification filing rules</h2>	380	<div id="searchresults">
		381	<h3>Classification filing rules</h3>
370	<table>	382	<table>
371	<tr>	383	<tr>
372	<th>Code</th>	384	<th>Code</th>
Lines 380-393 Classification sources &rsaquo; Administration &rsaquo; Koha Link Here
380	<td>[% rule.description \|html \| html %]</td>	392	<td>[% rule.description \|html \| html %]</td>
381	<td>[% rule.sort_routine \| html %]</td>	393	<td>[% rule.sort_routine \| html %]</td>
382	<td class="actions">	394	<td class="actions">
383	<a class="btn btn-default btn-xs" href="[% script_name \| html %]?op=add_sort_rule&class_sort_rule=[% rule.class_sort_rule \|url %]"><i class="fa fa-pencil"></i> Edit</a>	395	<a class="btn btn-default btn-xs" href="[% script_name \| html %]?op=add_sort_rule&class_sort_rule=[% rule.class_sort_rule \|url %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a>
384	<a class="btn btn-default btn-xs delete_sort_rule" href="[% script_name \| html %]?op=delete_sort_rule&class_sort_rule=[% rule.class_sort_rule \|url %]"><i class="fa fa-trash"></i> Delete</a>	396	<a class="btn btn-default btn-xs delete_sort_rule" href="[% script_name \| html %]?op=delete_sort_rule&class_sort_rule=[% rule.class_sort_rule \|url %]" id="lientype"><i class="fa fa-trash"></i> Delete</a>
385	</td>	397	</td>
386	</tr>	398	</tr>
387	[% END %]	399	[% END %]
388	</table>	400	</table>
		401	</div>
389		402
390	<h2>Classification splitting rules</h2>	403	<div id="searchresults">
		404	<h3>Classification splitting rules</h3>
391	<table>	405	<table>
392	<tr>	406	<tr>
393	<th>Code</th>	407	<th>Code</th>
Lines 401-412 Classification sources &rsaquo; Administration &rsaquo; Koha Link Here
401	<td>[% rule.description \| html %]</td>	415	<td>[% rule.description \| html %]</td>
402	<td>[% rule.split_routine \| html %]</td>	416	<td>[% rule.split_routine \| html %]</td>
403	<td class="actions">	417	<td class="actions">
404	<a class="btn btn-default btn-xs" href="[% script_name \| url %]?op=add_split_rule&class_split_rule=[% rule.class_split_rule \| uri %]"><i class="fa fa-pencil"></i> Edit</a>	418	<a class="btn btn-default btn-xs" href="[% script_name \| url %]?op=add_split_rule&class_split_rule=[% rule.class_split_rule \| uri %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a>
405	<a class="btn btn-default btn-xs delete_split_rule" href="[% script_name \| url %]?op=delete_split_rule&class_split_rule=[% rule.class_split_rule \| uri %]"><i class="fa fa-trash"></i> Delete</a>	419	<a class="btn btn-default btn-xs delete_split_rule" href="[% script_name \| url %]?op=delete_split_rule&class_split_rule=[% rule.class_split_rule \| uri %]" id="lientype"><i class="fa fa-trash"></i> Delete</a>
406	</td>	420	</td>
407	</tr>	421	</tr>
408	[% END %]	422	[% END %]
409	</table>	423	</table>
		424	</div>
410		425
411		426
412	[% END %]	427	[% END %]

Lines 2-14 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt (-3 / +11 lines)
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE Branches %]	3	[% USE Branches %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE 'prefs-admin-search.inc' %]
		7	[% END %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	<title>Clone circulation and fine rules &rsaquo; Circulation and fine rules &rsaquo; Administration &rsaquo; Koha</title>	9	<title>Clone circulation and fine rules &rsaquo; Circulation and fine rules &rsaquo; Administration &rsaquo; Koha</title>
7	[% INCLUDE 'doc-head-close.inc' %]	10	[% INCLUDE 'doc-head-close.inc' %]
8	</head>	11	</head>
9	<body id="admin_clone-rules" class="admin">	12	<body id="admin_clone-rules" class="admin">
10	[% INCLUDE 'header.inc' %]	13	[% INCLUDE 'header.inc' form=formulaire %]
11	[% INCLUDE 'prefs-admin-search.inc' %]
12		14
13	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	15	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
14	<ol>	16	<ol>
Lines 27-32 Link Here
27	</a>	29	</a>
28	</li>	30	</li>
29	</ol>	31	</ol>
		32	<ol>
		33	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		34	</ol>
		35	<ol>
		36	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		37	</ol>
30	</nav>	38	</nav>
31		39
32	<div class="main container-fluid">	40	<div class="main container-fluid">
Lines 45-51 Link Here
45	[% ELSE %]	53	[% ELSE %]
46	<div class="dialog message"><p>The rules have been cloned.</p></div>	54	<div class="dialog message"><p>The rules have been cloned.</p></div>
47	[% END %]	55	[% END %]
48	<a href="/cgi-bin/koha/admin/smart-rules.pl">Return to circulation and fine rules</a>	56	<a href="/cgi-bin/koha/admin/smart-rules.pl" id="lientype">Return to circulation and fine rules</a>
49	[% ELSE %]	57	[% ELSE %]
50		58
51	<p class="help">Use carefully! If the destination library already has circulation and fine rules, they will be deleted without warning!</p>	59	<p class="help">Use carefully! If the destination library already has circulation and fine rules, they will be deleted without warning!</p>

Lines 2-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt (-3 / +11 lines)
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE TablesSettings %]	3	[% USE TablesSettings %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE 'prefs-admin-search.inc' %]
		7	[% END %]
5	[% SET panel_id = 0 %]	8	[% SET panel_id = 0 %]
6	[% BLOCK pagelist %]	9	[% BLOCK pagelist %]
7	[% IF module.keys and module.keys.size > 0 %]	10	[% IF module.keys and module.keys.size > 0 %]
Lines 143-149 Link Here
143	</div>	146	</div>
144	[% END %]	147	[% END %]
145	<fieldset class="action">	148	<fieldset class="action">
146	<input type="submit" value="Save" />	149	<input type="submit" class="principal" value="Save" />
147	</fieldset>	150	</fieldset>
148	[% ELSE %]	151	[% ELSE %]
149	There is no table to configure for this module.	152	There is no table to configure for this module.
Lines 177-184 Link Here
177		180
178	<body id="admin_tables" class="admin">	181	<body id="admin_tables" class="admin">
179		182
180	[% INCLUDE 'header.inc' %]	183	[% INCLUDE 'header.inc' form=formulaire %]
181	[% INCLUDE 'prefs-admin-search.inc' %]
182	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	184	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
183	<ol>	185	<ol>
184	<li>	186	<li>
Lines 193-198 Link Here
193	</a>	195	</a>
194	</li>	196	</li>
195	</ol>	197	</ol>
		198	<ol>
		199	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		200	</ol>
		201	<ol>
		202	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		203	</ol>
196	</nav>	204	</nav>
197		205
198	<div class="main container-fluid">	206	<div class="main container-fluid">

Lines 2-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt (-10 / +21 lines)
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE Branches %]	3	[% USE Branches %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE 'prefs-admin-search.inc' %]
		7	[% END %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	<title>	9	<title>
7	[% IF op =='add_form' %]	10	[% IF op =='add_form' %]
Lines 19-26 Link Here
19	</head>	22	</head>
20		23
21	<body id="admin_credit_types" class="admin">	24	<body id="admin_credit_types" class="admin">
22	[% INCLUDE 'header.inc' %]	25	[% INCLUDE 'header.inc' form=formulaire %]
23	[% INCLUDE 'prefs-admin-search.inc' %]
24		26
25	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	27	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
26	<ol>	28	<ol>
Lines 53-58 Link Here
53	</li>	55	</li>
54	[% END %]	56	[% END %]
55	</ol>	57	</ol>
		58	<ol>
		59	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		60	</ol>
		61	<ol>
		62	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		63	</ol>
56	</nav>	64	</nav>
57		65
58	<div class="main container-fluid">	66	<div class="main container-fluid">
Lines 143-164 Link Here
143	[% END %]	151	[% END %]
144	</li>	152	</li>
145	</ol>	153	</ol>
146	</fieldset>
147
148	<fieldset class="action">	154	<fieldset class="action">
149	<button id="save_credit_type" class="btn btn-default">Save</button>	155	<button id="save_credit_type" class="btn btn-default principal">Save</button>
150	<a class="cancel" href="/cgi-bin/koha/admin/credit_types.pl">Cancel</a>	156	<a class="cancel" href="/cgi-bin/koha/admin/credit_types.pl">Cancel</a>
151	</fieldset>	157	</fieldset>
		158	</fieldset>
		159
152	</form>	160	</form>
153	[% END %]	161	[% END %]
154		162
155	[% IF op == 'list' %]	163	[% IF op == 'list' %]
156	<div id="toolbar" class="btn-toolbar">	164	<div id="toolbar" class="btn-toolbar">
157	<a class="btn btn-default" id="newcredittype" href="/cgi-bin/koha/admin/credit_types.pl?op=add_form"><i class="fa fa-plus"></i> New credit type</a>	165	<div>
158	</div>	166	<a class="pat" id="newcredittype" href="/cgi-bin/koha/admin/credit_types.pl?op=add_form"><i class="fa fa-plus"></i> New credit type</a>
		167	</div></div>
159		168
160	<h1>Account credit types</h1>	169	<h1>Account credit types</h1>
161	[% IF credit_types.count %]	170	[% IF credit_types.count %]
		171	<div id="searchresults">
162	<table id="table_credit_types">	172	<table id="table_credit_types">
163	<thead>	173	<thead>
164	<th>Archived</th>	174	<th>Archived</th>
Lines 198-217 Link Here
198	</td>	208	</td>
199	<td class="actions">	209	<td class="actions">
200	[% IF !credit_type.archived %]	210	[% IF !credit_type.archived %]
201	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/credit_types.pl?op=add_form&code=[% credit_type.code \| uri %]&type=credit"><i class="fa fa-pencil"></i> Edit</a>	211	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/credit_types.pl?op=add_form&code=[% credit_type.code \| uri %]&type=credit" id="lientype"><i class="fa fa-pencil"></i> Edit</a>
202	[% END %]	212	[% END %]
203	[% IF !credit_type.is_system && !credit_type.archived %]	213	[% IF !credit_type.is_system && !credit_type.archived %]
204	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/credit_types.pl?op=archive&code=[% credit_type.code \| uri %]"><i class="fa fa-archive"></i> Archive</a>	214	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/credit_types.pl?op=archive&code=[% credit_type.code \| uri %]" id="lientype"><i class="fa fa-archive"></i> Archive</a>
205	[% END %]	215	[% END %]
206		216
207	[% IF !credit_type.is_system && credit_type.archived %]	217	[% IF !credit_type.is_system && credit_type.archived %]
208	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/credit_types.pl?op=unarchive&code=[% credit_type.code \| uri %]"><i class="fa fa-undo"></i> Restore</a>	218	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/credit_types.pl?op=unarchive&code=[% credit_type.code \| uri %]" id="lientype"><i class="fa fa-undo"></i> Restore</a>
209	[% END %]	219	[% END %]
210	</td>	220	</td>
211	</tr>	221	</tr>
212	[% END %]	222	[% END %]
213	</tbody>	223	</tbody>
214	</table>	224	</table>
		225	</div>
215	[% ELSE %]	226	[% ELSE %]
216	<div class="dialog message">	227	<div class="dialog message">
217	There are no account credit types defined.	228	There are no account credit types defined.

Lines 4-9 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt (-19 / +31 lines)
4	[% USE TablesSettings %]	4	[% USE TablesSettings %]
5	[% USE HtmlTags %]	5	[% USE HtmlTags %]
6	[% SET footerjs = 1 %]	6	[% SET footerjs = 1 %]
		7	[% formulaire = BLOCK %]
		8	[% INCLUDE 'currencies-admin-search.inc' %]
		9	[% END %]
7	[% INCLUDE 'doc-head-open.inc' %]	10	[% INCLUDE 'doc-head-open.inc' %]
8	<title>[% IF op == 'add_form' %][% IF currency %]Modify currency '[% currency.currency \| html %]'[% ELSE %]New currency[% END %][% END %]	11	<title>[% IF op == 'add_form' %][% IF currency %]Modify currency '[% currency.currency \| html %]'[% ELSE %]New currency[% END %][% END %]
9	[% IF op == 'delete_confirm' %]Confirm deletion of currency '[% currency.currency \| html %]'[% END %]	12	[% IF op == 'delete_confirm' %]Confirm deletion of currency '[% currency.currency \| html %]'[% END %]
Lines 13-20 Link Here
13	</head>	16	</head>
14		17
15	<body id="admin_currency" class="admin">	18	<body id="admin_currency" class="admin">
16	[% INCLUDE 'header.inc' %]	19	[% INCLUDE 'header.inc' form=formulaire %]
17	[% INCLUDE 'currencies-admin-search.inc' %]
18		20
19	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	21	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
20	<ol>	22	<ol>
Lines 55-60 Link Here
55	</li>	57	</li>
56	[% END %]	58	[% END %]
57	</ol>	59	</ol>
		60	<ol>
		61	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		62	</ol>
		63	<ol>
		64	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		65	</ol>
58	</nav>	66	</nav>
59		67
60	<div class="main container-fluid">	68	<div class="main container-fluid">
Lines 64-71 Link Here
64		72
65	[% IF op == 'list' %]	73	[% IF op == 'list' %]
66	<div id="toolbar" class="btn-toolbar">	74	<div id="toolbar" class="btn-toolbar">
67	<a class="btn btn-default" id="newcurrency" href="/cgi-bin/koha/admin/currency.pl?op=add_form"><i class="fa fa-plus"></i> New currency</a>	75	<div>
68	</div>	76	<a class="pat" id="newcurrency" href="/cgi-bin/koha/admin/currency.pl?op=add_form"><i class="fa fa-plus"></i> New currency</a>
		77	</div></div>
69	[% END %]	78	[% END %]
70		79
71	[% FOR m IN messages %]	80	[% FOR m IN messages %]
Lines 96-110 Link Here
96	<form action="/cgi-bin/koha/admin/currency.pl" name="Aform" method="post" class="validated">	105	<form action="/cgi-bin/koha/admin/currency.pl" name="Aform" method="post" class="validated">
97	<input type="hidden" name="op" value="add_validate" />	106	<input type="hidden" name="op" value="add_validate" />
98	<fieldset class="rows">	107	<fieldset class="rows">
99	<legend>	108	<h3>
100	<h1>	109	[% IF currency %]
101	[% IF currency %]	110	Modify currency
102	<span>Modify currency</span>	111	[% ELSE %]
103	[% ELSE %]	112	New currency
104	<span>New currency</span>	113	[% END %]
105	[% END %]	114	</h3>
106	</h1>
107	</legend>
108	<ol>	115	<ol>
109	<li>	116	<li>
110	[% IF currency %]	117	[% IF currency %]
Lines 149-160 Link Here
149	<span id="hint" class="hint"></span>	156	<span id="hint" class="hint"></span>
150	</li>	157	</li>
151	</ol>	158	</ol>
152	</fieldset>
153
154	<fieldset class="action">	159	<fieldset class="action">
155	<input type="submit" value="Submit" />	160	<input class="principal" type="submit" value="Submit" />
156	<a href="/cgi-bin/koha/admin/currency.pl" class="cancel">Cancel</a>	161	<a href="/cgi-bin/koha/admin/currency.pl" class="cancel">Cancel</a>
157	</fieldset>	162	</fieldset>
		163	</fieldset>
		164
158	</form>	165	</form>
159		166
160	[% END %]	167	[% END %]
Lines 177-183 Link Here
177	</div>	184	</div>
178	[% ELSE %]	185	[% ELSE %]
179	<div class="dialog alert">	186	<div class="dialog alert">
180	<h1>Confirm deletion of currency [% currency.currency \| $HtmlTags tag='span' attributes=>'class="ex"' %]</h1>	187
		188	<h3>Confirm deletion of currency [% currency.currency \| $HtmlTags tag='span' attributes=>'class="ex"' %]</h3>
181	<table>	189	<table>
182	<tr><th>Currency</th>	190	<tr><th>Currency</th>
183	<td>[% currency.currency \| html %]</td>	191	<td>[% currency.currency \| html %]</td>
Lines 186-191 Link Here
186	<td>[% currency.rate \| html %]</td>	194	<td>[% currency.rate \| html %]</td>
187	</tr>	195	</tr>
188	</table>	196	</table>
		197
189	<form action="/cgi-bin/koha/admin/currency.pl" method="post">	198	<form action="/cgi-bin/koha/admin/currency.pl" method="post">
190	<input type="hidden" name="op" value="delete_confirmed" />	199	<input type="hidden" name="op" value="delete_confirmed" />
191	<input type="hidden" name="currency_code" value="[% currency.currency \| html %]" />	200	<input type="hidden" name="currency_code" value="[% currency.currency \| html %]" />
Lines 210-215 Link Here
210	You searched for [% searchfield \| html %]</span>	219	You searched for [% searchfield \| html %]</span>
211	[% END %]	220	[% END %]
212		221
		222	<div id="searchresults">
		223
213	<table id='currencies-table'>	224	<table id='currencies-table'>
214	<thead>	225	<thead>
215	<tr>	226	<tr>
Lines 234-246 Link Here
234	<td style="color:green;">[% IF currency.active %]✓[% END %]</td>	245	<td style="color:green;">[% IF currency.active %]✓[% END %]</td>
235	<td>[% IF currency.archived %]Yes[% END %]</td>	246	<td>[% IF currency.archived %]Yes[% END %]</td>
236	<td class="actions">	247	<td class="actions">
237	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/currency.pl?op=add_form&currency_code=[% currency.currency \| html %]"><i class="fa fa-pencil"></i> Edit</a>	248	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/currency.pl?op=add_form&currency_code=[% currency.currency \| html %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a>
238	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/currency.pl?op=delete_confirm&currency_code=[% currency.currency \| html %]"><i class="fa fa-trash"></i> Delete</a>	249	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/currency.pl?op=delete_confirm&currency_code=[% currency.currency \| html %]" id="lientype"><i class="fa fa-trash"></i> Delete</a>
239	</td>	250	</td>
240	</tr>	251	</tr>
241	[% END %]	252	[% END %]
242	</tbody>	253	</tbody>
243	</table>	254	</table>
		255	</div>
244		256
245	<br />	257	<br />
246	<div class="hint">	258	<div class="hint">

Lines 3-8 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt (-10 / +21 lines)
3	[% USE Branches %]	3	[% USE Branches %]
4	[% USE Price %]	4	[% USE Price %]
5	[% SET footerjs = 1 %]	5	[% SET footerjs = 1 %]
		6	[% formulaire = BLOCK %]
		7	[% INCLUDE 'prefs-admin-search.inc' %]
		8	[% END %]
6	[% INCLUDE 'doc-head-open.inc' %]	9	[% INCLUDE 'doc-head-open.inc' %]
7	<title>	10	<title>
8	[% IF op =='add_form' %]	11	[% IF op =='add_form' %]
Lines 17-24 Link Here
17	</head>	20	</head>
18		21
19	<body id="admin_debit_types" class="admin">	22	<body id="admin_debit_types" class="admin">
20	[% INCLUDE 'header.inc' %]	23	[% INCLUDE 'header.inc' form=formulaire %]
21	[% INCLUDE 'prefs-admin-search.inc' %]
22		24
23	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	25	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
24	<ol>	26	<ol>
Lines 51-56 Link Here
51	</li>	53	</li>
52	[% END %]	54	[% END %]
53	</ol>	55	</ol>
		56	<ol>
		57	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		58	</ol>
		59	<ol>
		60	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		61	</ol>
54	</nav>	62	</nav>
55		63
56	<div class="main container-fluid">	64	<div class="main container-fluid">
Lines 134-155 Link Here
134	<div class="hint">Select 'All libraries' if this debit type should be available at all libraries. Otherwise select libraries you want to associate debit type with.</div>	142	<div class="hint">Select 'All libraries' if this debit type should be available at all libraries. Otherwise select libraries you want to associate debit type with.</div>
135	</li>	143	</li>
136	</ol>	144	</ol>
137	</fieldset>
138
139	<fieldset class="action">	145	<fieldset class="action">
140	<button id="save_debit_type" class="btn btn-default">Save</button>	146	<button id="save_debit_type" class="btn btn-default principal">Save</button>
141	<a class="cancel" href="/cgi-bin/koha/admin/debit_types.pl">Cancel</a>	147	<a class="cancel" href="/cgi-bin/koha/admin/debit_types.pl">Cancel</a>
142	</fieldset>	148	</fieldset>
		149	</fieldset>
		150
143	</form>	151	</form>
144	[% END %]	152	[% END %]
145		153
146	[% IF op == 'list' %]	154	[% IF op == 'list' %]
147	<div id="toolbar" class="btn-toolbar">	155	<div id="toolbar" class="btn-toolbar">
148	<a class="btn btn-default" id="newdebittype" href="/cgi-bin/koha/admin/debit_types.pl?op=add_form"><i class="fa fa-plus"></i> New debit type</a>	156	<div>
149	</div>	157	<a class="pat" id="newdebittype" href="/cgi-bin/koha/admin/debit_types.pl?op=add_form"><i class="fa fa-plus"></i> New debit type</a>
		158	</div></div>
150		159
151	<h1>Account debit types</h1>	160	<h1>Account debit types</h1>
152	[% IF debit_types.count %]	161	[% IF debit_types.count %]
		162	<div id="searchresults">
153	<table id="table_debit_types">	163	<table id="table_debit_types">
154	<thead>	164	<thead>
155	<th>Archived</th>	165	<th>Archived</th>
Lines 199-214 Link Here
199	</td>	209	</td>
200	<td class="actions">	210	<td class="actions">
201	[% IF !debit_type.is_system && !debit_type.archived %]	211	[% IF !debit_type.is_system && !debit_type.archived %]
202	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/debit_types.pl?op=add_form&code=[% debit_type.code \| uri %]&type=debit"><i class="fa fa-pencil"></i> Edit</a>	212	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/debit_types.pl?op=add_form&code=[% debit_type.code \| uri %]&type=debit" id="lientype"><i class="fa fa-pencil"></i> Edit</a>
203	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/debit_types.pl?op=archive&code=[% debit_type.code \| uri %]"><i class="fa fa-archive"></i> Archive</a>	213	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/debit_types.pl?op=archive&code=[% debit_type.code \| uri %]" id="lientype"><i class="fa fa-archive"></i> Archive</a>
204	[% ELSIF debit_type.archived %]	214	[% ELSIF debit_type.archived %]
205	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/debit_types.pl?op=unarchive&code=[% debit_type.code \| uri %]"><i class="fa fa-undo"></i> Restore</a>	215	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/debit_types.pl?op=unarchive&code=[% debit_type.code \| uri %]" id="lientype"><i class="fa fa-undo"></i> Restore</a>
206	[% END %]	216	[% END %]
207	</td>	217	</td>
208	</tr>	218	</tr>
209	[% END %]	219	[% END %]
210	</tbody>	220	</tbody>
211	</table>	221	</table>
		222	</div>
212	[% ELSE %]	223	[% ELSE %]
213	<div class="dialog message">	224	<div class="dialog message">
214	There are no account debit types defined. <a href="/cgi-bin/koha/admin/debit_types.pl?op=add_form">Create new debit type</a>	225	There are no account debit types defined. <a href="/cgi-bin/koha/admin/debit_types.pl?op=add_form">Create new debit type</a>

Lines 2-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt (-2 / +10 lines)
2	[% USE Branches %]	2	[% USE Branches %]
3	[% USE Asset %]	3	[% USE Asset %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE 'desks-admin-search.inc' %]
		7	[% END %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	<title>	9	<title>
7	[% IF op =='add_form' %]	10	[% IF op =='add_form' %]
Lines 19-26 Link Here
19	</head>	22	</head>
20		23
21	<body id="admin_desks" class="admin">	24	<body id="admin_desks" class="admin">
22	[% INCLUDE 'header.inc' %]	25	[% INCLUDE 'header.inc' form=formulaire %]
23	[% INCLUDE 'desks-admin-search.inc' %]
24		26
25	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	27	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
26	<ol>	28	<ol>
Lines 63-68 Link Here
63	</li>	65	</li>
64	[% END %]	66	[% END %]
65	</ol>	67	</ol>
		68	<ol>
		69	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		70	</ol>
		71	<ol>
		72	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		73	</ol>
66	</nav>	74	</nav>
67		75
68	<div class="main container-fluid">	76	<div class="main container-fluid">

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt (-2 / +10 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'prefs-admin-search.inc' %]
		6	[% END %]
4	[% BLOCK pluginlist %]	7	[% BLOCK pluginlist %]
5	<div class="pluginlist">	8	<div class="pluginlist">
6	[% FOREACH plugin IN plugins %]	9	[% FOREACH plugin IN plugins %]
Lines 28-35 Link Here
28	</head>	31	</head>
29		32
30	<body id="admin_didyoumean" class="admin">	33	<body id="admin_didyoumean" class="admin">
31	[% INCLUDE 'header.inc' %]	34	[% INCLUDE 'header.inc' form=formulaire %]
32	[% INCLUDE 'prefs-admin-search.inc' %]
33		35
34	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	36	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
35	<ol>	37	<ol>
Lines 45-50 Link Here
45	</a>	47	</a>
46	</li>	48	</li>
47	</ol>	49	</ol>
		50	<ol>
		51	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		52	</ol>
		53	<ol>
		54	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		55	</ol>
48	</nav>	56	</nav>
49		57
50	<div class="main container-fluid">	58	<div class="main container-fluid">

Lines 2-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt (-22 / +28 lines)
2	[% USE Koha %]	2	[% USE Koha %]
3	[% USE Asset %]	3	[% USE Asset %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE 'prefs-admin-search.inc' %]
		7	[% END %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	<title>	9	<title>
7	[% IF acct_form %]	10	[% IF acct_form %]
Lines 17-24 EDI accounts &rsaquo; Administration &rsaquo; Koha Link Here
17	[% INCLUDE 'doc-head-close.inc' %]	20	[% INCLUDE 'doc-head-close.inc' %]
18	</head>	21	</head>
19	<body id="admin_edi_acct" class="admin">	22	<body id="admin_edi_acct" class="admin">
20	[% INCLUDE 'header.inc' %]	23	[% INCLUDE 'header.inc' form=formulaire %]
21	[% INCLUDE 'prefs-admin-search.inc' %]
22		24
23	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	25	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
24	<ol>	26	<ol>
Lines 65-70 EDI accounts &rsaquo; Administration &rsaquo; Koha Link Here
65	</li>	67	</li>
66	[% END %]	68	[% END %]
67	</ol>	69	</ol>
		70	<ol>
		71	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		72	</ol>
		73	<ol>
		74	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		75	</ol>
68	</nav>	76	</nav>
69		77
70	<div class="main container-fluid">	78	<div class="main container-fluid">
Lines 80-91 EDI accounts &rsaquo; Administration &rsaquo; Koha Link Here
80	[% END %]	88	[% END %]
81		89
82	[% IF display %]	90	[% IF display %]
83	<div id="toolbar" class="btn-toolbar">	91	<div id="toolbar" class="btn-toolbar"><div>
84	<a class="btn btn-default" id="newediacct" href="/cgi-bin/koha/admin/edi_accounts.pl?op=acct_form">	92	<a class="pat" id="newediacct" href="/cgi-bin/koha/admin/edi_accounts.pl?op=acct_form"><i class="fa fa-plus"></i> New account</a>
85	<i class="fa fa-plus"></i>	93	</div></div>
86	New account
87	</a>
88	</div>
89	[% END %]	94	[% END %]
90		95
91	[% IF acct_form %]	96	[% IF acct_form %]
Lines 95-109 EDI accounts &rsaquo; Administration &rsaquo; Koha Link Here
95	<input type="hidden" name="id" value="[% account.id \| html %]" />	100	<input type="hidden" name="id" value="[% account.id \| html %]" />
96	[% END %]	101	[% END %]
97	<fieldset class="rows">	102	<fieldset class="rows">
98	<legend>	103	<h3>
99	<h1>	104	[% IF account %]
100	[% IF account %]	105	Modify account
101	Modify account	106	[% ELSE %]
102	[% ELSE %]	107	New account
103	New account	108	[% END %]
104	[% END %]	109	</h3>
105	</h1>
106	</legend>
107		110
108	<ol>	111	<ol>
109	<li>	112	<li>
Lines 260-270 EDI accounts &rsaquo; Administration &rsaquo; Koha Link Here
260	</div>	263	</div>
261	</li>	264	</li>
262	</ol>	265	</ol>
263	</fieldset>
264
265	<fieldset class="action">	266	<fieldset class="action">
266	<input type="submit" value="Submit" />	267	<input type="submit" class="principal" value="Submit" />
267	<a href="/cgi-bin/koha/admin/edi_accounts.pl" class="cancel">Cancel</a>	268	<a href="/
		269	</fieldset>
		270	cgi-bin/koha/admin/edi_accounts.pl" class="cancel">Cancel</a>
268	</fieldset>	271	</fieldset>
269	</form>	272	</form>
270		273
Lines 302-307 EDI accounts &rsaquo; Administration &rsaquo; Koha Link Here
302	[% IF ( ediaccounts ) %]	305	[% IF ( ediaccounts ) %]
303	<h1>Vendor EDI accounts</h1>	306	<h1>Vendor EDI accounts</h1>
304		307
		308	<div id="searchresults">
		309
305	<table>	310	<table>
306	<tr>	311	<tr>
307	<th>ID</th>	312	<th>ID</th>
Lines 370-380 EDI accounts &rsaquo; Administration &rsaquo; Koha Link Here
370	<td>No</td>	375	<td>No</td>
371	[% END %]	376	[% END %]
372	<td class="actions">	377	<td class="actions">
373	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/edi_accounts.pl?op=acct_form&id=[% account.id \| html %]"><i class="fa fa-pencil"></i> Edit</a> <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/edi_accounts.pl?op=delete_confirm&id=[% account.id \| html %]"><i class="fa fa-trash"></i> Delete</a>	378	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/edi_accounts.pl?op=acct_form&id=[% account.id \| html %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a> <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/edi_accounts.pl?op=delete_confirm&id=[% account.id \| html %]" id="lientype"><i class="fa fa-trash"></i> Delete</a>
374	</td>	379	</td>
375	</tr>	380	</tr>
376	[% END %]	381	[% END %]
377	</table>	382	</table>
		383	</div>
378	[% ELSE %]	384	[% ELSE %]
379	<div class="dialog message">	385	<div class="dialog message">
380	There are no EDI accounts.	386	There are no EDI accounts.

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt (-22 / +28 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'prefs-admin-search.inc' %]
		6	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
5	<title>	8	<title>
6	[% IF ean_form %]	9	[% IF ean_form %]
Lines 16-23 Library EANs &rsaquo; Administration &rsaquo; Koha Link Here
16	[% INCLUDE 'doc-head-close.inc' %]	19	[% INCLUDE 'doc-head-close.inc' %]
17	</head>	20	</head>
18	<body id="admin_edi_ean" class="admin">	21	<body id="admin_edi_ean" class="admin">
19	[% INCLUDE 'header.inc' %]	22	[% INCLUDE 'header.inc' form=formulaire %]
20	[% INCLUDE 'prefs-admin-search.inc' %]
21		23
22	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	24	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
23	<ol>	25	<ol>
Lines 60-65 Library EANs &rsaquo; Administration &rsaquo; Koha Link Here
60	</li>	62	</li>
61	[% END %]	63	[% END %]
62	</ol>	64	</ol>
		65	<ol>
		66	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		67	</ol>
		68	<ol>
		69	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		70	</ol>
63	</nav>	71	</nav>
64		72
65	<div class="main container-fluid">	73	<div class="main container-fluid">
Lines 68-79 Library EANs &rsaquo; Administration &rsaquo; Koha Link Here
68	<main>	76	<main>
69		77
70	[% IF display %]	78	[% IF display %]
71	<div id="toolbar" class="btn-toolbar">	79	<div id="toolbar" class="btn-toolbar"><div>
72	<a class="btn btn-default" id="newediean" href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=ean_form">	80	<a class="pat" id="newediean" href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=ean_form"><i class="fa fa-plus"></i> New EAN</a>
73	<i class="fa fa-plus"></i>	81	</div></div>
74	New EAN
75	</a>
76	</div>
77	[% END %]	82	[% END %]
78		83
79	[% IF ean_form %]	84	[% IF ean_form %]
Lines 85-99 Library EANs &rsaquo; Administration &rsaquo; Koha Link Here
85	[% END %]	90	[% END %]
86		91
87	<fieldset class="rows">	92	<fieldset class="rows">
88	<legend>	93	<h3>
89	<h1>	94	[% IF ean %]
90	[% IF ean %]	95	Modify EAN
91	Modify EAN	96	[% ELSE %]
92	[% ELSE %]	97	New EAN
93	New EAN	98	[% END %]
94	[% END %]	99	</h3>
95	</h1>
96	</legend>
97		100
98	<ol>	101	<ol>
99	<li>	102	<li>
Lines 134-145 Library EANs &rsaquo; Administration &rsaquo; Koha Link Here
134	</select>	137	</select>
135	</li>	138	</li>
136	</ol>	139	</ol>
137	</fieldset>
138
139	<fieldset class="action">	140	<fieldset class="action">
140	<input type="submit" value="Submit"/>	141	<input type="submit" class="principal" value="Submit"/>
141	<a href="/cgi-bin/koha/admin/edi_ean_accounts.pl" class="cancel">Cancel</a>	142	<a href="/cgi-bin/koha/admin/edi_ean_accounts.pl" class="cancel">Cancel</a>
142	</fieldset>	143	</fieldset>
		144	</fieldset>
		145
143	</form>	146	</form>
144	[% END %]	147	[% END %]
145		148
Lines 160-165 Library EANs &rsaquo; Administration &rsaquo; Koha Link Here
160	[% IF display %]	163	[% IF display %]
161	<h1>Library EANs</h1>	164	<h1>Library EANs</h1>
162	[% IF ( eans ) %]	165	[% IF ( eans ) %]
		166	<h2>Library EANs</h2>
		167	<div id="searchresults">
163	<table>	168	<table>
164	<tr>	169	<tr>
165	<th>Library</th>	170	<th>Library</th>
Lines 185-196 Library EANs &rsaquo; Administration &rsaquo; Koha Link Here
185	[% END %]	190	[% END %]
186	</td>	191	</td>
187	<td class="actions">	192	<td class="actions">
188	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=ean_form&id=[% ean.id \| html %]"><i class="fa fa-pencil"></i> Edit</a>	193	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=ean_form&id=[% ean.id \| html %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a>
189	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=delete_confirm&id=[% ean.id \| html %]"><i class="fa fa-trash"></i> Delete</a>	194	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=delete_confirm&id=[% ean.id \| html %]" id="lientype"><i class="fa fa-trash"></i> Delete</a>
190	</td>	195	</td>
191	</tr>	196	</tr>
192	[% END %]	197	[% END %]
193	</table>	198	</table>
		199	</div>
194	[% ELSE %]	200	[% ELSE %]
195	<div class="dialog message">	201	<div class="dialog message">
196	There are no library EANs.	202	There are no library EANs.

Lines 2-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt (-5 / +14 lines)
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE Branches %]	3	[% USE Branches %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE 'prefs-admin-search.inc' %]
		7	[% END %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	<title>Item circulation alerts &rsaquo; Administration &rsaquo; Koha</title>	9	<title>Item circulation alerts &rsaquo; Administration &rsaquo; Koha</title>
7	[% INCLUDE 'doc-head-close.inc' %]	10	[% INCLUDE 'doc-head-close.inc' %]
Lines 45-52 Link Here
45	</head>	48	</head>
46		49
47	<body id="admin_item_circulation_alerts" class="admin">	50	<body id="admin_item_circulation_alerts" class="admin">
48	[% INCLUDE 'header.inc' %]	51	[% INCLUDE 'header.inc' form=formulaire %]
49	[% INCLUDE 'prefs-admin-search.inc' %]
50		52
51	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	53	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
52	<ol>	54	<ol>
Lines 62-67 Link Here
62	</a>	64	</a>
63	</li>	65	</li>
64	</ol>	66	</ol>
		67	<ol>
		68	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		69	</ol>
		70	<ol>
		71	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		72	</ol>
65	</nav>	73	</nav>
66		74
67	<div class="main container-fluid">	75	<div class="main container-fluid">
Lines 70-76 Link Here
70	<main>	78	<main>
71	<div class="row">	79	<div class="row">
72	<div class="col-sm-6">	80	<div class="col-sm-6">
73	<h1>Item circulation alerts</h1>	81	<h2>Item circulation alerts</h2>
74	<h2>Select a library:</h2>	82	<h2>Select a library:</h2>
75	<form id="branch_selector" method="get" action="/cgi-bin/koha/admin/item_circulation_alerts.pl">	83	<form id="branch_selector" method="get" action="/cgi-bin/koha/admin/item_circulation_alerts.pl">
76	<select id="branch" name="branch">	84	<select id="branch" name="branch">
Lines 107-113 Link Here
107	</div> <!-- /.col-sm-6 -->	115	</div> <!-- /.col-sm-6 -->
108	</div> <!-- /.row -->	116	</div> <!-- /.row -->
109		117
110	<h2>Circulation alerts for [% Branches.GetName( branch ) \|\| 'Default' \| html %]</h2>	118	<div id="searchresults">
		119	<h3>Circulation alerts for [% Branches.GetName( branch ) \|\| 'Default' \| html %]</h3>
111	<p>Click on the grid to toggle the settings.</p>	120	<p>Click on the grid to toggle the settings.</p>
112		121
113		122
Lines 168-174 Link Here
168	</div>	177	</div>
169	</div> <!-- /.tab-content -->	178	</div> <!-- /.tab-content -->
170		179
171	</div> <!-- /#alerttabs -->	180	</div> <!-- /#alerttabs --></div>
172		181
173		182
174	</main>	183	</main>

Lines 1-14 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt (-2 / +10 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'prefs-admin-search.inc' %]
		6	[% END %]
4	[% USE AuthorisedValues %]	7	[% USE AuthorisedValues %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	<title>Item search fields &rsaquo; Administration &rsaquo; Koha</title>	9	<title>Item search fields &rsaquo; Administration &rsaquo; Koha</title>
7	[% INCLUDE 'doc-head-close.inc' %]	10	[% INCLUDE 'doc-head-close.inc' %]
8	</head>	11	</head>
9	<body id="admin_itemssearchfields" class="admin">	12	<body id="admin_itemssearchfields" class="admin">
10	[% INCLUDE 'header.inc' %]	13	[% INCLUDE 'header.inc' form=formulaire %]
11	[% INCLUDE 'prefs-admin-search.inc' %]
12		14
13	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	15	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
14	<ol>	16	<ol>
Lines 37-42 Link Here
37	</li>	39	</li>
38	[% END %]	40	[% END %]
39	</ol>	41	</ol>
		42	<ol>
		43	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		44	</ol>
		45	<ol>
		46	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		47	</ol>
40	</nav>	48	</nav>
41		49
42	<div class="main container-fluid">	50	<div class="main container-fluid">

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt (-8 / +22 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'prefs-admin-search.inc' %]
		6	[% END %]
4	[% USE AuthorisedValues %]	7	[% USE AuthorisedValues %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	<title>Item search fields &rsaquo; Administration &rsaquo; Koha</title>	9	<title>Item search fields &rsaquo; Administration &rsaquo; Koha</title>
Lines 8-15 Link Here
8	</head>	11	</head>
9		12
10	<body id="admin_itemssearchfields" class="admin">	13	<body id="admin_itemssearchfields" class="admin">
11	[% INCLUDE 'header.inc' %]	14	[% INCLUDE 'header.inc' form=formulaire %]
12	[% INCLUDE 'prefs-admin-search.inc' %]
13		15
14	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	16	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
15	<ol>	17	<ol>
Lines 25-30 Link Here
25	</a>	27	</a>
26	</li>	28	</li>
27	</ol>	29	</ol>
		30	<ol>
		31	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		32	</ol>
		33	<ol>
		34	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		35	</ol>
28	</nav>	36	</nav>
29		37
30	<div class="main container-fluid">	38	<div class="main container-fluid">
Lines 33-40 Link Here
33	<main>	41	<main>
34		42
35	<div id="toolbar" class="btn-toolbar">	43	<div id="toolbar" class="btn-toolbar">
36	<a class="btn btn-default" id="new_search_field" href="/cgi-bin/koha/admin/items_search_fields.pl"><i class="fa fa-plus"></i> New search field</a>	44	<div>
37	</div>	45	<a class="pat" id="new_search_field" href="/cgi-bin/koha/admin/items_search_fields.pl"><i class="fa fa-plus"></i> New search field</a>
		46	</div></div>
38		47
39	[% IF field_added %]	48	[% IF field_added %]
40	<div class="dialog message">	49	<div class="dialog message">
Lines 68-73 Link Here
68	<div id="search_fields_list">	77	<div id="search_fields_list">
69	<h1>Item search fields</h1>	78	<h1>Item search fields</h1>
70		79
		80	<div id="searchresults">
		81
71	<table id="search_fields_table">	82	<table id="search_fields_table">
72	<thead>	83	<thead>
73	<tr>	84	<tr>
Lines 88-101 Link Here
88	<td>[% field.tagsubfield \| html %]</td>	99	<td>[% field.tagsubfield \| html %]</td>
89	<td>[% field.authorised_values_category \| html %]</td>	100	<td>[% field.authorised_values_category \| html %]</td>
90	<td>	101	<td>
91	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/items_search_field.pl?name=[% field.name \| html %]"><i class="fa fa-pencil"></i> Edit</a>	102	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/items_search_field.pl?name=[% field.name \| html %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a>
92	<a class="field-delete btn btn-default btn-xs" href="/cgi-bin/koha/admin/items_search_fields.pl?op=del&name=[% field.name \| html %]"><i class="fa fa-trash"></i> Delete</a>	103	<a class="field-delete btn btn-default btn-xs" href="/cgi-bin/koha/admin/items_search_fields.pl?op=del&name=[% field.name \| html %]" id="lientype"><i class="fa fa-trash"></i> Delete</a>
93	</td>	104	</td>
94	</tr>	105	</tr>
95	[% END %]	106	[% END %]
96	</tbody>	107	</tbody>
97	</table>	108	</table>
98	</div>	109	</div></div>
99	[% ELSE %]	110	[% ELSE %]
100	<h1>Item search fields</h1>	111	<h1>Item search fields</h1>
101	<div class="dialog message">	112	<div class="dialog message">
Lines 106-117 Link Here
106	<form id="add_field_form" action="/cgi-bin/koha/admin/items_search_fields.pl" method="POST">	117	<form id="add_field_form" action="/cgi-bin/koha/admin/items_search_fields.pl" method="POST">
107	<fieldset class="rows">	118	<fieldset class="rows">
108	<legend><h1>Add a new field</h1></legend>	119	<legend><h1>Add a new field</h1></legend>
		120	<h3>Add a new field</h3>
109	[% INCLUDE 'admin-items-search-field-form.inc' field=undef %]	121	[% INCLUDE 'admin-items-search-field-form.inc' field=undef %]
110	<input type="hidden" name="op" value="add" />	122	<input type="hidden" name="op" value="add" />
111	</fieldset>
112	<fieldset class="action">	123	<fieldset class="action">
113	<input type="submit" value="Submit" />	124	<input type="submit" value="Submit" />
114	<a href="#" class="cancel hide_form">Cancel</a>	125	<a href="#" class="cancel hide_form">Cancel</a>
		126	<input type="submit" class="principal" value="Submit" />
		127	<a href="#" class="cancel">Cancel</a>
		128	</fieldset>
115	</fieldset>	129	</fieldset>
116	</form>	130	</form>
117		131

Lines 6-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt (-15 / +27 lines)
6	[% USE Price %]	6	[% USE Price %]
7	[% USE TablesSettings %]	7	[% USE TablesSettings %]
8	[% SET footerjs = 1 %]	8	[% SET footerjs = 1 %]
		9	[% formulaire = BLOCK %]
		10	[% INCLUDE 'prefs-admin-search.inc' %]
		11	[% END %]
9	[% INCLUDE 'doc-head-open.inc' %]	12	[% INCLUDE 'doc-head-open.inc' %]
10	<title>	13	<title>
11	[% IF op == 'add_form' %]	14	[% IF op == 'add_form' %]
Lines 47-54 Item types &rsaquo; Administration &rsaquo; Koha Link Here
47	</head>	50	</head>
48		51
49	<body id="admin_itemtypes" class="admin">	52	<body id="admin_itemtypes" class="admin">
50	[% INCLUDE 'header.inc' %]	53	[% INCLUDE 'header.inc' form=formulaire %]
51	[% INCLUDE 'prefs-admin-search.inc' %]
52		54
53	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	55	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
54	<ol>	56	<ol>
Lines 116-121 Item types &rsaquo; Administration &rsaquo; Koha Link Here
116	</li>	118	</li>
117	[% END %]	119	[% END %]
118	</ol>	120	</ol>
		121	<ol>
		122	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		123	</ol>
		124	<ol>
		125	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		126	</ol>
119	</nav>	127	</nav>
120		128
121	<div class="main container-fluid">	129	<div class="main container-fluid">
Lines 124-131 Item types &rsaquo; Administration &rsaquo; Koha Link Here
124	<main>	132	<main>
125		133
126	[% IF op == 'list' %]<div id="toolbar" class="btn-toolbar">	134	[% IF op == 'list' %]<div id="toolbar" class="btn-toolbar">
127	<a class="btn btn-default" id="newitemtype" href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form"><i class="fa fa-plus"></i> New item type</a>	135	<div>
128	</div>[% END %]	136	<a class="pat" id="newitemtype" href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form"><i class="fa fa-plus"></i> New item type</a>
		137	</div></div>[% END %]
129		138
130	[% FOREACH m IN messages %]	139	[% FOREACH m IN messages %]
131	<div class="dialog [% m.type \| html %]">	140	<div class="dialog [% m.type \| html %]">
Lines 152-163 Item types &rsaquo; Administration &rsaquo; Koha Link Here
152	</div>	161	</div>
153	[% END %]	162	[% END %]
154		163
155
156	[% IF op == 'add_form' %]	164	[% IF op == 'add_form' %]
157	[% IF itemtype %]	165	[% IF itemtype %]
158	<h1>Modify item type</h1>	166	<h2>Modify item type</h2>
159	[% ELSE %]	167	[% ELSE %]
160	<h1>Add item type</h1>	168	<h2>Add item type</h2>
161	[% END %]	169	[% END %]
162	<form action="/cgi-bin/koha/admin/itemtypes.pl" name="Aform" method="post" id="itemtypeentry">	170	<form action="/cgi-bin/koha/admin/itemtypes.pl" name="Aform" method="post" id="itemtypeentry">
163	<input type="hidden" name="op" value="add_validate" />	171	<input type="hidden" name="op" value="add_validate" />
Lines 426-443 Item types &rsaquo; Administration &rsaquo; Koha Link Here
426	<div class="hint"><strong><a href="[856u]">open site</a></strong> will show the link just below the title</div>	434	<div class="hint"><strong><a href="[856u]">open site</a></strong> will show the link just below the title</div>
427	</li>	435	</li>
428	</ol>	436	</ol>
429	</fieldset>	437	<fieldset class="action">
430		438	<input type="submit" class="principal" value="Save changes" />
431	<fieldset class="action">
432	<input type="submit" value="Save changes" />
433	<a href="/cgi-bin/koha/admin/itemtypes.pl" class="cancel">Cancel</a>	439	<a href="/cgi-bin/koha/admin/itemtypes.pl" class="cancel">Cancel</a>
434	</fieldset>	440	</fieldset>
		441	</fieldset>
		442
		443
435	</form>	444	</form>
436	[% END %]	445	[% END %]
437		446
438	[% IF op == 'delete_confirm' %]	447	[% IF op == 'delete_confirm' %]
439	<div class="dialog alert">	448	<div class="dialog alert">
440	<h1>Delete item type '[% itemtype.itemtype \| html %]'?</h1>	449	<div id="searchresults">
		450	<h3>Delete item type '[% itemtype.itemtype \| html %]'?</h3>
441	<table>	451	<table>
442	<tr>	452	<tr>
443	<th scope="row">Item type</th>	453	<th scope="row">Item type</th>
Lines 462-473 Item types &rsaquo; Administration &rsaquo; Koha Link Here
462	<form action="/cgi-bin/koha/admin/itemtypes.pl" method="post">	472	<form action="/cgi-bin/koha/admin/itemtypes.pl" method="post">
463	<button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>	473	<button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
464	</form>	474	</form>
465	</div>	475	</div></div>
466	[% END %]	476	[% END %]
467		477
468	[% IF op == 'list' %]	478	[% IF op == 'list' %]
469	<h1>Item types administration</h1>	479	<h1>Item types administration</h1>
470	[% IF itemtypes %]	480	[% IF itemtypes %]
		481	<div id="searchresults">
471	<table id="table_item_type">	482	<table id="table_item_type">
472	<thead>	483	<thead>
473	[% UNLESS Koha.Preference('noItemTypeImages') && Koha.Preference('OpacNoItemTypeImages') %]<th class="noExport">Image</th>[% END %]	484	[% UNLESS Koha.Preference('noItemTypeImages') && Koha.Preference('OpacNoItemTypeImages') %]<th class="noExport">Image</th>[% END %]
Lines 585-596 Item types &rsaquo; Administration &rsaquo; Koha Link Here
585	</td>	596	</td>
586	<td>[% IF ( itemtype.automatic_checkin ) %]Yes[% ELSE %] [% END %]</td>	597	<td>[% IF ( itemtype.automatic_checkin ) %]Yes[% ELSE %] [% END %]</td>
587	<td class="actions">	598	<td class="actions">
588	<a href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form&itemtype=[% itemtype.itemtype \| uri %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>	599	<a href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form&itemtype=[% itemtype.itemtype \| uri %]" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-pencil"></i> Edit</a>
589	<a href="/cgi-bin/koha/admin/itemtypes.pl?op=delete_confirm&itemtype=[% itemtype.itemtype \| uri %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a>	600	<a href="/cgi-bin/koha/admin/itemtypes.pl?op=delete_confirm&itemtype=[% itemtype.itemtype \| uri %]" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-trash"></i> Delete</a>
590	</td>	601	</td>
591	</tr>	602	</tr>
592	[% END %]	603	[% END %]
593	</table>	604	</table>
		605	</div>
594	[% ELSE %]	606	[% ELSE %]
595	<div class="dialog message">There are no itemtypes defined</div>	607	<div class="dialog message">There are no itemtypes defined</div>
596	[% END %]	608	[% END %]

Lines 1-14 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt (-5 / +15 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'prefs-admin-search.inc' %]
		6	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
5	<title>Koha to MARC mapping &rsaquo; Administration &rsaquo; Koha</title>	8	<title>Koha to MARC mapping &rsaquo; Administration &rsaquo; Koha</title>
6	[% INCLUDE 'doc-head-close.inc' %]	9	[% INCLUDE 'doc-head-close.inc' %]
7	</head>	10	</head>
8		11
9	<body id="admin_koha2marclinks" class="admin">	12	<body id="admin_koha2marclinks" class="admin">
10	[% INCLUDE 'header.inc' %]	13	[% INCLUDE 'header.inc' form=formulaire %]
11	[% INCLUDE 'prefs-admin-search.inc' %]
12		14
13	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	15	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
14	<ol>	16	<ol>
Lines 22-27 Link Here
22	<a href="#" aria-current="page">Koha to MARC mapping</a>	24	<a href="#" aria-current="page">Koha to MARC mapping</a>
23	</li>	25	</li>
24	</ol>	26	</ol>
		27	<ol>
		28	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		29	</ol>
		30	<ol>
		31	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		32	</ol>
25	</nav>	33	</nav>
26		34
27	<div class="main container-fluid">	35	<div class="main container-fluid">
Lines 29-35 Link Here
29	<div class="col-sm-10 col-sm-push-2">	37	<div class="col-sm-10 col-sm-push-2">
30	<main>	38	<main>
31		39
32	<h1>Koha to MARC mapping</h1>	40	<h2>Koha to MARC mapping</h2>
33	<br/>	41	<br/>
34	<div class="dialog message">If you make any change to the mappings, you must ask your administrator to run misc/batchRebuildBiblioTables.pl.</div>	42	<div class="dialog message">If you make any change to the mappings, you must ask your administrator to run misc/batchRebuildBiblioTables.pl.</div>
35	<form action="/cgi-bin/koha/admin/koha2marclinks.pl" method="post" id="koha2marc">	43	<form action="/cgi-bin/koha/admin/koha2marclinks.pl" method="post" id="koha2marc">
Lines 38-43 Link Here
38	<div class="dialog alert">Failed to add mapping for [% error_info \| html %]</div>	46	<div class="dialog alert">Failed to add mapping for [% error_info \| html %]</div>
39	[% END %]	47	[% END %]
40		48
		49	<div id="searchresults">
41	<table id="kohafields">	50	<table id="kohafields">
42	<thead><tr>	51	<thead><tr>
43	<th>Koha field</th>	52	<th>Koha field</th>
Lines 55-62 Link Here
55	<td>[% loo.liblibrarian \| html %]</td>	64	<td>[% loo.liblibrarian \| html %]</td>
56	<td class="actions">	65	<td class="actions">
57	[% IF !loo.readonly %]	66	[% IF !loo.readonly %]
58	<a onclick="AddFld('[% loo.kohafield \| html %]');" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add</a>	67	<a onclick="AddFld('[% loo.kohafield \| html %]');" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-plus"></i> Add</a>
59	[% IF loo.tagfield %] <a onclick="RemFld('[% loo.tagfield \| html %]','[% loo.tagsubfield \| html %]');" class="btn btn-default btn-xs"><i class="fa fa-remove"></i> Remove</a> [% END %]	68	[% IF loo.tagfield %] <a onclick="RemFld('[% loo.tagfield \| html %]','[% loo.tagsubfield \| html %]');" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-remove"></i> Remove</a> [% END %]
60	[% END %]	69	[% END %]
61	</td>	70	</td>
62	</td>	71	</td>
Lines 64-69 Link Here
64	[% END %]	73	[% END %]
65	</tbody>	74	</tbody>
66	</table>	75	</table>
		76	</div>
67		77
68	<input id="remove_field" name="remove_field" type="hidden" value=""/>	78	<input id="remove_field" name="remove_field" type="hidden" value=""/>
69	<input id="add_field" name="add_field" type="hidden" value=""/>	79	<input id="add_field" name="add_field" type="hidden" value=""/>

Lines 2-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt (-2 / +10 lines)
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE KohaSpan %]	3	[% USE KohaSpan %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE 'cat-search.inc' %]
		7	[% END %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	<title>Library groups &rsaquo; Administration &rsaquo; Koha</title>	9	<title>Library groups &rsaquo; Administration &rsaquo; Koha</title>
7	[% INCLUDE 'doc-head-close.inc' %]	10	[% INCLUDE 'doc-head-close.inc' %]
Lines 9-16 Link Here
9	</head>	12	</head>
10		13
11	<body id="admin_library_groups" class="admin">	14	<body id="admin_library_groups" class="admin">
12	[% INCLUDE 'header.inc' %]	15	[% INCLUDE 'header.inc' form=formulaire %]
13	[% INCLUDE 'cat-search.inc' %]
14		16
15	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	17	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
16	<ol>	18	<ol>
Lines 24-29 Link Here
24	<a href="#" aria-current="page">Library groups</a>	26	<a href="#" aria-current="page">Library groups</a>
25	</li>	27	</li>
26	</ol>	28	</ol>
		29	<ol>
		30	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		31	</ol>
		32	<ol>
		33	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		34	</ol>
27	</nav>	35	</nav>
28		36
29	[% FOR m IN messages %]	37	[% FOR m IN messages %]

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt (-2 / +10 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'cat-search.inc' %]
		6	[% END %]
4	[% USE Koha %]	7	[% USE Koha %]
5	[% USE KohaSpan %]	8	[% USE KohaSpan %]
6	[% INCLUDE 'doc-head-open.inc' %]	9	[% INCLUDE 'doc-head-open.inc' %]
Lines 15-22 Link Here
15		18
16	</head>	19	</head>
17	<body id="admin_marc-overlay-rules" class="admin">	20	<body id="admin_marc-overlay-rules" class="admin">
18	[% INCLUDE 'header.inc' %]	21	[% INCLUDE 'header.inc' form=formulaire %]
19	[% INCLUDE 'cat-search.inc' %]
20		22
21	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	23	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
22	<ol>	24	<ol>
Lines 32-37 Link Here
32	</a>	34	</a>
33	</li>	35	</li>
34	</ol>	36	</ol>
		37	<ol>
		38	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		39	</ol>
		40	<ol>
		41	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		42	</ol>
35	</nav>	43	</nav>
36		44
37	<div class="main container-fluid">	45	<div class="main container-fluid">

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt (-2 / +10 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'prefs-admin-search.inc' %]
		6	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
5	<title>	8	<title>
6	[%- IF ( add_form ) -%]	9	[%- IF ( add_form ) -%]
Lines 36-43 Link Here
36	</head>	39	</head>
37		40
38	<body id="admin_marc_subfields_structure" class="admin">	41	<body id="admin_marc_subfields_structure" class="admin">
39	[% INCLUDE 'header.inc' %]	42	[% INCLUDE 'header.inc' form=formulaire %]
40	[% INCLUDE 'prefs-admin-search.inc' %]
41		43
42	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	44	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
43	<ol>	45	<ol>
Lines 103-108 Link Here
103	</li>	105	</li>
104	[% END %]	106	[% END %]
105	</ol>	107	</ol>
		108	<ol>
		109	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		110	</ol>
		111	<ol>
		112	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		113	</ol>
106	</nav> <!-- /#breadcrumbs -->	114	</nav> <!-- /#breadcrumbs -->
107		115
108	<div class="main container-fluid">	116	<div class="main container-fluid">

Lines 2-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt (-10 / +18 lines)
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE AuthorisedValues %]	3	[% USE AuthorisedValues %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE 'prefs-admin-search.inc' %]
		7	[% END %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	<title>	9	<title>
7	[% IF ( add_form ) %]	10	[% IF ( add_form ) %]
Lines 22-29 MARC frameworks &rsaquo; Administration &rsaquo; Koha Link Here
22	</head>	25	</head>
23		26
24	<body id="admin_marctagstructure" class="admin">	27	<body id="admin_marctagstructure" class="admin">
25	[% INCLUDE 'header.inc' %]	28	[% INCLUDE 'header.inc' form=formulaire %]
26	[% INCLUDE 'prefs-admin-search.inc' %]
27		29
28	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	30	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
29	<ol>	31	<ol>
Lines 101-106 MARC frameworks &rsaquo; Administration &rsaquo; Koha Link Here
101	</li>	103	</li>
102	[% END %]	104	[% END %]
103	</ol>	105	</ol>
		106	<ol>
		107	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		108	</ol>
		109	<ol>
		110	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		111	</ol>
104	</nav>	112	</nav>
105		113
106	<div class="main container-fluid">	114	<div class="main container-fluid">
Lines 109-119 MARC frameworks &rsaquo; Administration &rsaquo; Koha Link Here
109	<main>	117	<main>
110		118
111	[% IF ( else ) %]	119	[% IF ( else ) %]
112	<div id="toolbar" class="btn-toolbar">	120	<div id="toolbar" class="btn-toolbar"><div>
113	<a class="btn btn-default" id="addtag" href="/cgi-bin/koha/admin/marctagstructure.pl?op=add_form&frameworkcode=[% framework.frameworkcode \| uri %]"><i class="fa fa-plus"></i> New tag</a>	121	<a class="pat" id="addtag" href="/cgi-bin/koha/admin/marctagstructure.pl?op=add_form&frameworkcode=[% framework.frameworkcode \| uri %]"><i class="fa fa-plus"></i> New tag</a>
114	</div>[% END %]	122	</div></div>[% END %]
115		123
116	<h1>MARC Framework for [% IF framework %][% framework.frameworktext \| html %] ([% framework.frameworkcode \| html %])[% ELSE %]default MARC framework[% END %]</h1>	124	<h2>MARC Framework for [% IF framework %][% framework.frameworktext \| html %] ([% framework.frameworkcode \| html %])[% ELSE %]default MARC framework[% END %]</h2>
117		125
118	[% IF ( add_form ) %]	126	[% IF ( add_form ) %]
119		127
Lines 178-184 MARC frameworks &rsaquo; Administration &rsaquo; Koha Link Here
178	(if you select a value here, the indicators will be limited to the authorized value list)</li>	186	(if you select a value here, the indicators will be limited to the authorized value list)</li>
179	</ol></fieldset>	187	</ol></fieldset>
180	<fieldset class="action">	188	<fieldset class="action">
181	<input type="submit" value="Save changes" />	189	<input type="submit" value="Save changes" class="principal"/>
182	<a class="cancel" href="[% script_name \| url %]?frameworkcode=[% framework.frameworkcode \| uri %]">Cancel</a>	190	<a class="cancel" href="[% script_name \| url %]?frameworkcode=[% framework.frameworkcode \| uri %]">Cancel</a>
183	</fieldset>	191	</fieldset>
184	</form>	192	</form>
Lines 221-227 MARC frameworks &rsaquo; Administration &rsaquo; Koha Link Here
221	<option value="[% fw.frameworkcode \| html %]">[% fw.frameworktext \| html %]</option>	229	<option value="[% fw.frameworkcode \| html %]">[% fw.frameworktext \| html %]</option>
222	[% END %]	230	[% END %]
223	</select>	231	</select>
224	<input type="submit" value="OK" />	232	<input type="submit" value="OK" class="principal"/>
225	</form>	233	</form>
226	[% END %]	234	[% END %]
227		235
Lines 243-249 MARC frameworks &rsaquo; Administration &rsaquo; Koha Link Here
243	[% END %]	251	[% END %]
244	[% END %]	252	[% END %]
245	</select>	253	</select>
246	<input type="submit" value="Search" />	254	<input type="submit" value="Search" class="principal"/>
247	<p> <label for="select_display">Display only used tags/subfields</label>	255	<p> <label for="select_display">Display only used tags/subfields</label>
248	[% IF ( select_display ) %]	256	[% IF ( select_display ) %]
249	<input type="checkbox" name="select_display" id="select_display" value="True" checked="checked" />	257	<input type="checkbox" name="select_display" id="select_display" value="True" checked="checked" />
Lines 290-296 MARC frameworks &rsaquo; Administration &rsaquo; Koha Link Here
290	<td>[% loo.ind2_defaultvalue \| html %]</td>	298	<td>[% loo.ind2_defaultvalue \| html %]</td>
291	<td>	299	<td>
292	<div class="btn-group dropup">	300	<div class="btn-group dropup">
293	<a class="btn btn-default btn-xs dropdown-toggle" id="marctagactions[% loo.tagfield \| html %]" role="button" data-toggle="dropdown" href="#">	301	<a class="btn btn-default btn-xs dropdown-toggle" id="lientype" role="button" data-toggle="dropdown" href="#">
294	Actions <b class="caret"></b></a>	302	Actions <b class="caret"></b></a>
295	<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="marctagactions[% loo.tagfield \| html %]">	303	<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="marctagactions[% loo.tagfield \| html %]">
296	<li><a href="?op=add_form&searchfield=[% loo.tagfield \| uri %]&frameworkcode=[% framework.frameworkcode \| uri %]"><i class="fa fa-pencil"></i> Edit tag</a></li>	304	<li><a href="?op=add_form&searchfield=[% loo.tagfield \| uri %]&frameworkcode=[% framework.frameworkcode \| uri %]"><i class="fa fa-pencil"></i> Edit tag</a></li>

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt (-51 / +62 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'prefs-admin-search.inc' %]
		6	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
5	<title>	8	<title>
6	[% IF ( matching_rule_form ) %]	9	[% IF ( matching_rule_form ) %]
Lines 59-66 Link Here
59	</style>	62	</style>
60	</head>	63	</head>
61	<body id="admin_matching-rules" class="admin">	64	<body id="admin_matching-rules" class="admin">
62	[% INCLUDE 'header.inc' %]	65	[% INCLUDE 'header.inc' form=formulaire %]
63	[% INCLUDE 'prefs-admin-search.inc' %]
64		66
65	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	67	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
66	<ol>	68	<ol>
Lines 103-108 Link Here
103	</li>	105	</li>
104	[% END %]	106	[% END %]
105	</ol>	107	</ol>
		108	<ol>
		109	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		110	</ol>
		111	<ol>
		112	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		113	</ol>
106	</nav> <!-- /#breadcrumbs -->	114	</nav> <!-- /#breadcrumbs -->
107		115
108	<div class="main container-fluid">	116	<div class="main container-fluid">
Lines 154-161 Link Here
154	</ol>	162	</ol>
155	</fieldset> <!-- /.rows -->	163	</fieldset> <!-- /.rows -->
156		164
157	<fieldset class="rows" id="match_points">	165	<fieldset class="rows" id="match_points">
158	<h4>Match points</h4>	166	<h3>Match points</h3>
159	[% IF ( edit_matching_rule ) %]	167	[% IF ( edit_matching_rule ) %]
160	[% IF ( matchpoints ) %]	168	[% IF ( matchpoints ) %]
161	<p id="addMatchPoint" style="display:none;">	169	<p id="addMatchPoint" style="display:none;">
Lines 173-180 Link Here
173	[% IF ( edit_matching_rule ) %]	181	[% IF ( edit_matching_rule ) %]
174	[% FOREACH matchpoint IN matchpoints %]	182	[% FOREACH matchpoint IN matchpoints %]
175	<div id="mp_[% matchpoint.mp_num \| html %]" class="matchgroup">	183	<div id="mp_[% matchpoint.mp_num \| html %]" class="matchgroup">
176	<fieldset class="rows">	184	<fieldset>
177	<legend>Match point [% matchpoint.mp_num \| html %] \| <a href="#" class="button" onclick="InsertMatchpoint('mp_[% matchpoint.mp_num \| html %]', 'mp_template'); return false;">Add match point</a> \| <a href="#" class="button" onclick="DeleteMatchpoint(this); return false;">Remove this match point</a></legend>	185	<h3>Match point [% matchpoint.mp_num \| html %] \| <a href="#" class="button" onclick="InsertMatchpoint('mp_[% matchpoint.mp_num \| html %]', 'mp_template'); return false;">Add match point</a> \| <a href="#" class="button" onclick="DeleteMatchpoint(this); return false;">Remove this match point</a></h3>
178	<ol>	186	<ol>
179	<li>	187	<li>
180	<label for="mp_[% matchpoint.mp_num \| html %]_search_index">Search index: </label>	188	<label for="mp_[% matchpoint.mp_num \| html %]_search_index">Search index: </label>
Lines 186-193 Link Here
186	</li>	194	</li>
187	</ol>	195	</ol>
188	[% FOREACH component IN matchpoint.components %]	196	[% FOREACH component IN matchpoint.components %]
189	<fieldset class="rows" id="mp_[% matchpoint.mp_num \| html %]_c_[% component.comp_num \| html %]">	197	<fieldset id="mp_[% matchpoint.mp_num \| html %]_c_[% component.comp_num \| html %]">
190	<legend>Matchpoint components</legend>	198	<h3>Matchpoint components</h3>
191	<ol>	199	<ol>
192	<li>	200	<li>
193	<label for="mp_[% matchpoint.mp_num \| html %]_c_[% component.comp_num \| html %]_tag">Tag: </label>	201	<label for="mp_[% matchpoint.mp_num \| html %]_c_[% component.comp_num \| html %]_tag">Tag: </label>
Lines 224-231 Link Here
224	[% END # /FOREACH matchpoint %]	232	[% END # /FOREACH matchpoint %]
225	[% ELSE # IF ( edit_matching_rule ) %]	233	[% ELSE # IF ( edit_matching_rule ) %]
226	<div id="mp_1" class="matchgroup">	234	<div id="mp_1" class="matchgroup">
227	<fieldset class="rows">	235	<fieldset>
228	<legend>Match point 1 \| <a href="#" class="button" onclick="InsertMatchpoint('mp_1', 'mp_template'); return false;">Add match point</a> \| <a href="#" class="button" onclick="DeleteMatchpoint(this); return false;">Remove this match point</a></legend>	236	<h3>Match point 1 \| <a href="#" class="button" onclick="InsertMatchpoint('mp_1', 'mp_template'); return false;">Add match point</a> \| <a href="#" class="button" onclick="DeleteMatchpoint(this); return false;">Remove this match point</a></h3>
229	<ol>	237	<ol>
230	<li>	238	<li>
231	<label for="mp_1_search_index">Search index: </label>	239	<label for="mp_1_search_index">Search index: </label>
Lines 236-243 Link Here
236	<input type ="text" id="mp_1_score" name="mp_1_score" size="5" maxlength="5" />	244	<input type ="text" id="mp_1_score" name="mp_1_score" size="5" maxlength="5" />
237	</li>	245	</li>
238	</ol>	246	</ol>
239	<fieldset class="rows" id="mp_1_c_1">	247	<fieldset id="mp_1_c_1">
240	<legend>Matchpoint components</legend>	248	<h3>Matchpoint components</h3>
241	<ol>	249	<ol>
242	<li>	250	<li>
243	<label for="mp_1_c_1_tag">Tag: </label>	251	<label for="mp_1_c_1_tag">Tag: </label>
Lines 261-294 Link Here
261	</li>	269	</li>
262	</ol>	270	</ol>
263	</fieldset> <!-- /#mp_1_c_1 -->	271	</fieldset> <!-- /#mp_1_c_1 -->
264	</fieldset> <!-- /.rows -->	272	</fieldset>
265	<br style="clear:both;" />	273	<br style="clear:both;" />
266	</div> <!-- /#mp_1 -->	274	</div> <!-- /#mp_1 -->
267	[% END # /IF ( edit_matching_rule ) %]	275	[% END # /IF ( edit_matching_rule ) %]
268	</fieldset> <!-- /#match_points -->	276	</fieldset> <!-- /#match_points -->
269		277
270	<fieldset class="rows" id="match_checks">	278	<fieldset class="rows" id="match_checks">
271	<h4>Required match checks</h4>	279	<h3>Required match checks</h3>
272	[% IF ( edit_matching_rule ) %]	280	[% IF ( edit_matching_rule ) %]
273	[% IF ( matchchecks ) %]	281	[% IF ( matchchecks ) %]
274	<p id="addMatchCheck" style="display:none;">	282	<p id="addMatchCheck" style="display:none;">
275	[% ELSE %]	283	[% ELSE %]
276	<p id="addMatchCheck">	284	<p id="addMatchCheck">
277	[% END %]	285	[% END %]
278	<a href="#" class="button" onclick="InsertMatchcheck('mc_1', 'mc_template'); return false;">Add match check</a></p>	286	<a href="#" class="button" onclick="InsertMatchcheck('mc_1', 'mc_template'); return false;"> Add match check</a></p>
279	[% ELSE %]	287	[% ELSE %]
280	<p id="addMatchCheck" style="display:none;"><a href="#" class="button" onclick="InsertMatchcheck('mc_1', 'mc_template'); return false;">Add match check</a></p>	288	<p id="addMatchCheck" style="display:none;"><a href="#" class="button" onclick="InsertMatchcheck('mc_1', 'mc_template'); return false;"> Add match check</a></p>
281	[% END %]	289	[% END %]
282		290
283	[% IF ( edit_matching_rule ) %]	291	[% IF ( edit_matching_rule ) %]
284	[% FOREACH matchcheck IN matchchecks %]	292	[% FOREACH matchcheck IN matchchecks %]
285	<div id="mc_[% matchcheck.mc_num \| html %]" class="matchgroup">	293	<div id="mc_[% matchcheck.mc_num \| html %]" class="matchgroup">
286	<fieldset class="rows">	294	<fieldset>
287	<legend>Match check [% matchcheck.mc_num \| html %]<a href="#" class="button" onclick="InsertMatchcheck('mc_[% matchcheck.mc_num \| html %]', 'mc_template'); return false;">Add match check</a> \| <a href="#" class="button" onclick="DeleteMatchcheck(this); return false;">Remove this match check</a></legend>	295	<h3>Match check [% matchcheck.mc_num \| html %]<a href="#" class="button" onclick="InsertMatchcheck('mc_[% matchcheck.mc_num \| html %]', 'mc_template'); return false;"> Add match check</a> \| <a href="#" class="button" onclick="DeleteMatchcheck(this); return false;">Remove this match check</a></h3>
288	<input type="hidden" id="mc_[% matchcheck.mc_num \| html %]_id" name="mc_[% matchcheck.mc_num \| html %]_id" value="1" />	296	<input type="hidden" id="mc_[% matchcheck.mc_num \| html %]_id" name="mc_[% matchcheck.mc_num \| html %]_id" value="1" />
289	[% FOREACH src_component IN matchcheck.src_components %]	297	[% FOREACH src_component IN matchcheck.src_components %]
290	<fieldset class="rows" id="mc_[% src_component.mc_num \| html %]_src_c_[% src_component.comp_num \| html %]">	298	<fieldset id="mc_[% src_component.mc_num \| html %]_src_c_[% src_component.comp_num \| html %]">
291	<legend>Source (incoming) record check field</legend>	299	<h3>Source (incoming) record check field</h3>
292	<ol>	300	<ol>
293	<li>	301	<li>
294	<label for="mc_[% src_component.mc_num \| html %]_src_c_[% src_component.comp_num \| html %]_tag">Tag: </label>	302	<label for="mc_[% src_component.mc_num \| html %]_src_c_[% src_component.comp_num \| html %]_tag">Tag: </label>
Lines 318-325 Link Here
318	[% END # /FOREACH src_component %]	326	[% END # /FOREACH src_component %]
319		327
320	[% FOREACH tgt_component IN matchcheck.tgt_components %]	328	[% FOREACH tgt_component IN matchcheck.tgt_components %]
321	<fieldset class="rows" id="mc_[% matchcheck.mc_num \| html %]_tgt_c_[% tgt_component.comp_num \| html %]">	329	<fieldset id="mc_[% matchcheck.mc_num \| html %]_tgt_c_[% tgt_component.comp_num \| html %]">
322	<legend>Target (database) record check field</legend>	330	<h3>Target (database) record check field</h3>
323	<ol>	331	<ol>
324	<li>	332	<li>
325	<label for="mc_[% matchcheck.mc_num \| html %]_tgt_c_[% tgt_component.comp_num \| html %]_tag">Tag: </label>	333	<label for="mc_[% matchcheck.mc_num \| html %]_tgt_c_[% tgt_component.comp_num \| html %]_tag">Tag: </label>
Lines 347-363 Link Here
347	</ol>	355	</ol>
348	</fieldset> <!-- /#mc_[% matchcheck.mc_num \| html %]_tgt_c_[% tgt_component.comp_num \| html %] -->	356	</fieldset> <!-- /#mc_[% matchcheck.mc_num \| html %]_tgt_c_[% tgt_component.comp_num \| html %] -->
349	[% END # /FOREACH tgt_component %]	357	[% END # /FOREACH tgt_component %]
350	</fieldset> <!-- /.rows -->	358	</fieldset>
351	<br style="clear:both;" />	359	<br style="clear:both;" />
352	</div> <!-- /#mc_[% matchcheck.mc_num \| html %] -->	360	</div> <!-- /#mc_[% matchcheck.mc_num \| html %] -->
353	[% END # /FOREACH matchcheck %]	361	[% END # /FOREACH matchcheck %]
354	[% ELSE # IF ( edit_matching_rule ) %]	362	[% ELSE # IF ( edit_matching_rule ) %]
355	<div id="mc_1" class="matchgroup">	363	<div id="mc_1" class="matchgroup">
356	<fieldset class="rows">	364	<fieldset>
357	<legend>Match check 1 \| <a href="#" class="button" onclick="InsertMatchcheck('mc_1', 'mc_template'); return false;">Add match check</a> \| <a href="#" class="button" onclick="DeleteMatchcheck(this); return false;">Remove this match check</a></legend>	365	<h3>Match check 1 \| <a href="#" class="button" onclick="InsertMatchcheck('mc_1', 'mc_template'); return false;">Add match check</a> \| <a href="#" class="button" onclick="DeleteMatchcheck(this); return false;">Remove this match check</a></h3>
358	<input type="hidden" id="mc_1_id" name="mc_1_id" value="1" />	366	<input type="hidden" id="mc_1_id" name="mc_1_id" value="1" />
359	<fieldset class="rows" id="mc_1_src_c_1">	367	<fieldset id="mc_1_src_c_1">
360	<legend>Source (incoming) record check field</legend>	368	<h3>Source (incoming) record check field</h3>
361	<ol>	369	<ol>
362	<li>	370	<li>
363	<label for="mc_1_src_c_1_tag">Tag: </label>	371	<label for="mc_1_src_c_1_tag">Tag: </label>
Lines 382-389 Link Here
382	</ol>	390	</ol>
383	</fieldset>	391	</fieldset>
384		392
385	<fieldset class="rows" id="mc_1_tgt_c_1">	393	<fieldset id="mc_1_tgt_c_1">
386	<legend>Target (database) record check field</legend>	394	<h3>Target (database) record check field</h3>
387	<ol>	395	<ol>
388	<li>	396	<li>
389	<label for="mc_1_tgt_c_1_tag">Tag: </label>	397	<label for="mc_1_tgt_c_1_tag">Tag: </label>
Lines 407-425 Link Here
407	</li>	415	</li>
408	</ol>	416	</ol>
409	</fieldset> <!-- /#mc_1_tgt_c_1 -->	417	</fieldset> <!-- /#mc_1_tgt_c_1 -->
410	</fieldset> <!-- /.rows -->	418	</fieldset>
411	<br style="clear:both;" />	419	<br style="clear:both;" />
412	</div> <!-- /#mc_1 -->	420	</div> <!-- /#mc_1 -->
413	[% END # /IF ( edit_matching_rule ) %]
414	</fieldset>
415	<fieldset class="action">	421	<fieldset class="action">
416	[% IF ( edit_matching_rule ) %]	422	[% IF ( edit_matching_rule ) %]
417	<input type="button" value="Save" onclick="CheckMatchingRuleForm(this.form)" />	423	<input type="button" class="principal" value="Save" onclick="CheckMatchingRuleForm(this.form)" />
418	[% ELSE %]	424	[% ELSE %]
419	<input type="button" value="Save" onclick="CheckMatchingRuleForm(this.form)" />	425	<input type="button" class="principal" value="Save" onclick="CheckMatchingRuleForm(this.form)" />
420	[% END %]	426	[% END %]
421	<a class="cancel" href="/cgi-bin/koha/admin/matching-rules.pl">Cancel</a>	427	<a class="cancel" href="/cgi-bin/koha/admin/matching-rules.pl">Cancel</a>
422	</fieldset> <!-- /.action -->	428	</fieldset> <!-- /.action -->
		429	[% END # /IF ( edit_matching_rule ) %]
		430	</fieldset> <!-- /.rows -->
423	</form>	431	</form>
424	[% END # /IF ( matching_rule_form ) %]	432	[% END # /IF ( matching_rule_form ) %]
425		433
Lines 440-447 Link Here
440	[% IF ( display_list ) %]	448	[% IF ( display_list ) %]
441		449
442	<div id="toolbar" class="btn-toolbar">	450	<div id="toolbar" class="btn-toolbar">
443	<a class="btn btn-default" id="newrule" href="[% script_name \| url %]?op=add_matching_rule"><i class="fa fa-plus"></i> New record matching rule</a>	451	<div>
444	</div>	452	<a class="pat" id="newrule" href="[% script_name \| url %]?op=add_matching_rule"><i class="fa fa-plus"></i> New record matching rule</a>
		453	</div></div>
445		454
446	<h1>Record matching rules</h1>	455	<h1>Record matching rules</h1>
447		456
Lines 455-460 Link Here
455	<div class="dialog message">Deleted record matching rule "[% deleted_matching_rule \| html %]"</div>	464	<div class="dialog message">Deleted record matching rule "[% deleted_matching_rule \| html %]"</div>
456	[% END %]	465	[% END %]
457	[% IF ( available_matching_rules ) %]	466	[% IF ( available_matching_rules ) %]
		467	<div id="searchresults">
458	<table>	468	<table>
459	<tr>	469	<tr>
460	<th>#</th>	470	<th>#</th>
Lines 468-479 Link Here
468	<td>[% available_matching_rule.code \| html %]</td>	478	<td>[% available_matching_rule.code \| html %]</td>
469	<td>[% available_matching_rule.description \| html %]</td>	479	<td>[% available_matching_rule.description \| html %]</td>
470	<td class="actions">	480	<td class="actions">
471	<a class="btn btn-default btn-xs" href="[% available_matching_rule.script_name \| url %]?op=edit_matching_rule&matcher_id=[% available_matching_rule.matcher_id \| uri %]"><i class="fa fa-pencil"></i> Edit</a>	481	<a class="btn btn-default btn-xs" href="[% available_matching_rule.script_name \| url %]?op=edit_matching_rule&matcher_id=[% available_matching_rule.matcher_id \| uri %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a>
472	<a class="btn btn-default btn-xs" href="[% available_matching_rule.script_name \| url %]?op=delete_matching_rule&matcher_id=[% available_matching_rule.matcher_id \| uri %]"><i class="fa fa-trash"></i> Delete</a>	482	<a class="btn btn-default btn-xs" href="[% available_matching_rule.script_name \| url %]?op=delete_matching_rule&matcher_id=[% available_matching_rule.matcher_id \| uri %]" id="lientype"><i class="fa fa-trash"></i> Delete</a>
473	</td>	483	</td>
474	</tr>	484	</tr>
475	[% END %]	485	[% END %]
476	</table>	486	</table>
		487	</div>
477	[% ELSE %]	488	[% ELSE %]
478	<p>There are no saved matching rules.</p>	489	<p>There are no saved matching rules.</p>
479	[% END # /IF ( available_matching_rules ) %]	490	[% END # /IF ( available_matching_rules ) %]
Lines 483-490 Link Here
483		494
484	[% IF ( matching_rule_form ) %]	495	[% IF ( matching_rule_form ) %]
485	<div id="mp_template" class="matchgroup" style="display:none;">	496	<div id="mp_template" class="matchgroup" style="display:none;">
486	<fieldset class="rows">	497	<fieldset>
487	<legend>Match point <span class="counter"></span> \| <a href="#" class="button" onclick="DeleteMatchpoint(this); return false;">Remove this match point</a></legend>	498	<h3>Match point <span class="counter"></span> \| <a href="#" class="button" onclick="DeleteMatchpoint(this); return false;">Remove this match point</a></h3>
488	<ol>	499	<ol>
489	<li>	500	<li>
490	<label for="mp_num_search_index">Search index: </label>	501	<label for="mp_num_search_index">Search index: </label>
Lines 495-502 Link Here
495	<input type ="text" id="mp_num_score" name="mp_num_score" size="5" maxlength="5" />	506	<input type ="text" id="mp_num_score" name="mp_num_score" size="5" maxlength="5" />
496	</li>	507	</li>
497	</ol>	508	</ol>
498	<fieldset id="mp_num_c_1" class="rows">	509	<fieldset id="mp_num_c_1">
499	<legend>Matchpoint components</legend>	510	<h3>Matchpoint components</h3>
500	<ol>	511	<ol>
501	<li>	512	<li>
502	<label for="mp_num_c_1_tag">Tag: </label>	513	<label for="mp_num_c_1_tag">Tag: </label>
Lines 520-535 Link Here
520	</li>	531	</li>
521	</ol>	532	</ol>
522	</fieldset> <!-- /#mp_num_c_1 -->	533	</fieldset> <!-- /#mp_num_c_1 -->
523	</fieldset> <!-- /.rows -->	534	</fieldset>
524	<br style="clear:both;" />	535	<br style="clear:both;" />
525	</div> <!-- /#mp_template -->	536	</div> <!-- /#mp_template -->
526		537
527	<div id="mc_template" class="matchgroup" style="display:none">	538	<div id="mc_template" class="matchgroup" style="display:none">
528	<fieldset class="rows">	539	<fieldset>
529	<legend>Match check <span class="counter"></span> \| <a href="#" class="button" onclick="DeleteMatchcheck(this); return false;">Remove this match check</a></legend>	540	<h3>Match check <span class="counter"></span> \| <a href="#" class="button" onclick="DeleteMatchcheck(this); return false;">Remove this match check</a></h3>
530	<input type="hidden" id="mc_num_id" name="mc_num_id" value="1" />	541	<input type="hidden" id="mc_num_id" name="mc_num_id" value="1" />
531	<fieldset class="rows" id="mc_num_src_c_1">	542	<fieldset id="mc_num_src_c_1">
532	<legend>Source (incoming) record check field</legend>	543	<h3>Source (incoming) record check field</h3>
533	<ol>	544	<ol>
534	<li>	545	<li>
535	<label for="mc_num_src_c_1_tag">Tag: </label>	546	<label for="mc_num_src_c_1_tag">Tag: </label>
Lines 553-560 Link Here
553	</li>	564	</li>
554	</ol>	565	</ol>
555	</fieldset> <!-- /#mc_num_src_c_1 -->	566	</fieldset> <!-- /#mc_num_src_c_1 -->
556	<fieldset class="rows" id="mc_num_tgt_c_1">	567	<fieldset id="mc_num_tgt_c_1">
557	<legend>Target (database) record check field</legend>	568	<h3>Target (database) record check field</h3>
558	<ol>	569	<ol>
559	<li>	570	<li>
560	<label for="mc_num_tgt_c_1_tag">Tag: </label>	571	<label for="mc_num_tgt_c_1_tag">Tag: </label>
Lines 578-584 Link Here
578	</li>	589	</li>
579	</ol>	590	</ol>
580	</fieldset> <!-- #mc_num_tgt_c_1 -->	591	</fieldset> <!-- #mc_num_tgt_c_1 -->
581	</fieldset> <!-- /.rows -->	592	</fieldset>
582	<br style="clear:both;" />	593	<br style="clear:both;" />
583	</div> <!-- /#mc_template -->	594	</div> <!-- /#mc_template -->
584	[% END # /IF ( matching_rule_form ) %]	595	[% END # /IF ( matching_rule_form ) %]

Lines 1-14 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt (-2 / +10 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'prefs-admin-search.inc' %]
		6	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
5	<title>OAI set mappings &rsaquo; OAI sets &rsaquo; Administration &rsaquo; Koha</title>	8	<title>OAI set mappings &rsaquo; OAI sets &rsaquo; Administration &rsaquo; Koha</title>
6	[% INCLUDE 'doc-head-close.inc' %]	9	[% INCLUDE 'doc-head-close.inc' %]
7	</head>	10	</head>
8		11
9	<body id="admin_oai_set_mappings" class="admin">	12	<body id="admin_oai_set_mappings" class="admin">
10	[% INCLUDE 'header.inc' %]	13	[% INCLUDE 'header.inc' form=formulaire %]
11	[% INCLUDE 'prefs-admin-search.inc' %]
12		14
13	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	15	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
14	<ol>	16	<ol>
Lines 25-30 Link Here
25	<a href="#" aria-current="page">OAI set mappings</a>	27	<a href="#" aria-current="page">OAI set mappings</a>
26	</li>	28	</li>
27	</ol>	29	</ol>
		30	<ol>
		31	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		32	</ol>
		33	<ol>
		34	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		35	</ol>
28	</nav>	36	</nav>
29		37
30	<div class="main container-fluid">	38	<div class="main container-fluid">

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt (-9 / +20 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'prefs-admin-search.inc' %]
		6	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
5	<title>	8	<title>
6	[% IF ( op_new ) %]	9	[% IF ( op_new ) %]
Lines 11-18 Link Here
11	</head>	14	</head>
12		15
13	<body id="admin_oai_sets" class="admin">	16	<body id="admin_oai_sets" class="admin">
14	[% INCLUDE 'header.inc' %]	17	[% INCLUDE 'header.inc' form=formulaire %]
15	[% INCLUDE 'prefs-admin-search.inc' %]
16		18
17	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	19	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
18	<ol>	20	<ol>
Lines 51-56 Link Here
51	</li>	53	</li>
52	[% END %]	54	[% END %]
53	</ol>	55	</ol>
		56	<ol>
		57	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		58	</ol>
		59	<ol>
		60	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		61	</ol>
54	</nav>	62	</nav>
55		63
56	<div class="main container-fluid">	64	<div class="main container-fluid">
Lines 90-108 Link Here
90	<li id="adddescription"><span class="label"> </span><a href="#" class="add_description"><i class="fa fa-fw fa-plus"></i> Add description</a></li>	98	<li id="adddescription"><span class="label"> </span><a href="#" class="add_description"><i class="fa fa-fw fa-plus"></i> Add description</a></li>
91		99
92	</ol>	100	</ol>
93	</fieldset>
94	<fieldset class="action">	101	<fieldset class="action">
95	<input type="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/oai_sets.pl">Cancel</a>	102	<input type="submit" class="principal" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/oai_sets.pl">Cancel</a>
		103	</fieldset>
96	</fieldset>	104	</fieldset>
97	</form>	105	</form>
98	[% ELSE %]	106	[% ELSE %]
99		107
100	<div id="toolbar" class="btn-toolbar">	108	<div id="toolbar" class="btn-toolbar">
101	<a class="btn btn-default" id="newoaiset" href="/cgi-bin/koha/admin/oai_sets.pl?op=new"><i class="fa fa-plus"></i> New set</a>	109	<div>
102	</div>	110	<a class="pat" id="newoaiset" href="/cgi-bin/koha/admin/oai_sets.pl?op=new"><i class="fa fa-plus"></i> New set</a>
		111	</div></div>
103		112
104	<h1>OAI sets</h1>	113	<h1>OAI sets</h1>
105	[% IF sets_loop %]	114	[% IF sets_loop %]
		115	<div id="searchresults">
106	<table>	116	<table>
107	<thead>	117	<thead>
108	<tr>	118	<tr>
Lines 133-141 Link Here
133	<a class="btn btn-default btn-xs dropdown-toggle" id="oaisetsactions[% set.id \| html %]" role="button" data-toggle="dropdown" href="#">	143	<a class="btn btn-default btn-xs dropdown-toggle" id="oaisetsactions[% set.id \| html %]" role="button" data-toggle="dropdown" href="#">
134	Actions <b class="caret"></b></a>	144	Actions <b class="caret"></b></a>
135	<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="oaisetsactions[% set.id \| html %]">	145	<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="oaisetsactions[% set.id \| html %]">
136	<li><a href="/cgi-bin/koha/admin/oai_sets.pl?op=mod&id=[% set.id \| uri %]"><i class="fa fa-fw fa-pencil"></i> Edit</a></li>	146	<li><a href="/cgi-bin/koha/admin/oai_sets.pl?op=mod&id=[% set.id \| uri %]" id="lientype"><i class="fa fa-fw fa-pencil"></i> Edit</a></li>
137	<li><a class="delete_oai_set" href="/cgi-bin/koha/admin/oai_sets.pl?op=del&id=[% set.id \| html %]"><i class="fa fa-fw fa-trash"></i> Delete</a></li>	147	<li><a class="delete_oai_set" href="/cgi-bin/koha/admin/oai_sets.pl?op=del&id=[% set.id \| html %]" id="lientype"><i class="fa fa-fw fa-trash"></i> Delete</a></li>
138	<li><a href="/cgi-bin/koha/admin/oai_set_mappings.pl?id=[% set.id \| uri %]"><i class="fa fa-fw fa-info"></i> Define mappings</a></li>	148	<li><a href="/cgi-bin/koha/admin/oai_set_mappings.pl?id=[% set.id \| uri %]" id="lientype"><i class="fa fa-fw fa-info"></i> Define mappings</a></li>
139	</ul>	149	</ul>
140	</div>	150	</div>
141	</td>	151	</td>
Lines 143-148 Link Here
143	[% END %]	153	[% END %]
144	</tbody>	154	</tbody>
145	</table>	155	</table>
		156	</div>
146	[% ELSE %]	157	[% ELSE %]
147	<div class="dialog message"><p>There are no sets defined.</p></div>	158	<div class="dialog message"><p>There are no sets defined.</p></div>
148	[% END %]	159	[% END %]

Lines 3-8 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt (-2 / +10 lines)
3	[% USE Branches %]	3	[% USE Branches %]
4	[% USE HtmlTags %]	4	[% USE HtmlTags %]
5	[% SET footerjs = 1 %]	5	[% SET footerjs = 1 %]
		6	[% formulaire = BLOCK %]
		7	[% INCLUDE 'prefs-admin-search.inc' %]
		8	[% END %]
6	[% INCLUDE 'doc-head-open.inc' %]	9	[% INCLUDE 'doc-head-open.inc' %]
7	<title>OverDrive library authnames &rsaquo; Administration &rsaquo; Koha</title>	10	<title>OverDrive library authnames &rsaquo; Administration &rsaquo; Koha</title>
8	[% INCLUDE 'doc-head-close.inc' %]	11	[% INCLUDE 'doc-head-close.inc' %]
Lines 10-17 Link Here
10		13
11	<body id="admin_overdrive" class="admin">	14	<body id="admin_overdrive" class="admin">
12		15
13	[% INCLUDE 'header.inc' %]	16	[% INCLUDE 'header.inc' form=formulaire %]
14	[% INCLUDE 'prefs-admin-search.inc' %]
15		17
16	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	18	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
17	<ol>	19	<ol>
Lines 25-30 Link Here
25	<a href="#" aria-current="page">OverDrive library authnames</a>	27	<a href="#" aria-current="page">OverDrive library authnames</a>
26	</li>	28	</li>
27	</ol>	29	</ol>
		30	<ol>
		31	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		32	</ol>
		33	<ol>
		34	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		35	</ol>
28	</nav>	36	</nav>
29		37
30	<div class="main container-fluid">	38	<div class="main container-fluid">

Lines 5-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt (-8 / +20 lines)
5	[% USE Branches %]	5	[% USE Branches %]
6	[% USE scalar %]	6	[% USE scalar %]
7	[% SET footerjs = 1 %]	7	[% SET footerjs = 1 %]
		8	[% formulaire = BLOCK %]
		9	[% INCLUDE 'prefs-admin-search.inc' %]
		10	[% END %]
8	[% INCLUDE 'doc-head-open.inc' %]	11	[% INCLUDE 'doc-head-open.inc' %]
9	<title>	12	<title>
10	[% IF ( attribute_type_form ) %]	13	[% IF ( attribute_type_form ) %]
Lines 22-29 Patron attribute types &rsaquo; Administration &rsaquo; Koha Link Here
22	</head>	25	</head>
23		26
24	<body id="admin_patron-attr-types" class="admin">	27	<body id="admin_patron-attr-types" class="admin">
25	[% INCLUDE 'header.inc' %]	28	[% INCLUDE 'header.inc' form=formulaire %]
26	[% INCLUDE 'prefs-admin-search.inc' %]
27		29
28	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	30	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
29	<ol>	31	<ol>
Lines 66-71 Patron attribute types &rsaquo; Administration &rsaquo; Koha Link Here
66	</li>	68	</li>
67	[% END %]	69	[% END %]
68	</ol>	70	</ol>
		71	<ol>
		72	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		73	</ol>
		74	<ol>
		75	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		76	</ol>
69	</nav>	77	</nav>
70		78
71	<div class="main container-fluid">	79	<div class="main container-fluid">
Lines 241-251 Patron attribute types &rsaquo; Administration &rsaquo; Koha Link Here
241	</div>	249	</div>
242	</li>	250	</li>
243	</ol>	251	</ol>
244	</fieldset>
245	<fieldset class="action">	252	<fieldset class="action">
246	<input type="submit" value="Save" />	253	<input type="submit" class="principal" value="Save" />
247	<a class="cancel" href="/cgi-bin/koha/admin/patron-attr-types.pl">Cancel</a>	254	<a class="cancel" href="/cgi-bin/koha/admin/patron-attr-types.pl">Cancel</a>
248	</fieldset>	255	</fieldset>
		256	</fieldset>
249	</form>	257	</form>
250	[% END %]	258	[% END %]
251		259
Lines 266-273 Patron attribute types &rsaquo; Administration &rsaquo; Koha Link Here
266	[% IF ( display_list ) %]	274	[% IF ( display_list ) %]
267		275
268	<div id="toolbar" class="btn-toolbar">	276	<div id="toolbar" class="btn-toolbar">
269	<a class="btn btn-default" id="newrule" href="[% script_name \| url %]?op=add_attribute_type"><i class="fa fa-plus"></i> New patron attribute type</a>	277	<div>
270	</div>	278	<a class="pat" id="newrule" href="[% script_name \| url %]?op=add_attribute_type"><i class="fa fa-plus"></i> New patron attribute type</a>
		279	</div></div>
		280
271		281
272	<h1>Patron attribute types</h1>	282	<h1>Patron attribute types</h1>
273	[% IF ( added_attribute_type ) %]	283	[% IF ( added_attribute_type ) %]
Lines 288-293 Patron attribute types &rsaquo; Administration &rsaquo; Koha Link Here
288	— it was already absent from the database.</div>	298	— it was already absent from the database.</div>
289	[% END %]	299	[% END %]
290	[% IF ( available_attribute_types ) %]	300	[% IF ( available_attribute_types ) %]
		301	<div id="searchresults">
291	[% FOREACH attribute IN available_attribute_types %]	302	[% FOREACH attribute IN available_attribute_types %]
292	[% IF attribute.class %]	303	[% IF attribute.class %]
293	<h4>[% attribute.lib \| html %]</h4>	304	<h4>[% attribute.lib \| html %]</h4>
Lines 340-347 Patron attribute types &rsaquo; Administration &rsaquo; Koha Link Here
340	[% END %]	351	[% END %]
341	</td>	352	</td>
342	<td class="actions">	353	<td class="actions">
343	<a class="btn btn-default btn-xs" href="[% script_name \| url %]?op=edit_attribute_type&code=[% item.code \| uri %]"><i class="fa fa-pencil"></i> Edit</a>	354	<a class="btn btn-default btn-xs" href="[% script_name \| url %]?op=edit_attribute_type&code=[% item.code \| uri %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a>
344	<a class="btn btn-default btn-xs" href="[% script_name \| url %]?op=delete_attribute_type&code=[% item.code \| uri %]"><i class="fa fa-trash"></i> Delete</a>	355	<a class="btn btn-default btn-xs" href="[% script_name \| url %]?op=delete_attribute_type&code=[% item.code \| uri %]" id="lientype"><i class="fa fa-trash"></i> Delete</a>
345	</td>	356	</td>
346	</tr>	357	</tr>
347	[% END %]	358	[% END %]
Lines 350-355 Patron attribute types &rsaquo; Administration &rsaquo; Koha Link Here
350	[% END %]	361	[% END %]
351	[% ELSE %]	362	[% ELSE %]
352	<p>There are no saved patron attribute types.</p>	363	<p>There are no saved patron attribute types.</p>
		364	</div>
353	[% END %]	365	[% END %]
354		366
355	<div class="pages">[% pagination_bar \| $raw %]</div>	367	<div class="pages">[% pagination_bar \| $raw %]</div>

Lines 4-9 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt (-4 / +12 lines)
4	[% USE Koha %]	4	[% USE Koha %]
5	[% USE HtmlId %]	5	[% USE HtmlId %]
6	[% SET footerjs = 1 %]	6	[% SET footerjs = 1 %]
		7	[% formulaire = BLOCK %]
		8	[% INCLUDE 'prefs-admin-search.inc' %]
		9	[% END %]
7	[% INCLUDE 'doc-head-open.inc' %]	10	[% INCLUDE 'doc-head-open.inc' %]
8	<title>System preferences &rsaquo; Administration &rsaquo; Koha</title>	11	<title>System preferences &rsaquo; Administration &rsaquo; Koha</title>
9	[% INCLUDE 'doc-head-close.inc' %]	12	[% INCLUDE 'doc-head-close.inc' %]
Lines 14-21 Link Here
14	[% Asset.css("lib/codemirror/lint.min.css") \| $raw %]	17	[% Asset.css("lib/codemirror/lint.min.css") \| $raw %]
15	</head>	18	</head>
16	<body id="admin_preferences" class="admin">	19	<body id="admin_preferences" class="admin">
17	[% INCLUDE 'header.inc' %]	20	[% INCLUDE 'header.inc' form=formulaire %]
18	[% INCLUDE 'prefs-admin-search.inc' %]
19		21
20	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	22	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
21	<ol>	23	<ol>
Lines 31-36 Link Here
31	</a>	33	</a>
32	</li>	34	</li>
33	</ol>	35	</ol>
		36	<ol>
		37	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		38	</ol>
		39	<ol>
		40	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		41	</ol>
34	</nav>	42	</nav>
35		43
36	<div class="main container-fluid">	44	<div class="main container-fluid">
Lines 55-61 Link Here
55	<div class="prefs-tab">	63	<div class="prefs-tab">
56	<h2>[% TAB.tab_title \| html %] preferences</h2>	64	<h2>[% TAB.tab_title \| html %] preferences</h2>
57	<form action="/cgi-bin/koha/admin/preferences.pl" method="post">	65	<form action="/cgi-bin/koha/admin/preferences.pl" method="post">
58	[% UNLESS ( searchfield ) %]<div id="toolbar"><button class="save-all submit" type="submit">Save all [% TAB.tab_title \| html %] preferences</button></div>[% END %]	66	[% UNLESS ( searchfield ) %]<div id="toolbar"><button class="save-all submit principal" type="submit">Save all [% TAB.tab_title \| html %] preferences</button></div>[% END %]
59	<input type="hidden" name="op" value="save" />	67	<input type="hidden" name="op" value="save" />
60	<input type="hidden" name="tab" value="[% TAB.tab_id \| html %]" />	68	<input type="hidden" name="tab" value="[% TAB.tab_id \| html %]" />
61		69
Lines 197-203 Link Here
197	[% IF ( loop.last ) %]</tbody></table>[% END %]	205	[% IF ( loop.last ) %]</tbody></table>[% END %]
198	[% END %]	206	[% END %]
199	[% END %]	207	[% END %]
200	<fieldset class="action"><button class="save-all submit" type="submit">Save all [% TAB.tab_title \| html %] preferences</button> <a href="/cgi-bin/koha/admin/preferences.pl" class="force_reload cancel">Cancel</a></fieldset>	208	<fieldset class="action"><button class="save-all submit principal" type="submit">Save all [% TAB.tab_title \| html %] preferences</button> <a href="/cgi-bin/koha/admin/preferences.pl" class="force_reload cancel">Cancel</a></fieldset>
201	</form>	209	</form>
202	</div>	210	</div>
203	[% END %]	211	[% END %]

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt (-17 / +44 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'prefs-admin-search.inc' %]
		6	[% END %]
4	[% PROCESS 'i18n.inc' %]	7	[% PROCESS 'i18n.inc' %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	<title>Search engine configuration (Elasticsearch) &rsaquo; Administration &rsaquo; Koha</title>	9	<title>Search engine configuration (Elasticsearch) &rsaquo; Administration &rsaquo; Koha</title>
Lines 13-20 a.add, a.delete { Link Here
13	</head>	16	</head>
14		17
15	<body id="admin_searchengine_mappings" class="admin">	18	<body id="admin_searchengine_mappings" class="admin">
16	[% INCLUDE 'header.inc' %]	19	[% INCLUDE 'header.inc' form=formulaire %]
17	[% INCLUDE 'prefs-admin-search.inc' %]
18		20
19	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	21	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
20	<ol>	22	<ol>
Lines 30-35 a.add, a.delete { Link Here
30	</a>	32	</a>
31	</li>	33	</li>
32	</ol>	34	</ol>
		35	<ol>
		36	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		37	</ol>
		38	<ol>
		39	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		40	</ol>
33	</nav>	41	</nav>
34		42
35	[% INCLUDE 'blocking_errors.inc' %]	43	[% INCLUDE 'blocking_errors.inc' %]
Lines 69-75 a.add, a.delete { Link Here
69	</div>	77	</div>
70	[% END %]	78	[% END %]
71		79
72	<h1>Search engine configuration (Elasticsearch)</h1>	80	<h2>Search engine configuration (Elasticsearch)</h2>
73		81
74	[% IF errors %]	82	[% IF errors %]
75	<div class="dialog alert">	83	<div class="dialog alert">
Lines 114-125 a.add, a.delete { Link Here
114	</ol>	122	</ol>
115	</div>	123	</div>
116		124
117	<form id="es_mappings" method="post">	125	<form method="post">
118	<div id="tabs" class="toptabs">	126	<div id=searchresults>
119	<ul class="nav nav-tabs" role="tablist">	127	<div id="tabs" class="toptabs ui-tabs" style="clear:both">
120	<li role="presentation" class="active">	128	<ul>
121	<a href="#search_fields" data-tab="search_fields" aria-controls="search_fields" role="tab" data-toggle="tab" >Search fields</a>	129	<li><a href="#search_fields">Search fields</a></li>
122	</li>
123	[% FOREACH index IN indexes %]	130	[% FOREACH index IN indexes %]
124	[% SWITCH index.index_name %]	131	[% SWITCH index.index_name %]
125	[% CASE 'biblios' %]	132	[% CASE 'biblios' %]
Lines 363-370 a.add, a.delete { Link Here
363	[% ELSE %]	370	[% ELSE %]
364	<td><a class="btn btn-default btn-xs delete" style="cursor: pointer;"><i class="fa fa-trash"></i> Delete</a></td>	371	<td><a class="btn btn-default btn-xs delete" style="cursor: pointer;"><i class="fa fa-trash"></i> Delete</a></td>
365	[% END %]	372	[% END %]
366	</tr>	373	</select>
		374	</td>
		375	<td>
		376	<input name="mapping_marc_field" type="text" value="[% mapping.marc_field \| html %]" />
		377	</td>
		378	[% IF mapping.search_field_mandatory %]
		379	<td><a class="btn btn-default btn-xs delete mandatory" data-field_name="[% mapping.search_field_name \| html %]" style="cursor: pointer;" id="lientype"><i class="fa fa-trash"></i> Delete</a></td>
		380	[% ELSE %]
		381	<td><a class="btn btn-default btn-xs delete" style="cursor: pointer;" id="lientype"><i class="fa fa-trash"></i> Delete</a></td>
367	[% END %]	382	[% END %]
		383	</tr>
368	[% END %]	384	[% END %]
369	</tbody>	385	</tbody>
370	<tfoot>	386	<tfoot>
Lines 423-433 a.add, a.delete { Link Here
423	</tfoot>	439	</tfoot>
424	</table>	440	</table>
425		441
426	[% IF index.index_name == 'biblios' %]	442
427	<h3>Facet order</h3>	443	[% IF index.index_name == 'biblios' %]
428	<div id="facet_[% index.index_name \| html %]" class="ui-tabs-panel">	444
429	<table>	445	<h3>Facet order</h3>
430	<thead>	446	<div id="facet_[% index.index_name \| html %]" class="ui-tabs-panel">
		447	<table>
		448	<thead>
		449	<tr>
		450	<th>Search field</th>
		451	<th>Label</th>
		452	<th>Display</th>
		453	</tr>
		454	</thead>
		455	<tbody>
		456	[% FOREACH f IN facetable_fields %]
431	<tr>	457	<tr>
432	<th>Search field</th>	458	<th>Search field</th>
433	<th>Label</th>	459	<th>Label</th>
Lines 473-481 a.add, a.delete { Link Here
473	</div> <!-- /.tab-content -->	499	</div> <!-- /.tab-content -->
474	</div> <!-- /#tabs -->	500	</div> <!-- /#tabs -->
475	<fieldset class="action">	501	<fieldset class="action">
476	<button class="btn btn-default" type="submit" name="op" value="edit"><i class="fa fa-hdd-o" aria-hidden="true"></i> Save</button>	502	<button class="btn btn-default" type="submit" name="op" value="edit" id="lientype"><i class="fa fa-hdd-o" aria-hidden="true"></i> Save</button>
477	<button class="btn btn-default" type="submit" name="op" value="reset_confirm"><i class="fa fa-refresh" aria-hidden="true"></i> Reset mappings</button>	503	<button class="btn btn-default" type="submit" name="op" value="reset_confirm" id="lientype"><i class="fa fa-refresh" aria-hidden="true"></i> Reset mappings</button>
478	</fieldset>	504	</fieldset>
		505	</div>
479	</form>	506	</form>
480		507
481	</main>	508	</main>

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt (-2 / +10 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'cat-search.inc' %]
		6	[% END %]
4	[% USE Koha %]	7	[% USE Koha %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	<title>Share content with Mana KB &rsaquo; Administration &rsaquo; Koha</title>	9	<title>Share content with Mana KB &rsaquo; Administration &rsaquo; Koha</title>
Lines 8-15 Link Here
8	</head>	11	</head>
9		12
10	<body id="admin_share_content" class="admin">	13	<body id="admin_share_content" class="admin">
11	[% INCLUDE 'header.inc' %]	14	[% INCLUDE 'header.inc' form=formulaire %]
12	[% INCLUDE 'cat-search.inc' %]
13		15
14	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	16	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
15	<ol>	17	<ol>
Lines 25-30 Link Here
25	</a>	27	</a>
26	</li>	28	</li>
27	</ol>	29	</ol>
		30	<ol>
		31	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		32	</ol>
		33	<ol>
		34	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		35	</ol>
28	</nav>	36	</nav>
29		37
30	<div class="main container-fluid">	38	<div class="main container-fluid">

Lines 7-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt (-23 / +39 lines)
7	[% USE ItemTypes %]	7	[% USE ItemTypes %]
8	[% USE CirculationRules %]	8	[% USE CirculationRules %]
9	[% SET footerjs = 1 %]	9	[% SET footerjs = 1 %]
		10	[% formulaire = BLOCK %]
		11	[% INCLUDE 'prefs-admin-search.inc' %]
		12	[% END %]
10		13
11	[% SET branchcode = humanbranch \|\| undef %]	14	[% SET branchcode = humanbranch \|\| undef %]
12		15
Lines 28-35 Link Here
28	</head>	31	</head>
29		32
30	<body id="admin_smart-rules" class="admin">	33	<body id="admin_smart-rules" class="admin">
31	[% INCLUDE 'header.inc' %]	34	[% INCLUDE 'header.inc' form=formulaire %]
32	[% INCLUDE 'prefs-admin-search.inc' %]
33		35
34	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	36	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
35	<ol>	37	<ol>
Lines 45-50 Link Here
45	</a>	47	</a>
46	</li>	48	</li>
47	</ol>	49	</ol>
		50	<ol>
		51	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		52	</ol>
		53	<ol>
		54	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		55	</ol>
48	</nav>	56	</nav>
49		57
50	<div class="main container-fluid">	58	<div class="main container-fluid">
Lines 52-64 Link Here
52	<div class="col-sm-10 col-sm-push-2">	60	<div class="col-sm-10 col-sm-push-2">
53	<main>	61	<main>
54		62
55	<h1 class="parameters">	63	<h2 class="parameters">
56	[% IF humanbranch %]	64	[% IF humanbranch %]
57	Defining circulation and fine rules for "[% Branches.GetName( humanbranch ) \| html %]"	65	Defining circulation and fine rules for "[% Branches.GetName( humanbranch ) \| html %]"
58	[% ELSE %]	66	[% ELSE %]
59	Defining circulation and fine rules for all libraries	67	Defining circulation and fine rules for all libraries
60	[% END %]	68	[% END %]
61	</h1>	69	</h2>
62	<div class="help">	70	<div class="help">
63	<p>The rules are applied from most specific to less specific, using the first found in this order:</p>	71	<p>The rules are applied from most specific to less specific, using the first found in this order:</p>
64	<ul>	72	<ul>
Lines 93-104 Link Here
93	<select name="tobranch" id="tobranch">	101	<select name="tobranch" id="tobranch">
94	[% PROCESS options_for_libraries libraries => Branches.all( unfiltered => 1 ) %]	102	[% PROCESS options_for_libraries libraries => Branches.all( unfiltered => 1 ) %]
95	</select>	103	</select>
96	<input type="submit" id="clone_rules" value="Clone" />	104	<input type="submit" id="clone_rules" class="principal" value="Clone" />
97	</form>	105	</form>
98	[% END %]	106	[% END %]
99	[% END %]	107	[% END %]
100		108
101	<form method="post" action="/cgi-bin/koha/admin/smart-rules.pl">	109	<form method="post" action="/cgi-bin/koha/admin/smart-rules.pl">
		110	<div id="searchresults">
102	<input type="hidden" name="op" value="add" />	111	<input type="hidden" name="op" value="add" />
103	<input type="hidden" name="branch" value="[% current_branch \| html %]"/>	112	<input type="hidden" name="branch" value="[% current_branch \| html %]"/>
104	<table id="default-circulation-rules">	113	<table id="default-circulation-rules">
Lines 219-226 Link Here
219	[% END %]	228	[% END %]
220	</td>	229	</td>
221	<td class="actions">	230	<td class="actions">
222	<a href="#" class="editrule btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>	231	<a href="#" class="editrule btn btn-default btn-xs" id="lientype"><i class="fa fa-pencil"></i> Edit</a>
223	<a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&itemtype=[% i \|\| '' \| html %]&categorycode=[% c \|\| '' \| html %]&branch=[% current_branch \| html %]"><i class="fa fa-trash"></i> Delete</a>	232	<a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&itemtype=[% i \|\| '' \| html %]&categorycode=[% c \|\| '' \| html %]&branch=[% current_branch \| html %]" id="lientype"><i class="fa fa-trash"></i> Delete</a>
224	</td>	233	</td>
225	<td>	234	<td>
226	[% IF note.defined && note != '' %]	235	[% IF note.defined && note != '' %]
Lines 373-380 Link Here
373	<td>[% recall_shelf_time \| html %]</td>	382	<td>[% recall_shelf_time \| html %]</td>
374	[% END %]	383	[% END %]
375	<td class="actions">	384	<td class="actions">
376	<a href="#" class="editrule btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>	385	<a href="#" class="editrule btn btn-default btn-xs" id="lientype"><i class="fa fa-pencil"></i> Edit</a>
377	<a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&itemtype=[% i \|\| '' \| uri %]&categorycode=[% c \|\| '' \| uri %]&branch=[% current_branch \| uri %]"><i class="fa fa-trash"></i> Delete</a>	386	<a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&itemtype=[% i \|\| '' \| uri %]&categorycode=[% c \|\| '' \| uri %]&branch=[% current_branch \| uri %]" id="lientype"><i class="fa fa-trash"></i> Delete</a>
378	</td>	387	</td>
379	</tr>	388	</tr>
380	[% END %]	389	[% END %]
Lines 412-419 Link Here
412	</td>	421	</td>
413	<td class="actions">	422	<td class="actions">
414	<input type="hidden" name="branch" value="[% current_branch \| html %]"/>	423	<input type="hidden" name="branch" value="[% current_branch \| html %]"/>
415	<button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button>	424	<button type="submit" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-save"></i> Save</button>
416	<button name="cancel" class="clear_edit btn btn-default btn-xs"><i class="fa fa-undo"></i> Clear</button>	425	<button name="cancel" class="clear_edit btn btn-default btn-xs" id="lientype"><i class="fa fa-undo"></i> Clear</button>
417	</td>	426	</td>
418	<td><input type="text" name="note" id="note" size="15" value="" maxlength="100"></td>	427	<td><input type="text" name="note" id="note" size="15" value="" maxlength="100"></td>
419	<td><input type="text" name="maxissueqty" id="maxissueqty" size="3" /></td>	428	<td><input type="text" name="maxissueqty" id="maxissueqty" size="3" /></td>
Lines 516-522 Link Here
516	[% END %]	525	[% END %]
517	<td class="actions">	526	<td class="actions">
518	<input type="hidden" name="branch" value="[% current_branch \| html %]"/>	527	<input type="hidden" name="branch" value="[% current_branch \| html %]"/>
519	<button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button>	528	<button type="submit" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-save"></i> Save</button>
520	<button name="cancel" class="clear_edit btn btn-default btn-xs"><i class="fa fa-undo"></i> Clear</button>	529	<button name="cancel" class="clear_edit btn btn-default btn-xs"><i class="fa fa-undo"></i> Clear</button>
521	</td>	530	</td>
522	</tr>	531	</tr>
Lines 573-581 Link Here
573	</tfoot>	582	</tfoot>
574	</tbody>	583	</tbody>
575	</table>	584	</table>
		585	</div>
576	</form>	586	</form>
577	</div>	587	</div>
578	<div id="defaults-for-this-library" class="container">	588	<div id="defaults-for-this-library" class="container">
		589	<div id=searchresults>
579	<h3>Default checkout, hold and return policy[% IF humanbranch %] for [% Branches.GetName( humanbranch ) \| html %][% END %]</h3>	590	<h3>Default checkout, hold and return policy[% IF humanbranch %] for [% Branches.GetName( humanbranch ) \| html %][% END %]</h3>
580	<p>You can set a default maximum number of checkouts, hold policy and return policy that will be used if none is defined below for a particular item type or category.</p>	591	<p>You can set a default maximum number of checkouts, hold policy and return policy that will be used if none is defined below for a particular item type or category.</p>
581	<form method="post" action="/cgi-bin/koha/admin/smart-rules.pl">	592	<form method="post" action="/cgi-bin/koha/admin/smart-rules.pl">
Lines 746-752 Link Here
746	</select>	757	</select>
747	</td>	758	</td>
748	<td class="actions">	759	<td class="actions">
749	<button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button>	760	<button type="submit" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-save"></i> Save</button>
750	[% IF ( default_checkout_hold_and_return_policy ) %]	761	[% IF ( default_checkout_hold_and_return_policy ) %]
751	<a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete-branch-cat&categorycode=*&branch=[% current_branch \| html %]" id="unset"><i class="fa fa-undo"></i> Unset</a>	762	<a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete-branch-cat&categorycode=*&branch=[% current_branch \| html %]" id="unset"><i class="fa fa-undo"></i> Unset</a>
752	[% END %]	763	[% END %]
Lines 754-762 Link Here
754	</tr>	765	</tr>
755	</table>	766	</table>
756	</form>	767	</form>
757	</div>	768	</div></div>
758	[% IF ( show_branch_cat_rule_form ) %]	769	[% IF ( show_branch_cat_rule_form ) %]
759	<div id="holds-policy-by-patron-category" class="container">	770	<div id="holds-policy-by-patron-category" class="container">
		771	<div id=searchresults>
760	<h3>[% IF humanbranch %]Checkout, hold policy by patron category for [% Branches.GetName( humanbranch ) \| html %][% ELSE %]Default checkout, hold policy by patron category[% END %]</h3>	772	<h3>[% IF humanbranch %]Checkout, hold policy by patron category for [% Branches.GetName( humanbranch ) \| html %][% ELSE %]Default checkout, hold policy by patron category[% END %]</h3>
761	<p>For this library, you can specify the maximum number of loans that	773	<p>For this library, you can specify the maximum number of loans that
762	a patron of a given category can make, regardless of the item type.	774	a patron of a given category can make, regardless of the item type.
Lines 829-843 Link Here
829	<td><input name="patron_maxissueqty" size="3" type="text" /></td>	841	<td><input name="patron_maxissueqty" size="3" type="text" /></td>
830	<td><input name="patron_maxonsiteissueqty" size="3" type="text" /></td>	842	<td><input name="patron_maxonsiteissueqty" size="3" type="text" /></td>
831	<td><input name="max_holds" size="3" type="text" /></td>	843	<td><input name="max_holds" size="3" type="text" /></td>
832	<td class="actions"><button type="submit" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add</td>	844	<td class="actions"><button type="submit" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-plus"></i> Add</td>
833	</tr>	845	</tr>
834	</table>	846	</table>
835	</form>	847	</form>
836	</div>	848	</div></div>
837	[% END %]	849	[% END %]
838		850
839	[% IF Koha.Preference('ArticleRequests') %]	851	[% IF Koha.Preference('ArticleRequests') %]
840	<div id="open-article-requests-limit-patron-category" class="container">	852	<div id="open-article-requests-limit-patron-category" class="container">
		853	<div id=searchresults>
841	[% IF humanbranch %]	854	[% IF humanbranch %]
842	<h3>Daily open article requests limit for [% Branches.GetName( humanbranch ) \| html %]</h3>	855	<h3>Daily open article requests limit for [% Branches.GetName( humanbranch ) \| html %]</h3>
843	[% ELSE %]	856	[% ELSE %]
Lines 889-896 Link Here
889	</tr>	902	</tr>
890	</table>	903	</table>
891	</form>	904	</form>
892	</div>	905	</div></div>
893	<div id="article-request-fee-category" class="container">	906	<div id="article-request-fee-category" class="container">
		907	<div id=searchresults>
894	[% IF humanbranch %]	908	[% IF humanbranch %]
895	<h3>Article request fees for [% Branches.GetName( humanbranch ) \| html %]</h3>	909	<h3>Article request fees for [% Branches.GetName( humanbranch ) \| html %]</h3>
896	[% ELSE %]	910	[% ELSE %]
Lines 943-957 Link Here
943	</select>	957	</select>
944	</td>	958	</td>
945	<td><input name="article_request_fee" size="3" type="text" /></td>	959	<td><input name="article_request_fee" size="3" type="text" /></td>
946	<td class="actions"><button type="submit" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add</td>	960	<td class="actions"><button type="submit" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-plus"></i> Add</td>
947	</tr>	961	</tr>
948	</table>	962	</table>
949	</form>	963	</form>
950	</div>	964	</div></div>
951		965
952	[% END %]	966	[% END %]
953		967
954	<div id="refund-lost-item-fee-on-return" class="container">	968	<div id="refund-lost-item-fee-on-return" class="container">
		969	<div id=searchresults>
955	[% IF current_branch == '*' %]	970	[% IF current_branch == '*' %]
956	<h3>Default lost item fee refund on return policy</h3>	971	<h3>Default lost item fee refund on return policy</h3>
957	[% ELSE %]	972	[% ELSE %]
Lines 1047-1061 Link Here
1047	</select>	1062	</select>
1048	</td>	1063	</td>
1049	<td class="actions">	1064	<td class="actions">
1050	<button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button>	1065	<button type="submit" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-save"></i> Save</button>
1051	</td>	1066	</td>
1052	</td>	1067	</td>
1053	</tr>	1068	</tr>
1054	</table>	1069	</table>
1055	</form>	1070	</form>
1056	</div>	1071	</div></div>
1057		1072
1058	<div id="holds-policy-by-item-type" class="container">	1073	<div id="holds-policy-by-item-type" class="container">
		1074	<div id=searchresults>
1059	<h3>[% IF humanbranch %]Holds policy by item type for [% Branches.GetName( humanbranch ) \| html %][% ELSE %]Default holds policy by item type[% END %]</h3>	1075	<h3>[% IF humanbranch %]Holds policy by item type for [% Branches.GetName( humanbranch ) \| html %][% ELSE %]Default holds policy by item type[% END %]</h3>
1060	<p>	1076	<p>
1061	For this library, you can edit rules for given itemtypes, regardless	1077	For this library, you can edit rules for given itemtypes, regardless
Lines 1181-1191 Link Here
1181	<option value="noreturn">Item floats</option>	1197	<option value="noreturn">Item floats</option>
1182	</select>	1198	</select>
1183	</td>	1199	</td>
1184	<td class="actions"><button type="submit" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add</button></td>	1200	<td class="actions"><button type="submit" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-plus"></i> Add</button></td>
1185	</tr>	1201	</tr>
1186	</table>	1202	</table>
1187	</form>	1203	</form>
1188	</div>	1204	</div></div>
1189	</main>	1205	</main>
1190	</div> <!-- /.col-sm-10.col-sm-push-2 -->	1206	</div> <!-- /.col-sm-10.col-sm-push-2 -->
1191		1207

Lines 1-14 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt (-2 / +10 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'prefs-admin-search.inc' %]
		6	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
5	<title>SMS cellular providers &rsaquo; Administration &rsaquo; Koha</title>	8	<title>SMS cellular providers &rsaquo; Administration &rsaquo; Koha</title>
6	[% INCLUDE 'doc-head-close.inc' %]	9	[% INCLUDE 'doc-head-close.inc' %]
7	</head>	10	</head>
8		11
9	<body id="admin_sms_providers" class="admin">	12	<body id="admin_sms_providers" class="admin">
10	[% INCLUDE 'header.inc' %]	13	[% INCLUDE 'header.inc' form=formulaire %]
11	[% INCLUDE 'prefs-admin-search.inc' %]
12		14
13	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	15	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
14	<ol>	16	<ol>
Lines 24-29 Link Here
24	</a>	26	</a>
25	</li>	27	</li>
26	</ol>	28	</ol>
		29	<ol>
		30	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		31	</ol>
		32	<ol>
		33	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		34	</ol>
27	</nav>	35	</nav>
28		36
29	<div class="main container-fluid">	37	<div class="main container-fluid">

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt (-9 / +19 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'prefs-admin-search.inc' %]
		6	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
5	<title>	8	<title>
6	[% IF op == 'add_form' %]	9	[% IF op == 'add_form' %]
Lines 13-20 Link Here
13	</head>	16	</head>
14		17
15	<body id="admin_smtp_servers" class="admin">	18	<body id="admin_smtp_servers" class="admin">
16	[% INCLUDE 'header.inc' %]	19	[% INCLUDE 'header.inc' form=formulaire %]
17	[% INCLUDE 'prefs-admin-search.inc' %]
18		20
19	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	21	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
20	<ol>	22	<ol>
Lines 53-58 Link Here
53	</li>	55	</li>
54	[% END %]	56	[% END %]
55	</ol>	57	</ol>
		58	<ol>
		59	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		60	</ol>
		61	<ol>
		62	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		63	</ol>
56	</nav>	64	</nav>
57		65
58	<div class="main container-fluid">	66	<div class="main container-fluid">
Lines 135-145 Link Here
135	<span>Enables additional debug output in the logs</span>	143	<span>Enables additional debug output in the logs</span>
136	</li>	144	</li>
137	</ol>	145	</ol>
138	</fieldset>
139	<fieldset class="action">	146	<fieldset class="action">
140	<input type="submit" value="Submit" />	147	<input type="submit" class="principal" value="Submit" />
141	<a class="cancel" href="/cgi-bin/koha/admin/smtp_servers.pl">Cancel</a>	148	<a class="cancel" href="/cgi-bin/koha/admin/smtp_servers.pl">Cancel</a>
142	</fieldset>	149	</fieldset>
		150	</fieldset>
143	</form>	151	</form>
144	[% END %]	152	[% END %]
145		153
Lines 217-235 Link Here
217	</select>	225	</select>
218	</li>	226	</li>
219	</ol>	227	</ol>
220	</fieldset>
221	<fieldset class="action">	228	<fieldset class="action">
222	<input type="submit" value="Submit" />	229	<input type="submit" class="principal" value="Submit" />
223	<a class="cancel" href="/cgi-bin/koha/admin/smtp_servers.pl">Cancel</a>	230	<a class="cancel" href="/cgi-bin/koha/admin/smtp_servers.pl">Cancel</a>
224	</fieldset>	231	</fieldset>
		232	</fieldset>
225	</form>	233	</form>
226	[% END %]	234	[% END %]
227		235
228	[% IF op == 'list' %]	236	[% IF op == 'list' %]
229		237
230	<div id="toolbar" class="btn-toolbar">	238	<div id="toolbar" class="btn-toolbar"><div>
231	<a class="btn btn-default" id="new_smtp_server" href="/cgi-bin/koha/admin/smtp_servers.pl?op=add_form"><i class="fa fa-plus"></i> New SMTP server</a>	239	<a class="pat" id="new_smtp_server" href="/cgi-bin/koha/admin/smtp_servers.pl?op=add_form"><i class="fa fa-plus"></i> New SMTP server</a>
232	</div>	240	</div></div>
233		241
234	<h1>SMTP servers</h1>	242	<h1>SMTP servers</h1>
235		243
Lines 246-251 Link Here
246	</div>	254	</div>
247		255
248	[% IF servers_count > 0 %]	256	[% IF servers_count > 0 %]
		257	<div id="searchresults">
249	<table id="smtp_servers">	258	<table id="smtp_servers">
250	<thead>	259	<thead>
251	<tr>	260	<tr>
Lines 259-264 Link Here
259	</tr>	268	</tr>
260	</thead>	269	</thead>
261	</table>	270	</table>
		271	</div>
262	[% END %]	272	[% END %]
263	[% END %]	273	[% END %]
264		274

Lines 2-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt (-15 / +26 lines)
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE Koha %]	3	[% USE Koha %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE 'prefs-admin-search.inc' %]
		7	[% END %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	<title>	9	<title>
7	[% IF ( add_form ) %]	10	[% IF ( add_form ) %]
Lines 26-33 Link Here
26	</head>	29	</head>
27		30
28	<body id="admin_systempreferences" class="admin">	31	<body id="admin_systempreferences" class="admin">
29	[% INCLUDE 'header.inc' %]	32	[% INCLUDE 'header.inc' form=formulaire %]
30	[% INCLUDE 'prefs-admin-search.inc' %]
31		33
32	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	34	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
33	<ol>	35	<ol>
Lines 97-102 Link Here
97	</li>	99	</li>
98	[% END %]	100	[% END %]
99	</ol>	101	</ol>
		102	<ol>
		103	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		104	</ol>
		105	<ol>
		106	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		107	</ol>
100	</nav>	108	</nav>
101		109
102	<div class="main container-fluid">	110	<div class="main container-fluid">
Lines 110-122 Link Here
110	[% ELSE %]	118	[% ELSE %]
111	<form action="[% script_name \| html %]" name="Aform" method="post">	119	<form action="[% script_name \| html %]" name="Aform" method="post">
112	[% END %]	120	[% END %]
113	<fieldset class="rows"><legend>	121	<fieldset class="rows"><h3>
114	<h1>
115	[% IF ( modify ) %]Modify	122	[% IF ( modify ) %]Modify
116	[% ELSE %]Add	123	[% ELSE %]Add
117	[% END %] a system preference	124	[% END %] a system preference</h3><ol>
118	</h1>
119	</legend><ol>
120	<li><label for="explanation">Explanation: </label><input type="text" name="explanation" id="explanation" size="60" value="[% explanation \| html %]" /><input type="hidden" name="op" value="add_validate" /></li>	125	<li><label for="explanation">Explanation: </label><input type="text" name="explanation" id="explanation" size="60" value="[% explanation \| html %]" /><input type="hidden" name="op" value="add_validate" /></li>
121	<li>[% IF ( searchfield ) %]<span class="label">Variable: </span>[% searchfield \| html %]<input type="hidden" name="variable" value="[% searchfield \| html %]" />	126	<li>[% IF ( searchfield ) %]<span class="label">Variable: </span>[% searchfield \| html %]<input type="hidden" name="variable" value="[% searchfield \| html %]" />
122	[% ELSE %]<label for="variable">Variable: </label><input type="text" name="variable" id="variable" size="60" />[% END %]</li>	127	[% ELSE %]<label for="variable">Variable: </label><input type="text" name="variable" id="variable" size="60" />[% END %]</li>
Lines 207-223 Link Here
207	<label for="value-no" class="yesno">OFF</label>	212	<label for="value-no" class="yesno">OFF</label>
208	[% END %]	213	[% END %]
209	</li>	214	</li>
210	</ol></fieldset>	215	</ol>
211	<fieldset class="action"><input type="submit" value="Save" />	216	<fieldset class="action"><input type="submit" class="principal" value="Save" />
212	[% IF ( return_tab ) %]	217	[% IF ( return_tab ) %]
213	<a class="cancel" href="/cgi-bin/koha/admin/systempreferences.pl?tab=[% return_tab \| html %]">Cancel</a>	218	<a class="cancel" href="/cgi-bin/koha/admin/systempreferences.pl?tab=[% return_tab \| html %]">Cancel</a>
214	[% ELSE %]	219	[% ELSE %]
215	<a class="cancel" href="/cgi-bin/koha/admin/systempreferences.pl">Cancel</a>	220	<a class="cancel" href="/cgi-bin/koha/admin/systempreferences.pl">Cancel</a>
216	[% END %]	221	[% END %]
217	</fieldset>	222	</fieldset></fieldset>
218		223
219	<fieldset class="brief">	224	<fieldset class="brief">
220	<legend>Koha internal</legend>	225	<h3>Koha internal</h3>
221	<div class="hint">Note: change the variable type to one of the dropdown values as needed</div>	226	<div class="hint">Note: change the variable type to one of the dropdown values as needed</div>
222	<ol>	227	<ol>
223	<li><label for="preftype">Variable type:</label>	228	<li><label for="preftype">Variable type:</label>
Lines 322-335 Link Here
322	[% IF ( else ) %]	327	[% IF ( else ) %]
323		328
324	<div id="toolbar" class="btn-toolbar">	329	<div id="toolbar" class="btn-toolbar">
325	<a class="btn btn-default" id="newstopword" href="[% script_name \| url %]?op=add_form"><i class="fa fa-plus"></i> New preference</a>	330	<div>
		331	<a class="pat" id="newstopword" href="[% script_name \| url %]?op=add_form"><i class="fa fa-plus"></i> New preference</a>
		332	</div>
326	</div>	333	</div>
327		334
328	[% IF ( tab != 'local_use' ) %]	335	[% IF ( tab != 'local_use' ) %]
329	<p>Please click on one of the tabs at the left side of this form.</p>	336	<p>Please click on one of the tabs at the left side of this form.</p>
		337	<div id="searchresults">
330	<table>	338	<table>
331	[% ELSE %]	339	[% ELSE %]
332	<h1>Local use preferences</h1>	340	<h2>Local use preferences</h2>
		341	<div id="searchresults">
333	<table width="80%" id="sysprefst">	342	<table width="80%" id="sysprefst">
334	<thead><tr>	343	<thead><tr>
335	<th>Preference</th>	344	<th>Preference</th>
Lines 337-342 Link Here
337	<th>Value</th>	346	<th>Value</th>
338	<th class="noExport">Actions</th>	347	<th class="noExport">Actions</th>
339	</tr></thead>	348	</tr></thead>
		349
340	[% END %]	350	[% END %]
341	<tbody>[% FOREACH loo IN loop %]	351	<tbody>[% FOREACH loo IN loop %]
342	<tr>	352	<tr>
Lines 446-459 Link Here
446	<input type="hidden" name="prefoptions" value="[% loo.prefoptions \| html %]" />	456	<input type="hidden" name="prefoptions" value="[% loo.prefoptions \| html %]" />
447	<input type="hidden" name="preftype" value="[% loo.type \| html %]" />	457	<input type="hidden" name="preftype" value="[% loo.type \| html %]" />
448	<input type="hidden" name="explanation" value="[% loo.explanation \| html %]" />	458	<input type="hidden" name="explanation" value="[% loo.explanation \| html %]" />
449	<button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button>	459	<button type="submit" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-save"></i> Save</button>
450	</form>	460	</form>
451	</td>	461	</td>
452		462
453	<td class="actions"><a class="btn btn-default btn-xs" href="[% loo.edit \| url %]"><i class="fa fa-pencil"></i> Edit</a> <a class="btn btn-default btn-xs" href="[% loo.delete \| url %]"><i class="fa fa-trash"></i> Delete</a></td>	463	<td class="actions"><a class="btn btn-default btn-xs" href="[% loo.edit \| url %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a> <a class="btn btn-default btn-xs" href="[% loo.delete \| url %]" id="lientype"><i class="fa fa-trash"></i> Delete</a></td>
454	</tr>	464	</tr>
455	[% END %]</tbody>	465	[% END %]</tbody>
456	</table>	466	</table>
		467	</div>
457		468
458	[% END %]	469	[% END %]
459		470

Lines 6-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transfer_limits.tt (-7 / +15 lines)
6	[% USE ItemTypes %]	6	[% USE ItemTypes %]
7	[% USE AuthorisedValues %]	7	[% USE AuthorisedValues %]
8	[% SET footerjs = 1 %]	8	[% SET footerjs = 1 %]
		9	[% formulaire = BLOCK %]
		10	[% INCLUDE 'prefs-admin-search.inc' %]
		11	[% END %]
9	[% INCLUDE 'doc-head-open.inc' %]	12	[% INCLUDE 'doc-head-open.inc' %]
10	<title>Library checkin and transfer policy &rsaquo; Administration &rsaquo; Koha</title>	13	<title>Library checkin and transfer policy &rsaquo; Administration &rsaquo; Koha</title>
11	[% INCLUDE 'doc-head-close.inc' %]	14	[% INCLUDE 'doc-head-close.inc' %]
Lines 16-23 Link Here
16	[% SET branches = Branches.all %]	19	[% SET branches = Branches.all %]
17		20
18	<body id="admin_branch_transfer_limits" class="admin">	21	<body id="admin_branch_transfer_limits" class="admin">
19	[% INCLUDE 'header.inc' %]	22	[% INCLUDE 'header.inc' form=formulaire %]
20	[% INCLUDE 'prefs-admin-search.inc' %]
21		23
22	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	24	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
23	<ol>	25	<ol>
Lines 32-44 Link Here
32	</a>	34	</a>
33	</li>	35	</li>
34	</ol>	36	</ol>
		37	<ol>
		38	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		39	</ol>
		40	<ol>
		41	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		42	</ol>
35	</nav>	43	</nav>
36		44
37	<div class="main container-fluid">	45	<div class="main container-fluid">
38	<div class="row">	46	<div class="row">
39	<div class="col-sm-10 col-sm-push-2">	47	<div class="col-sm-10 col-sm-push-2">
40	<main>	48	<main>
41	<h1>Checkin and transfer policy</h1>	49	<h2>Checkin and transfer policy</h2>
42		50
43	<p>	51	<p>
44	[% IF BranchTransferLimitsType == "itemtype" %]	52	[% IF BranchTransferLimitsType == "itemtype" %]
Lines 84-91 Link Here
84	<td> </td>	92	<td> </td>
85	[% FOREACH to IN branches %]	93	[% FOREACH to IN branches %]
86	<td>	94	<td>
87	<p><a class="btn btn-default btn-xs check-all-col limit-action" data-to="[% to.branchcode \| html %]" href="#"><i class="fa fa-check"></i> Check</a></p>	95	<p><a class="btn btn-default btn-xs check-all-col limit-action" data-to="[% to.branchcode \| html %]" href="#" id="lientype"<i class="fa fa-check"></i> Check</a></p>
88	<p><a class="btn btn-default btn-xs uncheck-all-col limit-action" data-to="[% to.branchcode \| html %]" href="#"><i class="fa fa-remove"></i> Uncheck</a></p>	96	<p><a class="btn btn-default btn-xs uncheck-all-col limit-action" data-to="[% to.branchcode \| html %]" href="#" id="lientype"><i class="fa fa-remove"></i> Uncheck</a></p>
89	</td>	97	</td>
90	[% END %]	98	[% END %]
91	</tr>	99	</tr>
Lines 103-110 Link Here
103	[% FOREACH from IN branches %]	111	[% FOREACH from IN branches %]
104	<tr>	112	<tr>
105	<td>	113	<td>
106	<p><a class="btn btn-default btn-xs check-all-row limit-action" data-from="[% from.branchcode \| html %]" href="#"><i class="fa fa-check"></i> Check</a></p>	114	<p><a class="btn btn-default btn-xs check-all-row limit-action" data-from="[% from.branchcode \| html %]" href="#" id="lientype"><i class="fa fa-check"></i> Check</a></p>
107	<p><a class="btn btn-default btn-xs uncheck-all-row limit-action" data-from="[% from.branchcode \| html %]" href="#"><i class="fa fa-remove"></i> Uncheck</a></p>	115	<p><a class="btn btn-default btn-xs uncheck-all-row limit-action" data-from="[% from.branchcode \| html %]" href="#" id="lientype"><i class="fa fa-remove"></i> Uncheck</a></p>
108	</td>	116	</td>
109	<th>[% from.branchname \| html %]</th>	117	<th>[% from.branchname \| html %]</th>
110	[% FOREACH to IN branches %]	118	[% FOREACH to IN branches %]

Lines 2-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt (-7 / +15 lines)
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE Branches %]	3	[% USE Branches %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE 'prefs-admin-search.inc' %]
		7	[% END %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	<title>Transport cost matrix &rsaquo; Administration &rsaquo; Koha</title>	9	<title>Transport cost matrix &rsaquo; Administration &rsaquo; Koha</title>
7	[% INCLUDE 'doc-head-close.inc' %]	10	[% INCLUDE 'doc-head-close.inc' %]
Lines 13-20 Link Here
13	</head>	16	</head>
14		17
15	<body id="admin_transport_cost_matrix" class="admin">	18	<body id="admin_transport_cost_matrix" class="admin">
16	[% INCLUDE 'header.inc' %]	19	[% INCLUDE 'header.inc' form=formulaire %]
17	[% INCLUDE 'prefs-admin-search.inc' %]
18		20
19	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	21	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
20	<ol>	22	<ol>
Lines 30-35 Link Here
30	</a>	32	</a>
31	</li>	33	</li>
32	</ol>	34	</ol>
		35	<ol>
		36	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		37	</ol>
		38	<ol>
		39	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		40	</ol>
33	</nav>	41	</nav>
34		42
35	<div class="main container-fluid">	43	<div class="main container-fluid">
Lines 37-47 Link Here
37	<div class="col-sm-10 col-sm-push-2">	45	<div class="col-sm-10 col-sm-push-2">
38	<main>	46	<main>
39		47
40	<h1 class="parameters">	48	<h2 class="parameters">
41	Defining transport costs between libraries	49	Defining transport costs between libraries
42	</h1>	50	</h2>
43	[% IF ( WARNING_transport_cost_matrix_off ) %]	51	[% IF ( WARNING_transport_cost_matrix_off ) %]
44	<div class="dialog message">Because the "UseTransportCostMatrix" system preference is currently not enabled, the transport cost matrix is not being used. <br/>Go to the <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=UseTransportCostMatrix">UseTransportCostMatrix</a> system preference if you wish to enable this feature.</div>	52	<div class="dialog message">Because the "UseTransportCostMatrix" system preference is currently not enabled, the transport cost matrix is not being used. <br/>Go to the <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=UseTransportCostMatrix" id="lientype">UseTransportCostMatrix</a> system preference if you wish to enable this feature.</div>
45	[% END %]	53	[% END %]
46		54
47	[% IF ( errors ) %]<div class="dialog alert">	55	[% IF ( errors ) %]<div class="dialog alert">
Lines 94-102 Link Here
94	</tr>	102	</tr>
95	[% END %]	103	[% END %]
96	</table>	104	</table>
97	</fieldset>
98	<fieldset class="action">	105	<fieldset class="action">
99	<input type="submit" value="Save" class="submit" /> <a href="/cgi-bin/koha/admin/transport-cost-matrix.pl" class="cancel">Cancel</a>	106	<input type="submit" value="Save" class="principal" /> <a href="/cgi-bin/koha/admin/transport-cost-matrix.pl" class="cancel">Cancel</a>
		107	</fieldset>
100	</fieldset>	108	</fieldset>
101	</form>	109	</form>
102		110

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt (-2 / +10 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'cat-search.inc' %]
		6	[% END %]
4	[% USE Koha %]	7	[% USE Koha %]
5	[% USE KohaDates %]	8	[% USE KohaDates %]
6	[% USE Price %]	9	[% USE Price %]
Lines 11-18 Link Here
11	</head>	14	</head>
12		15
13	<body id="admin_usage_statistics" class="admin">	16	<body id="admin_usage_statistics" class="admin">
14	[% INCLUDE 'header.inc' %]	17	[% INCLUDE 'header.inc' form=formulaire %]
15	[% INCLUDE 'cat-search.inc' %]
16		18
17	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	19	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
18	<ol>	20	<ol>
Lines 28-33 Link Here
28	</a>	30	</a>
29	</li>	31	</li>
30	</ol>	32	</ol>
		33	<ol>
		34	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		35	</ol>
		36	<ol>
		37	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		38	</ol>
31	</nav>	39	</nav>
32		40
33	<div class="main container-fluid">	41	<div class="main container-fluid">

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt (-10 / +21 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'z3950-admin-search.inc' %]
		6	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
5		8
6	[% BLOCK ServerType %]	9	[% BLOCK ServerType %]
Lines 24-31 Link Here
24	</head>	27	</head>
25		28
26	<body id="admin_z3950servers" class="admin">	29	<body id="admin_z3950servers" class="admin">
27	[% INCLUDE 'header.inc' %]	30	[% INCLUDE 'header.inc' form=formulaire %]
28	[% INCLUDE 'z3950-admin-search.inc' %]
29		31
30	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	32	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
31	<ol>	33	<ol>
Lines 65-70 Link Here
65	[% END %]	67	[% END %]
66		68
67	</ol>	69	</ol>
		70	<ol>
		71	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		72	</ol>
		73	<ol>
		74	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		75	</ol>
68	</nav>	76	</nav>
69		77
70	<div class="main container-fluid">	78	<div class="main container-fluid">
Lines 86-98 Link Here
86	<form action="[% script_name \| html %]" name="Aform" method="post" id="serverentry">	94	<form action="[% script_name \| html %]" name="Aform" method="post" id="serverentry">
87	<input type="hidden" name="op" value="add_validated" />	95	<input type="hidden" name="op" value="add_validated" />
88	<input type="hidden" name="servertype" value="[% server.servertype\|\|type\|\|'zed' \| html %]"/>	96	<input type="hidden" name="servertype" value="[% server.servertype\|\|type\|\|'zed' \| html %]"/>
		97	<fieldset class="rows">
89	[% IF op == 'edit' %]	98	[% IF op == 'edit' %]
90	<h1>Modify [% PROCESS ServerType %] server</h1>	99	<h3>Modify [% PROCESS ServerType %] server</h3>
91	<input type="hidden" name="id" value="[% server.id \| html %]" />	100	<input type="hidden" name="id" value="[% server.id \| html %]" />
92	[% ELSE %]	101	[% ELSE %]
93	<h1>New [% PROCESS ServerType %] server</h1>	102	<h3>New [% PROCESS ServerType %] server</h3>
94	[% END %]	103	[% END %]
95	<fieldset class="rows">
96	<ol>	104	<ol>
97	<li><label for="name" class="required">Server name: </label>	105	<li><label for="name" class="required">Server name: </label>
98	<input type="text" name="servername" id="servername" size="65" maxlength="100" value="[% server.servername \| html %]" required="required" /> <span class="required">Required</span>	106	<input type="text" name="servername" id="servername" size="65" maxlength="100" value="[% server.servername \| html %]" required="required" /> <span class="required">Required</span>
Lines 196-218 Link Here
196	</li>	204	</li>
197		205
198	</ol>	206	</ol>
		207	<fieldset class="action"><input type="submit" class="principal" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/z3950servers.pl">Cancel</a></fieldset>
199	</fieldset>	208	</fieldset>
200		209
201	<fieldset class="action"><input type="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/z3950servers.pl">Cancel</a></fieldset>
202	</form>	210	</form>
203	[% END %]	211	[% END %]
204		212
205	[% IF op == 'list' %]	213	[% IF op == 'list' %]
206	<div id="toolbar" class="btn-toolbar">	214	<div id="toolbar" class="btn-toolbar">
207	<a id="newserver" class="btn btn-default" href="/cgi-bin/koha/admin/z3950servers.pl?op=add&type=zed"><i class="fa fa-plus"></i> New Z39.50 server</a>	215	<div>
208	<a id="newserver" class="btn btn-default" href="/cgi-bin/koha/admin/z3950servers.pl?op=add&type=sru"><i class="fa fa-plus"></i> New SRU server</a>	216	<a id="newserver" class="pat" href="/cgi-bin/koha/admin/z3950servers.pl?op=add&type=zed"><i class="fa fa-plus"></i> New Z39.50 server</a>
209	</div>	217	<a id="newserver" class="pat" href="/cgi-bin/koha/admin/z3950servers.pl?op=add&type=sru"><i class="fa fa-plus"></i> New SRU server</a>
210	<h1>Z39.50/SRU servers administration</h1>	218	</div></div>
		219	<h2>Z39.50/SRU servers administration</h2>
211	[% IF id %]	220	[% IF id %]
212	You searched for record [% id \| html %]	221	You searched for record [% id \| html %]
213	[% ELSIF searchfield %]	222	[% ELSIF searchfield %]
214	You searched for [% searchfield \| html %]	223	You searched for [% searchfield \| html %]
215	[% END %]	224	[% END %]
		225	<div id="searchresults">
216	<table id="serverst">	226	<table id="serverst">
217		227
218	<thead><tr><th>Target</th><th>Hostname/Port</th><th>Database</th><th>Userid</th><th>Password</th><th>Preselected</th><th>Rank</th><th>Syntax</th><th>Encoding</th><th>Timeout</th><th>Record type</th><th>Attributes</th><th class="noExport">Actions</th>	228	<thead><tr><th>Target</th><th>Hostname/Port</th><th>Database</th><th>Userid</th><th>Password</th><th>Preselected</th><th>Rank</th><th>Syntax</th><th>Encoding</th><th>Timeout</th><th>Record type</th><th>Attributes</th><th class="noExport">Actions</th>
Lines 245-250 Link Here
245	[% END %]	255	[% END %]
246	</tbody>	256	</tbody>
247	</table>	257	</table>
		258	</div>
248	[% END %]	259	[% END %]
249		260
250	</main>	261	</main>

Lines 1-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt (-1 / +10 lines)
1	[% SET footerjs = 1 %]	1	[% SET footerjs = 1 %]
		2	[% formulaire = BLOCK %]
		3	[% INCLUDE 'authorities-search.inc' %]
		4	[% END %]
2	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
3	<title>Authorities &rsaquo; Koha</title>	6	<title>Authorities &rsaquo; Koha</title>
4	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]
5	</head>	8	</head>
6		9
7	<body id="auth_authorities_home" class="auth">	10	<body id="auth_authorities_home" class="auth">
8	[% INCLUDE 'header.inc' %]	11	[% INCLUDE 'header.inc' form=formulaire %]
9		12
10	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	13	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
11	<ol>	14	<ol>
Lines 26-31 Link Here
26	<ol>	29	<ol>
27	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>	30	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
28	</ol>	31	</ol>
		32	<ol>
		33	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		34	</ol>
		35	<ol>
		36	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		37	</ol>
29	</nav>	38	</nav>
30		39
31	<div class="main container-fluid">	40	<div class="main container-fluid">




                <a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a>
            </li>

        [% END %]
    </ol>
        <ol>
            [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
        </ol>
        <ol>
            <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
        </ol>
</nav>

<div class="main container-fluid">
    <div class="row">
        <div class="col-md-10 col-md-offset-1">

[% IF ( authid ) %]
<h1>Modify authority #[% authid | html %] [% authtypetext | html %]</h1>
[% ELSE %]
<h1>Adding authority [% authtypetext | html %]</h1>
[% END %]

[% IF ( duplicateauthid ) %]
        <div class="dialog alert">
                <h3>Duplicate record suspected</h3>
                <p>Is this a duplicate of <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% duplicateauthid | uri %]" class="popup" onclick="openWindow('/cgi-bin/koha/authorities/detail.pl?authid=[% duplicateauthid | html %]&amp;popup=1', 'DuplicateAuthority','800','600'); return false;" class="button">[% duplicateauthvalue | html %]</a> ?</p>

                <form action="authorities.pl" method="get">
                    <input type="hidden" name="authid" value="[% duplicateauthid | html %]" />
                    <button type="submit" class="new"><i class="fa fa-pencil"></i> Yes: Edit existing authority</button>
                </form>
                <form action="authorities.pl" method="get">
                    <button class="new" onclick="confirmnotdup('items'); return false;"><i class="fa fa-save"></i> No: Save as new authority</button>
                </form>
        </div>
[% END %]

<form method="post" name="f" action="/cgi-bin/koha/authorities/authorities.pl">
    <input type="hidden" name="op" value="add" />
    <input type="hidden" name="addfield_field" value="" />
    <input type="hidden" name="repeat_field" value="" />
    <input type="hidden" name="authtypecode" value="[% authtypecode | html%]" />
    <input type="hidden" name="authid" value="[% authid | html %]" />
    <input type="hidden" name="index" value="[% index | html %]" />
    <input type="hidden" value="0" id="confirm_not_duplicate" name="confirm_not_duplicate" />

    <div id="toolbar" class="btn-toolbar">
        <div class="btn-group"><a href="#" class="btn btn-default" id="principal" accesskey="w"><i class="fa fa-save"></i> Save</a></div>
        <div class="btn-group">
            [% IF ( authid ) %]
                <a class="cancel" class="btn btn-default" id="cancel" href="/cgi-bin/koha/authorities/detail.pl?authid=[% authid | url %]">Cancel</a>
                    <a href="#" aria-current="page">
                        Modify authority #[% authid | html %] ([% authtypetext | html %])
                    </a>
                </li>

            [% ELSE %]
                <a class="cancel" class="btn btn-default" id="cancel" href="/cgi-bin/koha/authorities/authorities-home.pl">Cancel</a>
                    <a href="#" aria-current="page">
                        Adding authority [% authtypetext | html %]
                    </a>
                </li>

            [% END %]
        </div>
        <div class="btn-group">
            [% IF ( authid ) %]
                <a class="pat" class="btn btn-default" href="#"><i class="fa fa-search"></i> Replace record via Z39.50/SRU search</a>
            [% ELSE %]
                <a class="pat" class="btn btn-default" href="#"><i class="fa fa-search"></i> Z39.50/SRU search</a>
            [% END %]
        </div>
    </div>

    <fieldset class="select-libs">
        <div id="authoritytabs" class="toptabs numbered">
            <ul>
                [% FOREACH BIG_LOO IN BIG_LOOP %]
                    <li><a href="#tab[% BIG_LOO.number | uri %]XX">[% BIG_LOO.number | html %]</a></li>
                [% END %]
            </ul>

            [% FOREACH BIG_LOO IN BIG_LOOP %]
            <div id="tab[% BIG_LOO.number | html %]XX">
                [% previous = "" %]
                [% FOREACH innerloo IN BIG_LOO.innerloop %]
                [% IF ( innerloo.tag ) %]
                [% IF innerloo.tag != previous %]
                [% IF previous != "" %]
                    </ul>
            [% END %]
            [% previous = innerloo.tag %]
            [% IF ( innerloo.repeatable ) %]
                <ul class="sortable_field">
            [% ELSE %]
                <ul>
            [% END %]
            [% END %]
            [% IF ( innerloo.repeatable ) %]
                <li class="tag sortable_tag clearfix" id="tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]">
            [% ELSE %]
                <li class="tag clearfix" id="tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]">
            [% END %]

                <div class="tag_title" id="div_indicator_tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]">
                [% UNLESS hide_marc %]
                [% IF advancedMARCEditor %]
                    <a href="#" tabindex="1" class="tagnum" title="[% innerloo.tag_lib | html %] - Click to Expand this Tag" onclick="ExpandField('tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]'); return false;">[% innerloo.tag | html %]</a>
                [% ELSE %]
                    <span class="tagnum" title="[% innerloo.tag_lib | html %]">[% innerloo.tag | html %]</span>
                [% END %]

                [% IF ( innerloo.fixedfield ) %]
                    <input type="text"
                        tabindex="1"
                        class="indicator flat"
                        style="display:none;"
                        name="tag_[% innerloo.tag | html %]_indicator1_[% innerloo.index | html %][% innerloo.random | html %]"
                        size="1"
                        maxlength="1"
                        value="[% innerloo.indicator1 | html %]" />
                    <input type="text"
                        tabindex="1"
                        class="indicator flat"
                        style="display:none;"
                        name="tag_[% innerloo.tag | html %]_indicator2_[% innerloo.index | html %][% innerloo.random | html %]"
                        size="1"
                        maxlength="1"
                        value="[% innerloo.indicator2 | html %]" />
                [% ELSE %]
                    <input type="text"
                        tabindex="1"
                        class="indicator flat"
                        name="tag_[% innerloo.tag | html %]_indicator1_[% innerloo.index | html %][% innerloo.random | html %]"
                        size="1"
                        maxlength="1"
                        value="[% innerloo.indicator1 | html %]" />
                    <input type="text"
                        tabindex="1"
                        class="indicator flat"
                        name="tag_[% innerloo.tag | html %]_indicator2_[% innerloo.index | html %][% innerloo.random | html %]"
                        size="1"
                        maxlength="1"
                        value="[% innerloo.indicator2 | html %]" />
                [% END %] -
            [% ELSE %]
                    [% IF ( innerloo.fixedfield ) %]
                        <input type="hidden"
                            tabindex="1"
                            name="tag_[% innerloo.tag | html %]_indicator1_[% innerloo.index | html %][% innerloo.random | html %]"
                            value="[% innerloo.indicator1 | html %]" />
                        <input type="hidden"
                            tabindex="1"
                            name="tag_[% innerloo.tag | html %]_indicator2_[% innerloo.index | html %][% innerloo.random | html %]"
                            value="[% innerloo.indicator2 | html %]" />
                    [% ELSE %]
                        <input type="hidden"
                            tabindex="1"
                            name="tag_[% innerloo.tag | html %]_indicator1_[% innerloo.index | html %][% innerloo.random | html %]"
                            value="[% innerloo.indicator1 | html %]" />
                        <input type="hidden"
                            tabindex="1"
                            name="tag_[% innerloo.tag | html %]_indicator2_[% innerloo.index | html %][% innerloo.random | html %]"
                            value="[% innerloo.indicator2 | html %]" />
                    [% END %]
            [% END %]

                [% UNLESS advancedMARCEditor %]
                    <a href="#" tabindex="1" class="expandfield" onclick="ExpandField('tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]'); return false;" title="Click to Expand this Tag">[% innerloo.tag_lib | html %]</a>
                [% END %]
                    <span class="field_controls">
                    [% IF ( innerloo.repeatable ) %]
                        <a href="#" tabindex="1" class="buttonPlus" onclick="CloneField('tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]','[% hide_marc | html %]','[% advancedMARCEditor | html %]'); return false;" title="Repeat this Tag">
                            <img src="[% interface | html %]/[% theme | html %]/img/repeat-tag.png" alt="Repeat this Tag" />
                        </a>
                    [% END %]
                        <a href="#" tabindex="1" class="buttonMinus" onclick="UnCloneField('tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]'); return false;" title="Delete this Tag">
                            <img src="[% interface | html %]/[% theme | html %]/img/delete-tag.png" alt="Delete this Tag" />
                        </a>
                    </span> <!-- /.field_controls -->

        </div> <!-- /div.tag_title -->

            <ul class="sortable_subfield">
            [% FOREACH subfield_loo IN innerloo.subfield_loop %]
                <!--  One line on the marc editor -->
                <li class="subfield_line" style="[% subfield_loo.visibility | html %]" id="subfield[% subfield_loo.tag | html %][% subfield_loo.subfield | html %][% subfield_loo.random | html %]">

                    [% UNLESS hide_marc %]
                    <div class="subfieldcode">
                            <input type="text"
                                title="[% subfield_loo.marc_lib | $raw %]"
                                style=" [% IF ( subfield_loo.fixedfield ) %]display:none; [% END %]border:0;"
                                name="tag_[% subfield_loo.tag | html %]_code_[% subfield_loo.subfield | html %]_[% subfield_loo.index | html %]_[% subfield_loo.index_subfield | html %]"
                                value="[% subfield_loo.subfield | html %]"
                                size="1"
                                maxlength="1"
                                class="flat"
                                tabindex="0" />
                    </div>
                    [% ELSE %]
                        <input type="hidden"
                            name="tag_[% subfield_loo.tag | html %]_code_[% subfield_loo.subfield | html %]_[% subfield_loo.index | html %]_[% subfield_loo.index_subfield | html %]"
                            value="[% subfield_loo.subfield | html %]" />
                    [% END %]

                    [% UNLESS advancedMARCEditor %]
                        [% IF ( subfield_loo.mandatory ) %]
                            <div class="subfield subfield_mandatory">
                        [% ELSE %]
                            <div class="subfield">
                        [% END %]
                            [% IF ( subfield_loo.fixedfield ) %]
                                <label for="tag_[% subfield_loo.tag | html %]_subfield_[% subfield_loo.subfield | html %]_[% subfield_loo.index | html %]_[% subfield_loo.index_subfield | html %]" style="display:none;" class="labelsubfield">
                            [% IF ( authid ) %]
                                <a class="btn btn-default" id="z3950submit" href="#"><i class="fa fa-search"></i> Replace record via Z39.50/SRU search</a>
                            [% ELSE %]
                                <label for="tag_[% subfield_loo.tag | html %]_subfield_[% subfield_loo.subfield | html %]_[% subfield_loo.index | html %]_[% subfield_loo.index_subfield | html %]" class="labelsubfield">
                            [% END %]
                                [% subfield_loo.marc_lib | $raw %]
                            </label>
                        </div>
                    [% END %]

                    [% SET mv = subfield_loo.marc_value %]
                    <div id="field_marceditor[% subfield_loo.tag | html %][% subfield_loo.subfield | html %][% subfield_loo.random | html %]" class="field_marceditor">
                    [% IF ( mv.type == 'select' ) %]
                        [% IF mv.category AND CAN_user_parameters_manage_auth_values %]
                            <select name="[%- mv.name | html -%]" tabindex="1" class="input_marceditor" id="[%- mv.id | html -%]" data-category="[% mv.category | html %]">
                        [% ELSE %]
                            <select name="[%- mv.name | html -%]" tabindex="1" class="input_marceditor select2" id="[%- mv.id | html -%]">
                        [% END %]

                        [% FOREACH aval IN mv.values %]
                            [% IF aval == mv.default %]
                            <option value="[%- aval | html -%]" selected="selected">[%- mv.labels.$aval | html -%]</option>
                            [% ELSE %]
                            <option value="[%- aval | html -%]">[%- mv.labels.$aval | html -%]</option>
                            [% END %]
                        [% END %]
                        </select>
                    [% ELSIF ( mv.type == 'text1' ) %]
                        <input type="text" id="[%- mv.id | html -%]" name="[%- mv.id | html -%]" value="[%- mv.value | html -%]" class="input_marceditor" tabindex="1" />
                    [% ELSIF ( mv.type == 'text2' ) %]
                        <input type="text" id="[%- mv.id | html -%]" size="67" maxlength="[%- mv.maxlength | html -%]" name="[%- mv.name | html -%]" value="[%- mv.value | html -%]" class="input_marceditor" />
                    [% ELSIF ( mv.type == 'text' ) %]
                        <input type="text" id="[%- mv.id | html -%]" name="[%- mv.name | html -%]" value="[%- mv.value | html -%]" class="input_marceditor" tabindex="1" size="67" maxlength="[%- mv.maxlength | html -%]" />
                    [% ELSIF ( mv.type == 'textarea' ) %]
                        <textarea cols="70" rows="4" id="[%- mv.id | html -%]" name="[%- mv.name | html -%]" class="input_marceditor" tabindex="1" size="67" maxlength="[%- mv.maxlength | html -%]">[%- mv.value | html -%]</textarea>
                    [% ELSIF ( mv.type == 'hidden' ) %]
                        <input tabindex="1" type="hidden" id="[%- mv.id | html -%]" name="[%- mv.name | html -%]" size="67" maxlength="[%- mv.maxlength | html -%]" value="[%- mv.value | html -%]" />
                    [% ELSIF ( mv.type == 'hidden_simple' ) %]
                        <input type="hidden" name="[%- mv.name | html -%]" />
                    [% END %]
                    </div>
                    [% IF ( subfield_loo.mandatory ) %]
                        <div class="subfield_loop_mandatory">
                            <span class="required">Required</span>
                        </div>
                    [% END %]
                    <div class="subfield_controls">
                        [% IF ( mv.type == 'text1' ) %]
                            <a href="#" class="buttonDot tag_editor" onclick="openAuth(this.parentNode.parentNode.getElementsByTagName('input')[1].id,'[%- mv.authtypecode | html -%]','auth'); return false;" tabindex="1" title="Tag editor">Tag editor</a>
                        [% ELSIF ( mv.type == 'text2' ) %]
                            [% IF mv.noclick %]
                                <a href="#" class="buttonDot tag_editor disabled" tabindex="-1" title="No popup">...</a>
                            [% ELSE %]
                                <a href="#" id="buttonDot_[% mv.id | html %]" class="buttonDot tag_editor" title="Tag editor">...</a>
                                            <a data-tabid="[% BIG_LOO.number | html %]" href="#tab[% BIG_LOO.number | html %]XX">[% BIG_LOO.number | html %]</a>
                                        </li>
                                    [%- END -%]
                                </ul>
                            [% END %]
                            [% mv.javascript | $raw %]
                        [% END %]
                        [% IF ( subfield_loo.repeatable ) %]
                            <a href="#" class="buttonPlus" tabindex="1" onclick="CloneSubfield('subfield[% subfield_loo.tag | html %][% subfield_loo.subfield | html %][% subfield_loo.random | html %]','[% advancedMARCEditor | html %]'); return false;">
                                <img src="[% interface | html %]/[% theme | html %]/img/clone-subfield.png" alt="Clone" title="Clone this subfield" />
                            </a>
                            <a href="#" class="buttonMinus" tabindex="1" onclick="UnCloneField('subfield[% subfield_loo.tag | html %][% subfield_loo.subfield | html %][% subfield_loo.random | html %]'); return false;">
                                <img src="[% interface | html %]/[% theme | html %]/img/delete-subfield.png" alt="Delete" title="Delete this subfield" />
                            </a>
                                    [% END %]
                                [% END %]
                            </ul>
                        </div>
                    </div> <!-- /#toolbar -->
                    <div id="action">
                        [% IF count %]
                                Used in <a href="/cgi-bin/koha/catalogue/search.pl?type=intranet&amp;op=do_search&amp;q=an:[% authid | uri %]">[% count | html %] record(s)</a>
                        [% ELSE %]
                                This authority is not used in any records.
                        [% END %]
                    </div>
                                    </li>
                                    <!-- End of the line -->
                            [% FOREACH BIG_LOO IN BIG_LOOP %]
                                <li><a href="#tab[% BIG_LOO.number | uri %]XX">[% BIG_LOO.number | html %]</a></li>
                            [% END %]
                        </ul>

                        [% FOREACH BIG_LOO IN BIG_LOOP %]
                            <div id="tab[% BIG_LOO.number | html %]XX">
                                [% IF ( BIG_LOOP.size > 1 ) %]
                                    <h2>Section [% BIG_LOO.number | html %]</h2>
                                [% END %]
                                </ul> <!-- /.sortable_subfield -->
                            </li>
                        [% END %]<!-- if innerloo.tag -->
                    [% END %]<!-- BIG_LOO.innerloop -->
                    </ul> <!-- /.sortable_field -->
                </div>
            [% END %]<!-- BIG_LOOP -->
        </div><!-- tabs -->

        <div name="hidden" id="hidden" class="tab">
        [% FOREACH hidden_loo IN hidden_loop %]
            <input type="hidden" name="tag" value="[% hidden_loo.tag | html %]" />
            <input type="hidden" name="subfield" value="[% hidden_loo.subfield | html %]" />
            <input type="hidden" name="mandatory" value="[% hidden_loo.mandatory | html %]" />
            <input type="hidden" name="kohafield" value="[% hidden_loo.kohafield | html %]" />
            <input type="hidden" name="tag_mandatory" value="[% hidden_loo.tag_mandatory | html %]" />
        [% END %]
        </div>
                                            <li class="tag clearfix" id="tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]">
                                        [% END %]

                                            <div class="tag_title" id="div_indicator_tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]">
                                                [% UNLESS hide_marc %]
                                                    [% IF advancedMARCEditor %]
                                                        <a href="#" tabindex="1" class="tagnum" title="[% innerloo.tag_lib | html %] - Click to Expand this Tag" onclick="ExpandField('tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]'); return false;">[% innerloo.tag | html %]</a>
                                                    [% ELSE %]
                                                        <span class="tagnum" title="[% innerloo.tag_lib | html %]">[% innerloo.tag | html %]</span>
                                                    [% END %]
                                                    [% IF ( innerloo.fixedfield ) %]
                                                        <input type="text"
                                                            tabindex="1"
                                                            class="indicator flat"
                                                            style="display:none;"
                                                            name="tag_[% innerloo.tag | html %]_indicator1_[% innerloo.index | html %][% innerloo.random | html %]"
                                                            size="1"
                                                            maxlength="1"
                                                            value="[% innerloo.indicator1 | html %]" />
                                                        <input type="text"
                                                            tabindex="1"
                                                            class="indicator flat"
                                                            style="display:none;"
                                                            name="tag_[% innerloo.tag | html %]_indicator2_[% innerloo.index | html %][% innerloo.random | html %]"
                                                            size="1"
                                                            maxlength="1"
                                                            value="[% innerloo.indicator2 | html %]" />
                                                    [% ELSE %]
                                                        <input type="text"
                                                            tabindex="1"
                                                            class="indicator flat"
                                                            name="tag_[% innerloo.tag | html %]_indicator1_[% innerloo.index | html %][% innerloo.random | html %]"
                                                            size="1"
                                                            maxlength="1"
                                                            value="[% innerloo.indicator1 | html %]" />
                                                        <input type="text"
                                                            tabindex="1"
                                                            class="indicator flat"
                                                            name="tag_[% innerloo.tag | html %]_indicator2_[% innerloo.index | html %][% innerloo.random | html %]"
                                                            size="1"
                                                            maxlength="1"
                                                            value="[% innerloo.indicator2 | html %]" />
                                                    [% END # /IF ( innerloo.fixedfield ) %] -
                                                [% ELSE %]
                                                    [% IF ( innerloo.fixedfield ) %]
                                                        <input type="hidden"
                                                            tabindex="1"
                                                            name="tag_[% innerloo.tag | html %]_indicator1_[% innerloo.index | html %][% innerloo.random | html %]"
                                                            value="[% innerloo.indicator1 | html %]" />
                                                        <input type="hidden"
                                                            tabindex="1"
                                                            name="tag_[% innerloo.tag | html %]_indicator2_[% innerloo.index | html %][% innerloo.random | html %]"
                                                            value="[% innerloo.indicator2 | html %]" />
                                                    [% ELSE %]
                                                        <input type="hidden"
                                                            tabindex="1"
                                                            name="tag_[% innerloo.tag | html %]_indicator1_[% innerloo.index | html %][% innerloo.random | html %]"
                                                            value="[% innerloo.indicator1 | html %]" />
                                                        <input type="hidden"
                                                            tabindex="1"
                                                            name="tag_[% innerloo.tag | html %]_indicator2_[% innerloo.index | html %][% innerloo.random | html %]"
                                                            value="[% innerloo.indicator2 | html %]" />
                                                    [% END # /IF ( innerloo.fixedfield ) %]
                                                [% END # /UNLESS hide_marc %]

                                                [% UNLESS advancedMARCEditor %]
                                                    <a href="#" tabindex="1" class="expandfield" onclick="ExpandField('tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]'); return false;" title="Click to Expand this Tag">[% innerloo.tag_lib | html %]</a>
                                                [% END %]
                                                <span class="field_controls">
                                                    [% IF ( innerloo.repeatable ) %]
                                                        <a href="#" tabindex="1" class="buttonPlus" onclick="CloneField('tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]','[% hide_marc | html %]','[% advancedMARCEditor | html %]'); return false;" title="Repeat this Tag">
                                                            <img src="[% interface | html %]/[% theme | html %]/img/repeat-tag.png" alt="Repeat this Tag" />
                                                        </a>
                                                    [% END %]
                                                    <a href="#" tabindex="1" class="buttonMinus" onclick="UnCloneField('tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]'); return false;" title="Delete this Tag">
                                                        <img src="[% interface | html %]/[% theme | html %]/img/delete-tag.png" alt="Delete this Tag" />
                                                    </a>
                                                </span> <!-- /.field_controls -->
                                            </div> <!-- /div.tag_title -->

                                            <ul class="sortable_subfield">
                                                [% FOREACH subfield_loo IN innerloo.subfield_loop %]
                                                    <!--  One line on the marc editor -->
                                                    <li class="subfield_line" style="[% subfield_loo.visibility | html %]" id="subfield[% subfield_loo.tag | html %][% subfield_loo.subfield | html %][% subfield_loo.random | html %]">

                                                        [% UNLESS hide_marc %]
                                                            <div class="subfieldcode">
                                                                <input type="text"
                                                                    title="[% subfield_loo.marc_lib | $raw %]"
                                                                    style=" [% IF ( subfield_loo.fixedfield ) %]display:none; [% END %]border:0;"
                                                                    name="tag_[% subfield_loo.tag | html %]_code_[% subfield_loo.subfield | html %]_[% subfield_loo.index | html %]_[% subfield_loo.index_subfield | html %]"
                                                                    value="[% subfield_loo.subfield | html %]"
                                                                    size="1"
                                                                    maxlength="1"
                                                                    class="flat"
                                                                    tabindex="0" />
                                                            </div>
                                                        [% ELSE %]
                                                            <input type="hidden"
                                                                name="tag_[% subfield_loo.tag | html %]_code_[% subfield_loo.subfield | html %]_[% subfield_loo.index | html %]_[% subfield_loo.index_subfield | html %]"
                                                                value="[% subfield_loo.subfield | html %]" />
                                                        [% END # /UNLESS hide_marc %]

                                                        [% UNLESS advancedMARCEditor %]
                                                            [% IF ( subfield_loo.mandatory ) %]
                                                                <div class="subfield subfield_mandatory">
                                                            [% ELSE %]
                                                                <div class="subfield">
                                                            [% END %]
                                                                [% IF ( subfield_loo.fixedfield ) %]
                                                                    <label for="tag_[% subfield_loo.tag | html %]_subfield_[% subfield_loo.subfield | html %]_[% subfield_loo.index | html %]_[% subfield_loo.index_subfield | html %]" style="display:none;" class="labelsubfield">
                                                                [% ELSE %]
                                                                    <label for="tag_[% subfield_loo.tag | html %]_subfield_[% subfield_loo.subfield | html %]_[% subfield_loo.index | html %]_[% subfield_loo.index_subfield | html %]" class="labelsubfield">
                                                                [% END %]
                                                                    [% subfield_loo.marc_lib | $raw %]
                                                                </label>
                                                            </div> <!-- /.subfield -->
                                                        [% END # UNLESS advancedMARCEditor %]

                                                        [% SET mv = subfield_loo.marc_value %]
                                                        <div id="field_marceditor[% subfield_loo.tag | html %][% subfield_loo.subfield | html %][% subfield_loo.random | html %]" class="field_marceditor">
                                                            [% IF ( mv.type == 'select' ) %]
                                                                [% IF mv.category AND CAN_user_parameters_manage_auth_values %]
                                                                    <select name="[%- mv.name | html -%]" tabindex="1" class="input_marceditor" id="[%- mv.id | html -%]" data-category="[% mv.category | html %]">
                                                                [% ELSE %]
                                                                    <select name="[%- mv.name | html -%]" tabindex="1" class="input_marceditor select2" id="[%- mv.id | html -%]">
                                                                [% END %]
                                                                    [% FOREACH aval IN mv.values %]
                                                                        [% IF aval == mv.default %]
                                                                            <option value="[%- aval | html -%]" selected="selected">[%- mv.labels.$aval | html -%]</option>
                                                                        [% ELSE %]
                                                                            <option value="[%- aval | html -%]">[%- mv.labels.$aval | html -%]</option>
                                                                        [% END %]
                                                                    [% END %]
                                                                </select>
                                                            [% ELSIF ( mv.type == 'text1' ) %]
                                                                <input type="text" id="[%- mv.id | html -%]" name="[%- mv.id | html -%]" value="[%- mv.value | html -%]" class="input_marceditor" tabindex="1" />
                                                            [% ELSIF ( mv.type == 'text2' ) %]
                                                                <input type="text" id="[%- mv.id | html -%]" size="67" maxlength="[%- mv.maxlength | html -%]" name="[%- mv.name | html -%]" value="[%- mv.value | html -%]" class="input_marceditor" />
                                                            [% ELSIF ( mv.type == 'text' ) %]
                                                                <input type="text" id="[%- mv.id | html -%]" name="[%- mv.name | html -%]" value="[%- mv.value | html -%]" class="input_marceditor" tabindex="1" size="67" maxlength="[%- mv.maxlength | html -%]" />
                                                            [% ELSIF ( mv.type == 'textarea' ) %]
                                                                <textarea cols="70" rows="4" id="[%- mv.id | html -%]" name="[%- mv.name | html -%]" class="input_marceditor" tabindex="1" size="67" maxlength="[%- mv.maxlength | html -%]">[%- mv.value | html -%]</textarea>
                                                            [% ELSIF ( mv.type == 'hidden' ) %]
                                                                <input tabindex="1" type="hidden" id="[%- mv.id | html -%]" name="[%- mv.name | html -%]" size="67" maxlength="[%- mv.maxlength | html -%]" value="[%- mv.value | html -%]" />
                                                            [% ELSIF ( mv.type == 'hidden_simple' ) %]
                                                                <input type="hidden" name="[%- mv.name | html -%]" />
                                                            [% END # /IF mv.type %]
                                                        </div> <!-- /.field_marceditor -->

                                                        [% IF ( subfield_loo.mandatory ) %]
                                                            <div class="subfield_loop_mandatory">
                                                                <span class="required">Required</span>
                                                            </div>
                                                        [% END %]

                                                        <div class="subfield_controls">
                                                            [% IF ( mv.type == 'text1' ) %]
                                                                <a href="#" class="buttonDot tag_editor" onclick="openAuth(this.parentNode.parentNode.getElementsByTagName('input')[1].id,'[%- mv.authtypecode | html -%]','auth'); return false;" tabindex="1" title="Tag editor">Tag editor</a>
                                                            [% ELSIF ( mv.type == 'text2' ) %]
                                                                [% IF mv.noclick %]
                                                                    <a href="#" class="buttonDot tag_editor disabled" tabindex="-1" title="No popup">...</a>
                                                                [% ELSE %]
                                                                    <a href="#" id="buttonDot_[% mv.id | html %]" class="buttonDot tag_editor" title="Tag editor">...</a>
                                                                [% END %]
                                                                [% mv.javascript | $raw %]
                                                            [% END #/IF ( mv.type == 'text1' ) %]
                                                            [% IF ( subfield_loo.repeatable ) %]
                                                                <a href="#" class="buttonPlus" tabindex="1" onclick="CloneSubfield('subfield[% subfield_loo.tag | html %][% subfield_loo.subfield | html %][% subfield_loo.random | html %]','[% advancedMARCEditor | html %]'); return false;">
                                                                    <img src="[% interface | html %]/[% theme | html %]/img/clone-subfield.png" alt="Clone" title="Clone this subfield" />
                                                                </a>
                                                                <a href="#" class="buttonMinus" tabindex="1" onclick="UnCloneField('subfield[% subfield_loo.tag | html %][% subfield_loo.subfield | html %][% subfield_loo.random | html %]'); return false;">
                                                                    <img src="[% interface | html %]/[% theme | html %]/img/delete-subfield.png" alt="Delete" title="Delete this subfield" />
                                                                </a>
                                                            [% END # /IF ( subfield_loo.repeatable ) %]
                                                        </div> <!-- /.subfield_controls -->
                                                    </li> <!-- /.subfield_line -->
                                                [% END # /FOREACH subfield_loo %]
                                            </ul> <!-- /.sortable_subfield -->
                                        </li> <!-- /.tag -->
                                    [% END # /IF ( innerloo.tag ) %]
                                [% END # /FOREACH innerloo %]
                                </ul> <!-- /.sortable_field -->
                            </div> <!-- /#tab[% BIG_LOO.number | html %]XX -->
                        [% END #/FOREACH BIG_LOO %]
                    </div> <!-- /#authoritytabs -->

                    <div name="hidden" id="hidden" class="tab">
                        [% FOREACH hidden_loo IN hidden_loop %]
                            <input type="hidden" name="tag" value="[% hidden_loo.tag | html %]" />
                            <input type="hidden" name="subfield" value="[% hidden_loo.subfield | html %]" />
                            <input type="hidden" name="mandatory" value="[% hidden_loo.mandatory | html %]" />
                            <input type="hidden" name="kohafield" value="[% hidden_loo.kohafield | html %]" />
                            <input type="hidden" name="tag_mandatory" value="[% hidden_loo.tag_mandatory | html %]" />
                        [% END %]
                    </div> <!-- /.tab -->
                    [% IF ( oldauthnumtagfield ) %]
                        <input type="hidden" name="tag" value="[% oldauthnumtagfield | html %]" />
                        <input type="hidden" name="subfield" value="[% oldauthnumtagsubfield | html %]" />
                        <input type="hidden" name="field_value" value="[% authid | html %]" />
                        <input type="hidden" name="mandatory" value="0" />
                        <input type="hidden" name="kohafield" value="[% kohafield | html %]" />
                        <input type="hidden" name="tag_mandatory" value="[% tag_mandatory | html %]" />
                        <input type="hidden" name="tag" value="[% oldauthtypetagfield | html %]" />
                        <input type="hidden" name="subfield" value="[% oldauthtypetagsubfield | html %]" />
                        <input type="hidden" name="field_value" value="[% authtypecode | html %]" />
                    [% END %]

        [% IF ( oldauthnumtagfield ) %]
            <input type="hidden" name="tag" value="[% oldauthnumtagfield | html %]" />
            <input type="hidden" name="subfield" value="[% oldauthnumtagsubfield | html %]" />
            <input type="hidden" name="field_value" value="[% authid | html %]" />
            <input type="hidden" name="mandatory" value="0" />
            <input type="hidden" name="kohafield" value="[% kohafield | html %]" />
            <input type="hidden" name="tag_mandatory" value="[% tag_mandatory | html %]" />
            <input type="hidden" name="tag" value="[% oldauthtypetagfield | html %]" />
            <input type="hidden" name="subfield" value="[% oldauthtypetagsubfield | html %]" />
            <input type="hidden" name="field_value" value="[% authtypecode | html %]" />
        [% END %]

    </form>

[% INCLUDE 'modals/cataloguing_create_av.inc' %]

</div>
</fieldset>
</div>
</div>

[% INCLUDE 'intranet-bottom.inc' %]

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt (-2 / +10 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'authorities-search.inc' %]
		6	[% END %]
4	[% PROCESS 'authorities.inc' %]	7	[% PROCESS 'authorities.inc' %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	<title>[% IF ( unknownauthid ) %]	9	<title>[% IF ( unknownauthid ) %]
Lines 17-24 Link Here
17	</head>	20	</head>
18		21
19	<body id="auth_detail" class="auth">	22	<body id="auth_detail" class="auth">
20	[% INCLUDE 'header.inc' %]	23	[% INCLUDE 'header.inc' form=formulaire %]
21	[% INCLUDE 'authorities-search.inc' %]
22		24
23	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	25	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
24	<ol>	26	<ol>
Lines 39-44 Link Here
39	</a>	41	</a>
40	</li>	42	</li>
41	</ol>	43	</ol>
		44	<ol>
		45	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		46	</ol>
		47	<ol>
		48	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		49	</ol>
42	</nav>	50	</nav>
43		51
44	<div class="main container-fluid">	52	<div class="main container-fluid">

Lines 2-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt (-2 / +10 lines)
2	[% USE Asset %]	2	[% USE Asset %]
3	[% PROCESS 'merge-record.inc' %]	3	[% PROCESS 'merge-record.inc' %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE 'authorities-search.inc' %]
		7	[% END %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	<title>Merging records &rsaquo; Cataloging &rsaquo; Koha</title>	9	<title>Merging records &rsaquo; Cataloging &rsaquo; Koha</title>
7	[% INCLUDE 'doc-head-close.inc' %]	10	[% INCLUDE 'doc-head-close.inc' %]
Lines 13-20 div#result { margin-top: 1em; } Link Here
13	</head>	16	</head>
14		17
15	<body id="auth_merge" class="cat">	18	<body id="auth_merge" class="cat">
16	[% INCLUDE 'header.inc' %]	19	[% INCLUDE 'header.inc' form=formulaire %]
17	[% INCLUDE 'authorities-search.inc' %]
18		20
19	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	21	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
20	<ol>	22	<ol>
Lines 30-35 div#result { margin-top: 1em; } Link Here
30	</a>	32	</a>
31	</li>	33	</li>
32	</ol>	34	</ol>
		35	<ol>
		36	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		37	</ol>
		38	<ol>
		39	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		40	</ol>
33	</nav>	41	</nav>
34		42
35	<div class="main container-fluid">	43	<div class="main container-fluid">

Lines 2-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt (-2 / +10 lines)
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE Koha %]	3	[% USE Koha %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE 'authorities-search.inc' %]
		7	[% END %]
5	[% PROCESS 'authorities-search-results.inc' %]	8	[% PROCESS 'authorities-search-results.inc' %]
6	[% INCLUDE 'doc-head-open.inc' %]	9	[% INCLUDE 'doc-head-open.inc' %]
7	<title>Authority search results &rsaquo; Authorities &rsaquo; Koha</title>	10	<title>Authority search results &rsaquo; Authorities &rsaquo; Koha</title>
Lines 19-26 Link Here
19	</head>	22	</head>
20		23
21	<body id="auth_searchresultlist" class="auth">	24	<body id="auth_searchresultlist" class="auth">
22	[% INCLUDE 'header.inc' %]	25	[% INCLUDE 'header.inc' form=formulaire %]
23	[% INCLUDE 'authorities-search.inc' %]
24		26
25	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	27	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
26	<ol>	28	<ol>
Lines 36-41 Link Here
36	</a>	38	</a>
37	</li>	39	</li>
38	</ol>	40	</ol>
		41	<ol>
		42	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		43	</ol>
		44	<ol>
		45	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		46	</ol>
39	</nav>	47	</nav>
40		48
41	<div class="main container-fluid">	49	<div class="main container-fluid">




                    <h1>Your cart</h1>

                    <div id="toolbar" class="btn-toolbar">
                    <div>
                        [% IF ( verbose ) %]
                            <a href="basket.pl" class="pat showdetails showless"><i class="fa fa-folder"></i> Brief display</a>
                        [% ELSE %]
                            <a href="basket.pl" class="pat showdetails showmore"><i class="fa fa-folder-open"></i> More details</a>
                        [% END %]

                        <a class="pat" href="basket.pl" id="send_cart"><i class="fa fa-envelope"></i> Send</a>
                        <div class="btn-group">
                            <a class="pat dropdown-toggle" data-toggle="dropdown" href="#" id="downloadcart"><i class="fa fa-download"></i> Download <span class="caret"></span> </a>
                            <ul class="dropdown-menu">
                                <li><a href="/cgi-bin/koha/basket/downloadcart.pl?format=iso2709&amp;bib_list=[% bib_list | uri %]">iso2709</a></li>
                                <li><a href="/cgi-bin/koha/basket/downloadcart.pl?format=ris&amp;bib_list=[% bib_list | uri %]">RIS</a></li>

                            [% END %]
                            </ul>
                        </div>
                        <a class="pat" href="basket.pl" id="print_cart"><i class="fa fa-print"></i> Print</a>
                        <a class="pat" href="basket.pl" id="empty_cart"><i class="fa fa-trash"></i> Empty and close</a>
                        <a class="pat close" href="basket.pl"><i class="fa fa-times-circle"></i> Hide window</a>
                    </div>
                    </div>



Lines 2-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt (-1 / +10 lines)
2	[% USE Koha %]	2	[% USE Koha %]
3	[% USE Asset %]	3	[% USE Asset %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE 'cat-search.inc' %]
		7	[% END %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	<title>	9	<title>
7	[% IF ( unknownbiblionumber ) %]	10	[% IF ( unknownbiblionumber ) %]
Lines 14-20 Link Here
14	</head>	17	</head>
15	<body id="catalog_ISBDdetail" class="catalog">	18	<body id="catalog_ISBDdetail" class="catalog">
16		19
17	[% INCLUDE 'header.inc' %]	20	[% INCLUDE 'header.inc' form=formulaire %]
18		21
19	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	22	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
20	<ol>	23	<ol>
Lines 42-47 Link Here
42	</li>	45	</li>
43	[% END %]	46	[% END %]
44	</ol>	47	</ol>
		48	<ol>
		49	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		50	</ol>
		51	<ol>
		52	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		53	</ol>
45	</nav>	54	</nav>
46		55
47	<div class="main container-fluid">	56	<div class="main container-fluid">

Lines 2-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt (-1 / +10 lines)
2	[% USE Koha %]	2	[% USE Koha %]
3	[% USE Asset %]	3	[% USE Asset %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE 'cat-search.inc' %]
		7	[% END %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	<title>	9	<title>
7	[% IF ( unknownbiblionumber ) %]	10	[% IF ( unknownbiblionumber ) %]
Lines 15-21 Link Here
15		18
16	<body id="catalog_MARCdetail" class="catalog">	19	<body id="catalog_MARCdetail" class="catalog">
17		20
18	[% INCLUDE 'header.inc' %]	21	[% INCLUDE 'header.inc' form=formulaire %]
19		22
20	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	23	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
21	<ol>	24	<ol>
Lines 43-48 Link Here
43	</li>	46	</li>
44	[% END %]	47	[% END %]
45	</ol>	48	</ol>
		49	<ol>
		50	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		51	</ol>
		52	<ol>
		53	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		54	</ol>
46	</nav>	55	</nav>
47		56
48	<div class="main container-fluid">	57	<div class="main container-fluid">

Lines 32-37 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-4 / +13 lines)
32	[% SET plugins_intranet_catalog_biblio_tabs = KohaPlugins.get_plugins_intranet_catalog_biblio_tab({ biblio => biblio, biblio_id => biblionumber }) %]	32	[% SET plugins_intranet_catalog_biblio_tabs = KohaPlugins.get_plugins_intranet_catalog_biblio_tab({ biblio => biblio, biblio_id => biblionumber }) %]
33		33
34	[% SET footerjs = 1 %]	34	[% SET footerjs = 1 %]
		35	[% formulaire = BLOCK %]
		36	[% INCLUDE 'cat-search.inc' %]
		37	[% END %]
35	[% INCLUDE 'doc-head-open.inc' %]	38	[% INCLUDE 'doc-head-open.inc' %]
36	<title>	39	<title>
37	[% IF ( unknownbiblionumber ) %]	40	[% IF ( unknownbiblionumber ) %]
Lines 46-52 Link Here
46		49
47	<body id="catalog_detail" class="catalog">	50	<body id="catalog_detail" class="catalog">
48		51
49	[% INCLUDE 'header.inc' %]	52	[% INCLUDE 'header.inc' form=formulaire %]
50		53
51	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	54	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
52	<ol>	55	<ol>
Lines 74-79 Link Here
74	</li>	77	</li>
75	[% END %]	78	[% END %]
76	</ol>	79	</ol>
		80	<ol>
		81	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		82	</ol>
		83	<ol>
		84	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		85	</ol>
77	</nav>	86	</nav>
78		87
79	<div class="main container-fluid">	88	<div class="main container-fluid">
Lines 603-615 Note that permanent location is a code, and location may be an authval. Link Here
603	[% UNLESS item.cannot_be_edited %]	612	[% UNLESS item.cannot_be_edited %]
604	[% IF Koha.Preference('LocalCoverImages') OR Koha.Preference('OPACLocalCoverImages') %]	613	[% IF Koha.Preference('LocalCoverImages') OR Koha.Preference('OPACLocalCoverImages') %]
605	<div class="btn-group">	614	<div class="btn-group">
606	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% item.biblionumber \| html %]&itemnumber=[% item.itemnumber \| html %]#edititem"><i class="fa fa-pencil"></i> Edit</a><a class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></a>	615	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% item.biblionumber \| html %]&itemnumber=[% item.itemnumber \| html %]#edititem" id="lientype"><i class="fa fa-pencil"></i> Edit</a><a class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" id="lientype"><span class="caret"></span></a>
607	<ul class="dropdown-menu pull-right">	616	<ul class="dropdown-menu pull-right">
608	<li><a href="/cgi-bin/koha/tools/upload-cover-image.pl?itemnumber=[% item.itemnumber \| uri %]&filetype=image"><i class="fa fa-upload"></i> Upload image</a></li>	617	<li><a href="/cgi-bin/koha/tools/upload-cover-image.pl?itemnumber=[% item.itemnumber \| uri %]&filetype=image"><i class="fa fa-upload"></i> Upload image</a></li>
609	</ul>	618	</ul>
610	</div>	619	</div>
611	[% ELSE %]	620	[% ELSE %]
612	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% item.biblionumber \| html %]&itemnumber=[% item.itemnumber \| html %]#edititem"><i class="fa fa-pencil"></i> Edit</a>	621	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% item.biblionumber \| html %]&itemnumber=[% item.itemnumber \| html %]#edititem" id="lientype"><i class="fa fa-pencil"></i> Edit</a>
613	[% END %]	622	[% END %]
614	[% END %]	623	[% END %]
615	</td>	624	</td>
Lines 966-972 Note that permanent location is a code, and location may be an authval. Link Here
966	<span class="noimagesuploaded">No images have been uploaded for this bibliographic record yet.</span>	975	<span class="noimagesuploaded">No images have been uploaded for this bibliographic record yet.</span>
967	[% END %]	976	[% END %]
968	[% IF ( CAN_user_tools_upload_local_cover_images ) %]	977	[% IF ( CAN_user_tools_upload_local_cover_images ) %]
969	<p>Upload an image file: <a class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/upload-cover-image.pl?biblionumber=[% biblionumber \| uri %]&filetype=image"><i class="fa fa-upload" aria-hidden="true"></i> Upload</a>	978	<p>Upload an image file: <a class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/upload-cover-image.pl?biblionumber=[% biblionumber \| uri %]&filetype=image" id="lientype"><i class="fa fa-upload" aria-hidden="true"></i> Upload</a>
970	</p>	979	</p>
971	[% END %]	980	[% END %]
972	</div>	981	</div>

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt (-1 / +10 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'cat-search.inc' %]
		6	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
5	<title>Images &rsaquo; [% INCLUDE 'biblio-title-head.inc' %] &rsaquo; Catalog &rsaquo; Koha</title>	8	<title>Images &rsaquo; [% INCLUDE 'biblio-title-head.inc' %] &rsaquo; Catalog &rsaquo; Koha</title>
6	[% INCLUDE 'doc-head-close.inc' %]	9	[% INCLUDE 'doc-head-close.inc' %]
Lines 24-30 Link Here
24		27
25	<body id="catalog_imageviewer" class="catalog">	28	<body id="catalog_imageviewer" class="catalog">
26		29
27	[% INCLUDE 'header.inc' %]	30	[% INCLUDE 'header.inc' form=formulaire %]
28		31
29	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	32	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
30	<ol>	33	<ol>
Lines 43-48 Link Here
43	</a>	46	</a>
44	</li>	47	</li>
45	</ol>	48	</ol>
		49	<ol>
		50	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		51	</ol>
		52	<ol>
		53	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		54	</ol>
46	</nav>	55	</nav>
47		56
48	<div class="main container-fluid">	57	<div class="main container-fluid">

Lines 5-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt (-1 / +10 lines)
5	[% USE Branches %]	5	[% USE Branches %]
6	[% USE TablesSettings %]	6	[% USE TablesSettings %]
7	[% SET footerjs = 1 %]	7	[% SET footerjs = 1 %]
		8	[% formulaire = BLOCK %]
		9	[% INCLUDE 'cat-search.inc' %]
		10	[% END %]
8	[% INCLUDE 'doc-head-open.inc' %]	11	[% INCLUDE 'doc-head-open.inc' %]
9	<title>Checkout history for [% INCLUDE 'biblio-title-head.inc' %] &rsaquo; Catalog &rsaquo; Koha</title>	12	<title>Checkout history for [% INCLUDE 'biblio-title-head.inc' %] &rsaquo; Catalog &rsaquo; Koha</title>
10	[% INCLUDE 'doc-head-close.inc' %]	13	[% INCLUDE 'doc-head-close.inc' %]
Lines 12-18 Link Here
12		15
13	<body id="catalog_issuehistory" class="catalog">	16	<body id="catalog_issuehistory" class="catalog">
14		17
15	[% INCLUDE 'header.inc' %]	18	[% INCLUDE 'header.inc' form=formulaire %]
16		19
17	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	20	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
18	<ol>	21	<ol>
Lines 31-36 Link Here
31	</a>	34	</a>
32	</li>	35	</li>
33	</ol>	36	</ol>
		37	<ol>
		38	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		39	</ol>
		40	<ol>
		41	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		42	</ol>
34	</nav>	43	</nav>
35		44
36	<div class="main container-fluid">	45	<div class="main container-fluid">

Lines 2-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt (-1 / +10 lines)
2	[% USE Koha %]	2	[% USE Koha %]
3	[% USE Asset %]	3	[% USE Asset %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE 'cat-search.inc' %]
		7	[% END %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6		9
7	<title>	10	<title>
Lines 16-22 Link Here
16	</head>	19	</head>
17		20
18	<body id="catlaog_labeledMARCdetail" class="catalog">	21	<body id="catlaog_labeledMARCdetail" class="catalog">
19	[% INCLUDE 'header.inc' %]	22	[% INCLUDE 'header.inc' form=formulaire %]
20		23
21	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	24	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
22	<ol>	25	<ol>
Lines 36-41 Link Here
36	</a>	39	</a>
37	</li>	40	</li>
38	</ol>	41	</ol>
		42	<ol>
		43	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		44	</ol>
		45	<ol>
		46	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		47	</ol>
39	</nav>	48	</nav>
40		49
41	<div class="main container-fluid">	50	<div class="main container-fluid">

Lines 5-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt (-12 / +21 lines)
5	[% USE Branches %]	5	[% USE Branches %]
6	[% USE Price %]	6	[% USE Price %]
7	[% SET footerjs = 1 %]	7	[% SET footerjs = 1 %]
		8	[% formulaire = BLOCK %]
		9	[% INCLUDE 'cat-search.inc' %]
		10	[% END %]
8	[% INCLUDE 'doc-head-open.inc' %]	11	[% INCLUDE 'doc-head-open.inc' %]
9	<title>Item details for [% INCLUDE 'biblio-title-head.inc' %] &rsaquo; Catalog &rsaquo; Koha</title>	12	<title>Item details for [% INCLUDE 'biblio-title-head.inc' %] &rsaquo; Catalog &rsaquo; Koha</title>
10	[% INCLUDE 'doc-head-close.inc' %]	13	[% INCLUDE 'doc-head-close.inc' %]
Lines 12-18 Link Here
12	</head>	15	</head>
13	<body id="catalog_moredetail" class="catalog">	16	<body id="catalog_moredetail" class="catalog">
14	[% USE KohaDates %]	17	[% USE KohaDates %]
15	[% INCLUDE 'header.inc' %]	18	[% INCLUDE 'header.inc' form=formulaire %]
16		19
17	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	20	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
18	<ol>	21	<ol>
Lines 31-36 Link Here
31	</a>	34	</a>
32	</li>	35	</li>
33	</ol>	36	</ol>
		37	<ol>
		38	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		39	</ol>
		40	<ol>
		41	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		42	</ol>
34	</nav>	43	</nav>
35		44
36	<div class="main container-fluid">	45	<div class="main container-fluid">
Lines 63-69 Link Here
63	<li><span class="label">Physical details:</span> [% pages \| html %] [% illus \| html %] [% size \| html %] </li>	72	<li><span class="label">Physical details:</span> [% pages \| html %] [% illus \| html %] [% size \| html %] </li>
64	[% IF ( bnotes ) %]<li><span class="label">Notes:</span> [% bnotes \| html %]</li>[% END %]	73	[% IF ( bnotes ) %]<li><span class="label">Notes:</span> [% bnotes \| html %]</li>[% END %]
65	<li><span class="label">No. of items:</span> [% count \| html %] [% IF ( hiddencount ) %]total ([% showncount \| html %] shown / [% hiddencount \| html %] hidden)	74	<li><span class="label">No. of items:</span> [% count \| html %] [% IF ( hiddencount ) %]total ([% showncount \| html %] shown / [% hiddencount \| html %] hidden)
66	<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblionumber \| uri %]&showallitems=1">Show all items</a>[% END %]</li>	75	<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblionumber \| uri %]&showallitems=1" id="lientype">Show all items</a>[% END %]</li>
67	</ol>	76	</ol>
68	</div>	77	</div>
69	</div>	78	</div>
Lines 73-79 Link Here
73	[% END %]	82	[% END %]
74		83
75	[% IF ( ONLY_ONE ) %]	84	[% IF ( ONLY_ONE ) %]
76	<div class="dialog message">You are only viewing one item. <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblionumber \| uri %]&bi=[% biblioitemnumber \| uri %]#item[% itemnumber \| uri %]">View all</a></div>	85	<div class="dialog message">You are only viewing one item. <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblionumber \| uri %]&bi=[% biblioitemnumber \| uri %]#item[% itemnumber \| uri %]" id="lientype">View all</a></div>
77	[% END %]	86	[% END %]
78		87
79	[% IF updated_exclude_from_local_holds_priority.defined %]	88	[% IF updated_exclude_from_local_holds_priority.defined %]
Lines 92-98 Link Here
92		101
93	<h4>Item information [% UNLESS ( ITEM_DAT.nomod ) %]	102	<h4>Item information [% UNLESS ( ITEM_DAT.nomod ) %]
94	[% IF ( CAN_user_editcatalogue_edit_items ) %]	103	[% IF ( CAN_user_editcatalogue_edit_items ) %]
95	<a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% ITEM_DAT.biblionumber \| uri %]&itemnumber=[% ITEM_DAT.itemnumber \| uri %]"><i class="fa fa-pencil"></i> Edit item</a>	104	<a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% ITEM_DAT.biblionumber \| uri %]&itemnumber=[% ITEM_DAT.itemnumber \| uri %]" id="lientype"><i class="fa fa-pencil"></i> Edit item</a>
96	[% END %]	105	[% END %]
97	[% END %]</h4>	106	[% END %]</h4>
98	<div class="rows">	107	<div class="rows">
Lines 160-170 Link Here
160	<input type="hidden" name="damaged" value="[% ITEM_DAT.damaged \| html %]" />	169	<input type="hidden" name="damaged" value="[% ITEM_DAT.damaged \| html %]" />
161		170
162	[% IF ClaimReturnedLostValue && ITEM_DAT.itemlost == ClaimReturnedLostValue %]	171	[% IF ClaimReturnedLostValue && ITEM_DAT.itemlost == ClaimReturnedLostValue %]
163	<input type="submit" name="submit" class="submit" value="Set status" disabled="disabled"/>	172	<input type="submit" name="submit" class="principal" value="Set status" disabled="disabled"/>
164	<p class="help-block">Item has been claimed as returned.</p>	173	<p class="help-block">Item has been claimed as returned.</p>
165	[% ELSE %]	174	[% ELSE %]
166	<input type="hidden" name="op" value="set_lost" />	175	<input type="hidden" name="op" value="set_lost" />
167	<input type="submit" name="submit" class="submit" value="Set status" />	176	<input type="submit" name="submit" class="principal" value="Set status" />
168	[% END %]	177	[% END %]
169	</form>	178	</form>
170	[% ELSE %]	179	[% ELSE %]
Lines 198-204 Link Here
198	[% END %]	207	[% END %]
199	</select>	208	</select>
200	<input type="hidden" name="op" value="set_damaged" />	209	<input type="hidden" name="op" value="set_damaged" />
201	<input type="submit" name="submit" class="submit" value="Set status" /></form>	210	<input type="submit" name="submit" class="principal" value="Set status" /></form>
202	[% ELSE %]	211	[% ELSE %]
203	[% FOREACH itemdamagedloo IN itemdamagedloop %]	212	[% FOREACH itemdamagedloo IN itemdamagedloop %]
204	[% IF ( itemdamagedloo.selected ) %]	213	[% IF ( itemdamagedloo.selected ) %]
Lines 231-237 Link Here
231	[% END %]	240	[% END %]
232	</select>	241	</select>
233	<input type="hidden" name="op" value="set_withdrawn" />	242	<input type="hidden" name="op" value="set_withdrawn" />
234	<input type="submit" name="submit" class="submit" value="Set status" /></form>	243	<input type="submit" name="submit" class="principal" value="Set status" /></form>
235	[% ELSE %]	244	[% ELSE %]
236	[% FOREACH itemwithdrawn IN itemwithdrawnloop %]	245	[% FOREACH itemwithdrawn IN itemwithdrawnloop %]
237	[% IF itemwithdrawn.authorised_value == ITEM_DAT.withdrawn %]	246	[% IF itemwithdrawn.authorised_value == ITEM_DAT.withdrawn %]
Lines 267-273 Link Here
267	[% END %]	276	[% END %]
268	</select>	277	</select>
269	<input type="hidden" name="op" value="set_exclude_priority" />	278	<input type="hidden" name="op" value="set_exclude_priority" />
270	<input type="submit" name="submit" class="submit" value="Update" /></form>	279	<input type="submit" name="submit" class="principal" value="Update" /></form>
271	</li>	280	</li>
272	</ol>	281	</ol>
273	</div>	282	</div>
Lines 305-311 Link Here
305	</li>	314	</li>
306	[% END %]	315	[% END %]
307		316
308	<li><span class="label">Total checkouts:</span>[% IF ( ITEM_DAT.issues ) %][% ITEM_DAT.issues \| html %][% ELSE %]0[% END %] (<a href="/cgi-bin/koha/circ/bookcount.pl?&biblionumber=[% ITEM_DAT.biblionumber \| uri %]&itm=[% ITEM_DAT.itemnumber \| uri %]">View item's checkout history</a>)</li>	317	<li><span class="label">Total checkouts:</span>[% IF ( ITEM_DAT.issues ) %][% ITEM_DAT.issues \| html %][% ELSE %]0[% END %] (<a href="/cgi-bin/koha/circ/bookcount.pl?&biblionumber=[% ITEM_DAT.biblionumber \| uri %]&itm=[% ITEM_DAT.itemnumber \| uri %]" id="lientype">View item's checkout history</a>)</li>
309		318
310	<li><span class="label">Last seen:</span>[% IF ( ITEM_DAT.datelastseen ) %][% ITEM_DAT.datelastseen \| $KohaDates %] [%END %] </li>	319	<li><span class="label">Last seen:</span>[% IF ( ITEM_DAT.datelastseen ) %][% ITEM_DAT.datelastseen \| $KohaDates %] [%END %] </li>
311	<li><span class="label">Last borrowed:</span>[% IF (ITEM_DAT.datelastborrowed ) %][% ITEM_DAT.datelastborrowed \| $KohaDates %][% END %] </li>	320	<li><span class="label">Last borrowed:</span>[% IF (ITEM_DAT.datelastborrowed ) %][% ITEM_DAT.datelastborrowed \| $KohaDates %][% END %] </li>
Lines 325-331 Link Here
325	<form class="inline" action="updateitem.pl" method="post"><input type="hidden" name="biblionumber" value="[% ITEM_DAT.biblionumber \| html %]" />	334	<form class="inline" action="updateitem.pl" method="post"><input type="hidden" name="biblionumber" value="[% ITEM_DAT.biblionumber \| html %]" />
326	<input type="hidden" name="biblioitemnumber" value="[% ITEM_DAT.biblioitemnumber \| html %]" /><input type="hidden" name="itemnumber" value="[% ITEM_DAT.itemnumber \| html %]" />	335	<input type="hidden" name="biblioitemnumber" value="[% ITEM_DAT.biblioitemnumber \| html %]" /><input type="hidden" name="itemnumber" value="[% ITEM_DAT.itemnumber \| html %]" />
327	<input type="hidden" name="op" value="set_public_note" />	336	<input type="hidden" name="op" value="set_public_note" />
328	<textarea name="itemnotes" rows="2" cols="30">[% ITEM_DAT.itemnotes \| html %]</textarea><input type="submit" name="submit" class="submit" value="Update" />	337	<textarea name="itemnotes" rows="2" cols="30">[% ITEM_DAT.itemnotes \| html %]</textarea><input type="submit" name="submit" class="principal" value="Update" />
329	</form>	338	</form>
330	[% ELSE %]	339	[% ELSE %]
331	[% ITEM_DAT.itemnotes \| html %]	340	[% ITEM_DAT.itemnotes \| html %]
Lines 339-345 Link Here
339	<form class="inline" action="updateitem.pl" method="post"><input type="hidden" name="biblionumber" value="[% ITEM_DAT.biblionumber \| html %]" />	348	<form class="inline" action="updateitem.pl" method="post"><input type="hidden" name="biblionumber" value="[% ITEM_DAT.biblionumber \| html %]" />
340	<input type="hidden" name="biblioitemnumber" value="[% ITEM_DAT.biblioitemnumber \| html %]" /><input type="hidden" name="itemnumber" value="[% ITEM_DAT.itemnumber \| html %]" />	349	<input type="hidden" name="biblioitemnumber" value="[% ITEM_DAT.biblioitemnumber \| html %]" /><input type="hidden" name="itemnumber" value="[% ITEM_DAT.itemnumber \| html %]" />
341	<input type="hidden" name="op" value="set_non_public_note" />	350	<input type="hidden" name="op" value="set_non_public_note" />
342	<textarea name="itemnotes_nonpublic" rows="2" cols="30">[% ITEM_DAT.itemnotes_nonpublic \| html %]</textarea><input type="submit" name="submit" class="submit" value="Update" />	351	<textarea name="itemnotes_nonpublic" rows="2" cols="30">[% ITEM_DAT.itemnotes_nonpublic \| html %]</textarea><input type="submit" name="submit" class="principal" value="Update" />
343	</form>	352	</form>
344	[% ELSE %]	353	[% ELSE %]
345	[% ITEM_DAT.itemnotes_nonpublic \| html %]	354	[% ITEM_DAT.itemnotes_nonpublic \| html %]

Lines 6-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt (-11 / +20 lines)
6	[% USE KohaDates %]	6	[% USE KohaDates %]
7	[% PROCESS 'i18n.inc' %]	7	[% PROCESS 'i18n.inc' %]
8	[% SET footerjs = 1 %]	8	[% SET footerjs = 1 %]
		9	[% formulaire = BLOCK %]
		10	[% INCLUDE 'cat-search.inc' %]
		11	[% END %]
9	[% USE AuthorisedValues %]	12	[% USE AuthorisedValues %]
10	[% INCLUDE 'doc-head-open.inc' %]	13	[% INCLUDE 'doc-head-open.inc' %]
11		14
Lines 14-20 Link Here
14	</head>	17	</head>
15		18
16	<body id="catalog_results" class="catalog">	19	<body id="catalog_results" class="catalog">
17	[% INCLUDE 'header.inc' %]	20	[% INCLUDE 'header.inc' form=formulaire %]
18		21
19	[% IntranetCoce = Koha.Preference('IntranetCoce') %]	22	[% IntranetCoce = Koha.Preference('IntranetCoce') %]
20	[% CoceProviders = Koha.Preference('CoceProviders') %]	23	[% CoceProviders = Koha.Preference('CoceProviders') %]
Lines 36-41 Link Here
36	</a>	39	</a>
37	</li>	40	</li>
38	</ol>	41	</ol>
		42	<ol>
		43	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		44	</ol>
		45	<ol>
		46	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		47	</ol>
39	</nav>	48	</nav>
40		49
41	<div class="main container-fluid">	50	<div class="main container-fluid">
Lines 62-69 Link Here
62	</div>	71	</div>
63	[% END %]	72	[% END %]
64		73
		74	<div id="searchresults">
65	[% IF ( total ) %]	75	[% IF ( total ) %]
66
67	<h3>	76	<h3>
68	[% total \| html %] result(s) found [% IF ( query_desc ) %]for <span class="results_query_desc">'[% query_desc \| html %]'</span>[% END %][% IF limit_desc %] with limit(s): <span class="results_limit_desc">'[% limit_desc \| html %]'</span>[% END %][% IF ( LibraryName ) %] in [% LibraryName \| html %] Catalog[% END %].	77	[% total \| html %] result(s) found [% IF ( query_desc ) %]for <span class="results_query_desc">'[% query_desc \| html %]'</span>[% END %][% IF limit_desc %] with limit(s): <span class="results_limit_desc">'[% limit_desc \| html %]'</span>[% END %][% IF ( LibraryName ) %] in [% LibraryName \| html %] Catalog[% END %].
69	</h3>	78	</h3>
Lines 71-79 Link Here
71		80
72	<div class="searchheader" id="searchheader">	81	<div class="searchheader" id="searchheader">
73	<div id="selection_ops">	82	<div id="selection_ops">
74	<a href="#" id="select_all"><i class="fa fa-check"></i> Select all</a>	83	<a href="#" class="btn btn-link" id="select_all"><i class="fa fa-check"></i> Select all</a>
75	\|	84	<a href="#" class="btn btn-link" id="clear_all"><i class="fa fa-remove"></i> Clear all</a>
76	<a href="#" id="clear_all"><i class="fa fa-remove"></i> Clear all</a>
77	\|	85	\|
78	[% IF Koha.Preference("StaffHighlightedWords") == 1 %]	86	[% IF Koha.Preference("StaffHighlightedWords") == 1 %]
79	<a href="#" class="highlight_toggle" id="highlight_toggle_off">Unhighlight</a>	87	<a href="#" class="highlight_toggle" id="highlight_toggle_off">Unhighlight</a>
Lines 89-95 Link Here
89		97
90	[% IF Koha.Preference('virtualshelves') %]	98	[% IF Koha.Preference('virtualshelves') %]
91	<div class="btn-group">	99	<div class="btn-group">
92	<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">	100	<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="lientype">
93	<i class="fa fa-list"></i> Add to list <span class="caret"></span>	101	<i class="fa fa-list"></i> Add to list <span class="caret"></span>
94	</button>	102	</button>
95	<ul class="dropdown-menu">	103	<ul class="dropdown-menu">
Lines 135-141 Link Here
135	[% IF ( CAN_user_reserveforothers_place_holds && DisplayMultiPlaceHold ) %]	143	[% IF ( CAN_user_reserveforothers_place_holds && DisplayMultiPlaceHold ) %]
136	[% IF ( holdfor or holdforclub ) %]	144	[% IF ( holdfor or holdforclub ) %]
137	<div id="placeholdc" class="btn-group">	145	<div id="placeholdc" class="btn-group">
138	<button class="btn btn-default btn-xs placehold"><i class="fa fa-sticky-note-o"></i> Place hold</button>	146	<button class="btn btn-default btn-xs placehold" id="lientype"><i class="fa fa-sticky-note-o"></i> Place hold</button>
139	<button class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">	147	<button class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
140	<span class="caret"></span>	148	<span class="caret"></span>
141	</button>	149	</button>
Lines 155-168 Link Here
155	</div>	163	</div>
156	[% ELSE %]	164	[% ELSE %]
157	<div id="placeholdc" class="btn-group">	165	<div id="placeholdc" class="btn-group">
158	<a class="btn btn-default btn-xs placehold" href="#"><i class="fa fa-sticky-note-o"></i> Place hold</a>	166	<a class="btn btn-default btn-xs placehold" href="#" id="lientype"><i class="fa fa-sticky-note-o"></i> Place hold</a>
159	</div>	167	</div>
160	[% END # /IF holfor %]	168	[% END # /IF holfor %]
161	[% END # /IF CAN_user_reserveforothers_place_holds %]	169	[% END # /IF CAN_user_reserveforothers_place_holds %]
162		170
163	[% IF Koha.Preference('BrowseResultSelection') %]	171	[% IF Koha.Preference('BrowseResultSelection') %]
164	<div id="browse_selection" class="btn-group">	172	<div id="browse_selection" class="btn-group">
165	<a class="btn btn-default btn-xs browse_selection" href="#"><i class="fa fa-sticky-note-o"></i> Browse selected records</a>	173	<a class="btn btn-default btn-xs browse_selection" href="#" id="lientype"><i class="fa fa-sticky-note-o"></i> Browse selected records</a>
166	</div>	174	</div>
167	[% END %]	175	[% END %]
168		176
Lines 200-206 Link Here
200	[% END %]	208	[% END %]
201		209
202	<div class="btn-group">	210	<div class="btn-group">
203	<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">	211	<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="lientype">
204	Sort <span class="caret"></span>	212	Sort <span class="caret"></span>
205	</button>	213	</button>
206	<ul class="dropdown-menu">	214	<ul class="dropdown-menu">
Lines 336-341 Link Here
336	</div>	344	</div>
337	[% END # /IF total %]	345	[% END # /IF total %]
338		346
		347
339	[% IF ( query_error ) %]	348	[% IF ( query_error ) %]
340	<div class="dialog alert"><p><strong>Error:</strong> [% query_error \| html %]</p></div>	349	<div class="dialog alert"><p><strong>Error:</strong> [% query_error \| html %]</p></div>
341	[% END %]	350	[% END %]
Lines 410-416 Link Here
410	</form>	419	</form>
411	[% ELSE # /IF scan %]	420	[% ELSE # /IF scan %]
412		421
413	<div id="searchresults">	422
414	[% INCLUDE 'page-numbers.inc' %]	423	[% INCLUDE 'page-numbers.inc' %]
415		424
416	<form action="/cgi-bin/koha/catalogue/search.pl" method="get" name="bookbag_form" id="bookbag_form">	425	<form action="/cgi-bin/koha/catalogue/search.pl" method="get" name="bookbag_form" id="bookbag_form">

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt (-1 / +10 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'cat-search.inc' %]
		6	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
5	[% USE Koha %]	8	[% USE Koha %]
6	[% USE KohaDates %]	9	[% USE KohaDates %]
Lines 10-16 Link Here
10		13
11	<body id="catalogue_search-history" class="catalogue">	14	<body id="catalogue_search-history" class="catalogue">
12		15
13	[% INCLUDE 'header.inc' %]	16	[% INCLUDE 'header.inc' form=formulaire %]
14		17
15	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	18	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
16	<ol>	19	<ol>
Lines 26-31 Link Here
26	</a>	29	</a>
27	</li>	30	</li>
28	</ol>	31	</ol>
		32	<ol>
		33	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		34	</ol>
		35	<ol>
		36	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		37	</ol>
29	</nav>	38	</nav>
30		39
31	<div class="container-fluid">	40	<div class="container-fluid">

Lines 3-15 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt (-1 / +10 lines)
3	[% USE Asset %]	3	[% USE Asset %]
4	[% USE Branches %]	4	[% USE Branches %]
5	[% SET footerjs = 1 %]	5	[% SET footerjs = 1 %]
		6	[% formulaire = BLOCK %]
		7	[% INCLUDE 'cat-search.inc' %]
		8	[% END %]
6	[% INCLUDE 'doc-head-open.inc' %]	9	[% INCLUDE 'doc-head-open.inc' %]
7	<title>Stock rotation details for [% INCLUDE 'biblio-title-head.inc' %] &rsaquo; Catalog &rsaquo; Koha</title>	10	<title>Stock rotation details for [% INCLUDE 'biblio-title-head.inc' %] &rsaquo; Catalog &rsaquo; Koha</title>
8	[% INCLUDE 'doc-head-close.inc' %]	11	[% INCLUDE 'doc-head-close.inc' %]
9	</head>	12	</head>
10	<body id="catalog_stockrotation" class="catalog">	13	<body id="catalog_stockrotation" class="catalog">
11	[% USE KohaDates %]	14	[% USE KohaDates %]
12	[% INCLUDE 'header.inc' %]	15	[% INCLUDE 'header.inc' form=formulaire %]
13		16
14	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	17	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
15	<ol>	18	<ol>
Lines 28-33 Link Here
28	</a>	31	</a>
29	</li>	32	</li>
30	</ol>	33	</ol>
		34	<ol>
		35	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		36	</ol>
		37	<ol>
		38	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		39	</ol>
31	</nav>	40	</nav>
32		41
33	<div class="main container-fluid">	42	<div class="main container-fluid">




                </a>
            </li>
        </ol>
        <ol>
            [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
        </ol>
        <ol>
            <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
        </ol>
    </nav>

    <div class="main container-fluid">


                <div id="check_errors"></div>

                <h2>
                    [% IF ( biblionumber ) %]
                        Editing <em>[% title | html %]</em> (Record number [% biblionumber | html %])
                    [% ELSE %]
                        Add MARC record [% IF (circborrowernumber) %]<em>(fast cataloging)</em>[% END %]
                    [% END %]
                </h2>

                [% UNLESS ( number ) %]
                    <!-- show duplicate warning on tab 0 only -->

                [% END %]

                <div id="toolbar" class="btn-toolbar">
                <div>
                    [% IF CAN_user_editcatalogue_edit_items or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %]
                        [% IF (circborrowernumber) %][%# fast cataloging must lead to items %]
                            <!-- Action is under fast cataloging - Save button redirecting to items -->
                            <div class="btn-group"><a href="#" id="saveanditems" class="principal"><i class="fa fa-save"></i> Save</a></div>
                        [% ELSE %]
                            <!-- Not using fast cataloging - Display split menu -->
                            <div class="btn-group">
                                <button class="principal" id="saverecord"><i class="fa fa-save"></i> Save</button>
                                <button class="dropdown-toggle pat" data-toggle="dropdown">
                                <span class="caret"></span>
                                </button>
                                <ul class="dropdown-menu">

                        [% END %]
                    [% ELSE %]
                        <!-- User cannot edit items - single button redirecting to view -->
                        <div class="btn-group"><a href="#" id="saveandview" class="principal"><i class="fa fa-save"></i> Save</a></div>
                    [% END # /IF CAN_user_editcatalogue_edit_items %]

                    [% UNLESS (circborrowernumber) %][%# Hide in fast cataloging %]
                        [% IF biblionumber %]
                            <div class="btn-group"><a class="pat" href="#" id="z3950search"><i class="fa fa-search"></i> Replace record via Z39.50/SRU search</a></div>
                        [% ELSE %]
                            <div class="btn-group"><a class="pat" href="#" id="z3950search"><i class="fa fa-search"></i> Z39.50/SRU search</a></div>
                        [% END %]
                        [% IF ( CAN_user_editauthorities ) %]
                            <div class="btn-group"><a class="pat" href="#" id="linkerbutton"><i class="fa fa-refresh"></i> Link authorities automatically</a></div>
                        [% END %]
                    [% END %]

                    <div class="btn-group">
                        <button class="pat dropdown-toggle" data-toggle="dropdown"><i class="fa fa-cog"></i> Settings <span class="caret"></span></button>
                        <ul id="settings-menu" class="dropdown-menu">
                            [% IF Koha.Preference( 'EnableAdvancedCatalogingEditor' ) == 1 && CAN_user_editcatalogue_advanced_editor %]
                                <li><a href="#" id="switcheditor">Switch to advanced editor</a></li>

                            </div>
                        [% ELSE %]
                            <div class="btn-group">
                                <a class="cancel" id="cancel" href="/cgi-bin/koha/cataloguing/addbooks.pl">Cancel</a>
                            </div>
                        [% END %]
                        <div id="show-errors" class="btn-group"></div>

                            [% END %]
                        </ul>
                    </div>
                </div></div> <!-- /#toolbar.btn-toolbar -->

                [% IF bib_doesnt_exist %]
                    <div class="dialog alert">




[% USE KohaDates %]
[% USE TablesSettings %]
[% SET footerjs = 1 %]
[% formulaire = BLOCK %]
    [% INCLUDE 'cataloging-search.inc' %]
[% END %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Cataloging [% IF ( total || breeding_loop ) %] &rsaquo; Search results [% ELSIF ( query ) %] &rsaquo; No results found [% END %] &rsaquo; Koha</title>
[% INCLUDE 'doc-head-close.inc' %]
</head>

<body id="cat_addbooks" class="cat">
    [% INCLUDE 'header.inc' %]

<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
    <ol>

                            <a id="useadvanced" href="/cgi-bin/koha/cataloguing/editor.pl" class="pat"><i class="fa fa-pencil"></i> Advanced editor</a>
                        [% END %]
                        <div class="btn-group">
                            <button class="pat" data-toggle="dropdown"><i class="fa fa-plus"></i> New record<span class="caret"></span>
                            <button class="pat fleche" data-toggle="dropdown">
                                <span class="caret"></span>
                            </button>
                            <ul class="dropdown-menu">
                                <li><a id="newRecordDefault" href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=">Default framework</a></li>

Lines 3-8 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt (-1 / +10 lines)
3	[% USE Koha %]	3	[% USE Koha %]
4	[% USE Branches %]	4	[% USE Branches %]
5	[% USE KohaDates %]	5	[% USE KohaDates %]
		6	[% formulaire = BLOCK %]
		7	[% INCLUDE 'cataloging-search.inc' %]
		8	[% END %]
6	[% USE TablesSettings %]	9	[% USE TablesSettings %]
7	[% INCLUDE 'doc-head-open.inc' %]	10	[% INCLUDE 'doc-head-open.inc' %]
8	<title>Items &rsaquo; [% biblio.title \| html %] [% IF ( biblio.author ) %] by [% biblio.author \| html %][% END %] (Record #[% biblio.biblionumber \| html %]) &rsaquo; Cataloging &rsaquo; Koha</title>	11	<title>Items &rsaquo; [% biblio.title \| html %] [% IF ( biblio.author ) %] by [% biblio.author \| html %][% END %] (Record #[% biblio.biblionumber \| html %]) &rsaquo; Cataloging &rsaquo; Koha</title>
Lines 26-32 Link Here
26	</head>	29	</head>
27		30
28	<body id="cat_additem" class="cat">	31	<body id="cat_additem" class="cat">
29	[% INCLUDE 'header.inc' %]	32	[% INCLUDE 'header.inc' form=formulaire %]
30		33
31	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	34	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
32	<ol>	35	<ol>
Lines 45-50 Link Here
45	</a>	48	</a>
46	</li>	49	</li>
47	</ol>	50	</ol>
		51	<ol>
		52	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		53	</ol>
		54	<ol>
		55	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		56	</ol>
48	</nav>	57	</nav>
49		58
50	<div class="main container-fluid">	59	<div class="main container-fluid">

Lines 15-21 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt (-1 / +7 lines)
15	<div>Loading, please wait...</div>	15	<div>Loading, please wait...</div>
16	</div>	16	</div>
17		17
18	[% INCLUDE 'header.inc' %]	18	[% INCLUDE 'header.inc' form=formulaire %]
19	[% PROCESS 'keyboard_shortcuts.inc' %]	19	[% PROCESS 'keyboard_shortcuts.inc' %]
20		20
21	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	21	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
Lines 32-37 Link Here
32	</a>	32	</a>
33	</li>	33	</li>
34	</ol>	34	</ol>
		35	<ol>
		36	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		37	</ol>
		38	<ol>
		39	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		40	</ol>
35	</nav>	41	</nav>
36		42
37	<div class="main container-fluid">	43	<div class="main container-fluid">

Lines 1-9 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt (-1 / +11 lines)
		1
		2	[% formulaire = BLOCK %]
		3	[% INCLUDE 'cat-search.inc' %]
		4	[% END %]
1	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
2	<title>Link to host record &rsaquo; Cataloging &rsaquo; Koha</title>	6	<title>Link to host record &rsaquo; Cataloging &rsaquo; Koha</title>
3	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]
4	</head>	8	</head>
5	<body id="catalog_linkitem" class="catalog">	9	<body id="catalog_linkitem" class="catalog">
6	[% INCLUDE 'header.inc' %]	10	[% INCLUDE 'header.inc' form=formulaire %]
7		11
8	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	12	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
9	<ol>	13	<ol>
Lines 19-24 Link Here
19	</a>	23	</a>
20	</li>	24	</li>
21	</ol>	25	</ol>
		26	<ol>
		27	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		28	</ol>
		29	<ol>
		30	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		31	</ol>
22	</nav>	32	</nav>
23		33
24	<div class="container-fluid">	34	<div class="container-fluid">

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt (-1 / +10 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'cataloging-search.inc' %]
		6	[% END %]
4	[% PROCESS 'merge-record.inc' %]	7	[% PROCESS 'merge-record.inc' %]
5		8
6	[% INCLUDE 'doc-head-open.inc' %]	9	[% INCLUDE 'doc-head-open.inc' %]
Lines 15-21 div#result { margin-top: 1em; } Link Here
15	</head>	18	</head>
16		19
17	<body id="cat_merge" class="cat">	20	<body id="cat_merge" class="cat">
18	[% INCLUDE 'header.inc' %]	21	[% INCLUDE 'header.inc' form=formulaire %]
19		22
20	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	23	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
21	<ol>	24	<ol>
Lines 31-36 div#result { margin-top: 1em; } Link Here
31	</a>	34	</a>
32	</li>	35	</li>
33	</ol>	36	</ol>
		37	<ol>
		38	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		39	</ol>
		40	<ol>
		41	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		42	</ol>
34	</nav>	43	</nav>
35		44
36	<div class="main container-fluid">	45	<div class="main container-fluid">

Lines 1-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt (-1 / +10 lines)
1	[% SET footerjs = 1 %]	1	[% SET footerjs = 1 %]
		2	[% formulaire = BLOCK %]
		3	[% INCLUDE 'cat-search.inc' %]
		4	[% END %]
2	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
3	<title>Attach an item to [% INCLUDE 'biblio-title-head.inc' %] &rsaquo; Cataloging &rsaquo; Koha</title>	6	<title>Attach an item to [% INCLUDE 'biblio-title-head.inc' %] &rsaquo; Cataloging &rsaquo; Koha</title>
4	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]
5	</head>	8	</head>
6	<body id="catalog_moveitem" class="catalog">	9	<body id="catalog_moveitem" class="catalog">
7	[% INCLUDE 'header.inc' %]	10	[% INCLUDE 'header.inc' form=formulaire %]
8		11
9	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	12	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
10	<ol>	13	<ol>
Lines 23-28 Link Here
23	</a>	26	</a>
24	</li>	27	</li>
25	</ol>	28	</ol>
		29	<ol>
		30	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		31	</ol>
		32	<ol>
		33	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		34	</ol>
26	</nav>	35	</nav>
27		36
28	<div class="main container-fluid">	37	<div class="main container-fluid">




                        <li><label for="subjectsubdiv">Subject sub-division: </label> <input type="text" id="subjectsubdiv" name="subjectsubdiv" value="" /></li>
                        <li><label for="title">Title (any): </label> <input type="text" id="title"  name="title" value="[% title | html %]" /></li>
                        <li><label for="uniformtitle">Title (uniform): </label> <input type="text" id="uniformtitle"  name="uniformtitle" value="[% uniformtitle | html %]" /></li>
                        <li><a id="resetZ3950Search" href="#">Clear search form</a></li>
                    </ol>
                    </fieldset>
                </div>

            </div>
            <nav class="navbar navbar-default navbar-fixed-bottom">
                <div class="container-fluid">
                     <fieldset class="action"><input type="submit" id="principal" class="submit" value="Search" /> <a class="cancel close" href="#">Cancel</a></fieldset>
                </div>
            </nav>
        </form>

            <td>[% breeding_loo.heading_code | html %]</td>
            <td class="actions">
                <div class="btn-group dropup">
                    <a class="btn btn-default btn-xs z3950actions" id="lientype" href="#">MARC</a><button class="btn-xs dropdown-toggle" id="lientype" data-toggle="dropdown"><span class="caret"></span></button>
                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="cataloguesearchactions[% breeding_loo.breedingid | html %]">
                        <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | uri %]" title="MARC" class="previewData" data-action="show_marc"><i class="fa fa-eye"></i> MARC preview</a></li>
                        <li><a href="/cgi-bin/koha/authorities/authorities.pl?breedingid=[% breeding_loo.breedingid | uri %]&authtypecode=[% breeding_loo.heading_code | uri %]&authid=[% breeding_loo.authid | uri %]&index=[% index | uri %]" class="chosen" title="Import" data-action="import"><i class="fa fa-download"></i> Import</a></li>




                                            [% END %]
                                            <td class="actions">
                                                <div class="btn-group dropup">
                                                    <a class="btn btn-default btn-xs z3950actions" id="lientype" href="#">MARC</a><button class="btn-xs dropdown-toggle" id="lientype" data-toggle="dropdown"><span class="caret"></span></button>
                                                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="cataloguesearchactions[% breeding_loo.breedingid | html %]">
                                                        <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | uri %]" title="MARC" class="previewData" data-action="show_marc"><i class="fa fa-eye"></i> MARC preview</a></li>
                                                        <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid | uri %]" title="Card" class="previewData" data-action="show_card"><i class="fa fa-eye"></i> Card preview</a></li>

                                <div class="modal-content">
                                    <div class="modal-header">
                                        <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
                                        <h2 id="dataPreviewLabel">Preview</h2>
                                    </div>
                                    <div class="modal-body">
                                        <div id="loading"> <img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" /> Loading </div>

                        <p>
                            <input type="hidden" name="biblionumber" value="[% biblionumber | html %]"/>
                            <input type="hidden" name="frameworkcode" value="[% frameworkcode | html %]"/>
                            <input type="submit" class="principal" value="Try another search"/>
                        </p>
                    </form>
                </div> <!-- /.col-xs-12 -->

Lines 5-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt (-1 / +10 lines)
5	[% USE Asset %]	5	[% USE Asset %]
6	[% USE raw %]	6	[% USE raw %]
7	[% SET footerjs = 1 %]	7	[% SET footerjs = 1 %]
		8	[% formulaire = BLOCK %]
		9	[% INCLUDE 'cat-search.inc' %]
		10	[% END %]
8	[% INCLUDE 'doc-head-open.inc' %]	11	[% INCLUDE 'doc-head-open.inc' %]
9	<title>Article requests &rsaquo; Circulation &rsaquo; Koha</title>	12	<title>Article requests &rsaquo; Circulation &rsaquo; Koha</title>
10	[% INCLUDE 'doc-head-close.inc' %]	13	[% INCLUDE 'doc-head-close.inc' %]
Lines 128-134 Link Here
128	[% END %]	131	[% END %]
129		132
130	<body id="circ_article-requests" class="circ">	133	<body id="circ_article-requests" class="circ">
131	[% INCLUDE 'header.inc' %]	134	[% INCLUDE 'header.inc' form=formulaire %]
132		135
133		136
134	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	137	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
Lines 143-148 Link Here
143	<a href="#" aria-current="page">Article requests</a>	146	<a href="#" aria-current="page">Article requests</a>
144	</li>	147	</li>
145	</ol>	148	</ol>
		149	<ol>
		150	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		151	</ol>
		152	<ol>
		153	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		154	</ol>
146	</nav>	155	</nav>
147		156
148	<div class="main container-fluid starthidden">	157	<div class="main container-fluid starthidden">

Lines 2-14 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt (-1 / +10 lines)
2	[% USE KohaDates %]	2	[% USE KohaDates %]
3	[% USE Branches %]	3	[% USE Branches %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE 'circ-search.inc' %]
		7	[% END %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	<title>Circulation statistics for [% title \| html %] &rsaquo; Circulation &rsaquo; Koha</title>	9	<title>Circulation statistics for [% title \| html %] &rsaquo; Circulation &rsaquo; Koha</title>
7	[% INCLUDE 'doc-head-close.inc' %]	10	[% INCLUDE 'doc-head-close.inc' %]
8	</head>	11	</head>
9		12
10	<body id="circ_bookcount" class="circ">	13	<body id="circ_bookcount" class="circ">
11	[% INCLUDE 'header.inc' %]	14	[% INCLUDE 'header.inc' form=formulaire %]
12		15
13	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	16	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
14	<ol>	17	<ol>
Lines 34-39 Link Here
34	</li>	37	</li>
35	[% END %]	38	[% END %]
36	</ol>	39	</ol>
		40	<ol>
		41	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		42	</ol>
		43	<ol>
		44	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		45	</ol>
37	</nav>	46	</nav>
38		47
39	<div class="main container-fluid">	48	<div class="main container-fluid">

Lines 4-9 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt (-1 / +10 lines)
4	[% USE KohaDates %]	4	[% USE KohaDates %]
5	[% USE Branches %]	5	[% USE Branches %]
6	[% SET footerjs = 1 %]	6	[% SET footerjs = 1 %]
		7	[% formulaire = BLOCK %]
		8	[% INCLUDE 'circ-search.inc' %]
		9	[% END %]
7	[% INCLUDE 'doc-head-open.inc' %]	10	[% INCLUDE 'doc-head-open.inc' %]
8	<title>Checkout notes &rsaquo; Circulation &rsaquo; Koha</title>	11	<title>Checkout notes &rsaquo; Circulation &rsaquo; Koha</title>
9	[% INCLUDE 'doc-head-close.inc' %]	12	[% INCLUDE 'doc-head-close.inc' %]
Lines 11-17 Link Here
11		14
12	<body id="circ_checkout-notes" class="circ">	15	<body id="circ_checkout-notes" class="circ">
13		16
14	[% INCLUDE 'header.inc' %]	17	[% INCLUDE 'header.inc' form=formulaire %]
15		18
16		19
17	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	20	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
Lines 28-33 Link Here
28	</a>	31	</a>
29	</li>	32	</li>
30	</ol>	33	</ol>
		34	<ol>
		35	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		36	</ol>
		37	<ol>
		38	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		39	</ol>
31	</nav>	40	</nav>
32		41
33	<div class="main container-fluid">	42	<div class="main container-fluid">




[% USE raw %]
[% USE Koha %]
[% USE Branches %]
[% SET footerjs = 1 %]
[% formulaire = BLOCK %]
    [% INCLUDE 'circ-search.inc' %]
[% END %]


        <div class="row">
            <div class="col-sm-5 col-md-4">
                <h1>Circulation</h1>

                <ul class="buttons-list">
                    <li><a class="menucirc" href="/cgi-bin/koha/circ/circulation.pl"><i class="fa fa-upload fa-2x"></i><h1> Check out</h1></a></li>
                    <li><a class="menucirc" href="/cgi-bin/koha/circ/returns.pl"><i class="fa fa-download fa-2x"></i><h1> Check in</h1></a></li>
                    <li><a class="menucirc" href="/cgi-bin/koha/circ/renew.pl"><i class="fa fa-retweet fa-2x"></i><h1> Renew</h1></a></li>
                    [% UNLESS IndependentBranches %]
                        <li>
                            [% IF Koha.Preference('UseCirculationDesks') %]
                            <a class="menucirc" href="/cgi-bin/koha/circ/set-library.pl"><i class="fa fa-home fa-2x"></i><h1> Set library and desk</h1></a>
                            [% ELSE %]
                            <a class="menucirc" href="/cgi-bin/koha/circ/set-library.pl"><i class="fa fa-home fa-2x"></i><h1> Set library</h1></a>
                            [% END %]
                        </li>
                    [% END %]
                    [% IF ( fast_cataloging ) %]
                        [% IF ( CAN_user_editcatalogue_fast_cataloging ) %]
                            <li><a class="menucirc" href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA fa-2x"><i class="fa fa-plus"></i><h1> Fast cataloging</h1></a></li>
                        [% END %]
                    [% END %]
                    [% IF ( Koha.Preference('AllowCheckoutNotes') && CAN_user_circulate_manage_checkout_notes ) %]
                        <li><a class="menucirc" href="/cgi-bin/koha/circ/checkout-notes.pl"><i class="fa fa-sticky-note fa-2x"></i><h1> Checkout notes</h1></a></li>
                    [% END %]
                    [% IF Koha.Preference('OnSiteCheckouts') %]
                        <li><a class="menucirc" href="/cgi-bin/koha/circ/on-site_checkouts.pl"><i class="fa fa-map-marker fa-2x"></i><h1> Pending on-site checkouts</h1></a></li>
                    [% END %]
                </ul>
            </div>

            <div class="col-sm-5 col-md-4">
                <h1>Holds</h1>

                <ul class="buttons-list">
                    <li><a class="menucirc" href="/cgi-bin/koha/circ/view_holdsqueue.pl"><i class="fa fa-tasks fa-2x"></i><h1> Holds queue</h1></a></li>
                    <li><a class="menucirc" href="/cgi-bin/koha/circ/pendingreserves.pl"><i class="fa fa-hand-grab-o fa-2x"></i><h1> Holds to pull</h1></a></li>
                    <li><a class="menucirc" href="/cgi-bin/koha/circ/waitingreserves.pl"><i class="fa fa-calendar fa-2x"></i><h1> Holds awaiting pickup</h1></a></li>
                    <li><a class="menucirc" href="/cgi-bin/koha/circ/reserveratios.pl"><i class="fa fa-line-chart fa-2x"></i><h1> Hold ratios</h1></a></li>
                </ul>

                [% IF Koha.Preference('UseRecalls') and CAN_user_recalls %]


            <div class="col-sm-5 col-md-4">
                [% IF Koha.Preference('ArticleRequests') %]
                    <h1>Patron request</h1>
                    <ul class="buttons-list">
                        <li><a class="menucirc" href="/cgi-bin/koha/circ/article-requests.pl" title="Article requests"><i class="fa fa-newspaper-o"></i><h1> Article requests</h1></a></li>
                    </ul>
                [% END %]

                <h1>Transfers</h1>

                <ul class="buttons-list">
                    [% IF !Koha.Preference('IndependentBranchesTransfers') || CAN_user_superlibrarian %]
                        <li><a class="menucirc" href="/cgi-bin/koha/circ/branchtransfers.pl"><i class="fa fa-exchange fa-2x"></i><h1> Transfer</h1></a></li>
                    [% END %]
                    <li><a class="menucirc" href="/cgi-bin/koha/circ/transfers_to_send.pl"><i class="fa fa-sign-out fa-2x"></i><h1> Transfers to send</h1></a></li>
                    <li><a class="menucirc" href="/cgi-bin/koha/circ/transferstoreceive.pl"><i class="fa fa-sign-in fa-2x"></i><h1> Transfers to receive</h1></a></li>
                </ul>

                <h1>Overdues</h1>

                <ul class="buttons-list">
                     [% IF ( CAN_user_circulate_overdues_report ) %]
                        <li>
                            <a class="menucirc"
                                href="/cgi-bin/koha/circ/overdue.pl"
                                title="Warning: This report is very resource intensive on systems with large numbers of overdue items."
                            ><i class="fa fa-clock-o fa-2x"></i><h1> Overdues</h1></a>
                        </li>
                    [% END %]
                    <li>
                        <a class="menucirc"
                            href="/cgi-bin/koha/circ/branchoverdues.pl"
                            title="Limited to your library.  See report help for other details."
                        ><i class="fa fa-clock-o fa-2x"></i><h1> Overdues with fines</h1></a>
                    </li>
                </ul>
            </div>




[% USE ItemTypes %]
[% USE Price %]
[% USE AuthorisedValues %]
[% SET footerjs = 1 %]
[% formulaire = BLOCK %]
    [% INCLUDE 'circ-search.inc' %]
[% END %]

                                            <input type="text" name="barcode" id="barcode" class="barcode focus" size="14" />
                                        [% END %]

                                        <button class="submit" id="principal" type="submit">Check out</button>

                                        <div id="show-circ-settings">
                                            <a href="#"><i class="fa-sign-out"></i></a>
                                        </div>
                                        <button class="submit" id="principal" type="submit">Check out</button>


                                        <div class="circ-settings">



                            [% IF ( noissues ) %]
                                [% IF ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') ) %]
                                    <fieldset id="searchresults">
                                [% ELSE %]
                                    <h2>Checking out to [% INCLUDE 'patron-title.inc' %]</h2>
                                    <fieldset id="searchresults">
                                [% END %]
                                <h3>
                                    Cannot check out!

                                    [% END %]
                                </h3>
                            [% ELSE %]
                                <fieldset id="searchresults">
                            [% END %]

                            [% INCLUDE 'patron_messages.inc' %]

                            <a id="debarments-tab-link" href="#reldebarments">Restrictions ([% debarments.count || 0 | html %])</a>
                        </li>

                        [% SET enrollments = patron.get_club_enrollments(1) %]
                        [% SET enrollable  = patron.get_enrollable_clubs(0,1) %]
                        [% IF CAN_user_clubs && ( enrollable.count || enrollments.count ) %]
                            <li>
                                <a id="clubs-tab-link" href="#clubs-tab">

                                            <th>Hold date</th>
                                            <th>Title</th>
                                            <th>Call number</th>
                                            <th>Item type</th>
                                            <th>Barcode</th>
                                            <th>Pickup at</th>
                                            <th>Expiration</th>

            </div> <!-- /.row -->
        </main>

        [% IF Koha.Preference('ClaimReturnedLostValue') %]
            [% INCLUDE 'modals/resolve_return_claim.inc' %]
        [% END %]

<!-- Modal -->
<div id="barcodeSubmittedModal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="barcodeSubmittedModalLabel" aria-hidden="true">
    <div class="modal-dialog">

</div> <!-- /#barcodeSubmittedModal -->

[% MACRO jsinclude BLOCK %]
    [% INCLUDE 'calendar.inc' %]
    [% INCLUDE 'datatables.inc' %]
    [% INCLUDE 'columns_settings.inc' %]
    [% INCLUDE 'select2.inc' %]

    </script>
    [% Asset.js("js/pages/circulation.js") | $raw %]
    [% Asset.js("js/checkouts.js") | $raw %]
    [% IF Koha.Preference('ClaimReturnedLostValue') %]
        [% Asset.js("js/resolve_claim_modal.js") | $raw %]
    [% END %]
    [% Asset.js("js/holds.js") | $raw %]
    [% INCLUDE 'calendar.inc' %]
    <script>
        table_settings_issues_table = [% TablesSettings.GetTableSettings( 'circ', 'circulation', 'issues-table', 'json' ) | $raw %]
        table_settings_borrowers_table = [% TablesSettings.GetTableSettings( 'circ', 'circulation', 'table_borrowers', 'json' ) | $raw %]

Lines 6-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt (-1 / +10 lines)
6	[% USE Price %]	6	[% USE Price %]
7	[% USE AuthorisedValues %]	7	[% USE AuthorisedValues %]
8	[% SET footerjs = 1 %]	8	[% SET footerjs = 1 %]
		9	[% formulaire = BLOCK %]
		10	[% INCLUDE 'circ-search.inc' %]
		11	[% END %]
9	[% INCLUDE 'doc-head-open.inc' %]	12	[% INCLUDE 'doc-head-open.inc' %]
10	[% SET destination = "circ" %]	13	[% SET destination = "circ" %]
11	<title>	14	<title>
Lines 20-26 Link Here
20		23
21	<body id="circ_circulation_batch_checkouts" class="circ">	24	<body id="circ_circulation_batch_checkouts" class="circ">
22		25
23	[% INCLUDE 'header.inc' %]	26	[% INCLUDE 'header.inc' form=formulaire %]
24		27
25	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	28	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
26	<ol>	29	<ol>
Lines 48-53 Link Here
48	</li>	51	</li>
49	[% END %]	52	[% END %]
50	</ol>	53	</ol>
		54	<ol>
		55	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		56	</ol>
		57	<ol>
		58	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		59	</ol>
51	</nav>	60	</nav>
52		61
53	<div class="main container-fluid">	62	<div class="main container-fluid">

Lines 2-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt (-1 / +10 lines)
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE Branches %]	3	[% USE Branches %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE 'circ-search.inc' %]
		7	[% END %]
5	<!DOCTYPE html>	8	<!DOCTYPE html>
6	[% IF (AllowOfflineCirculation) %]	9	[% IF (AllowOfflineCirculation) %]
7	[% SET manifestattr = 'manifest="/cgi-bin/koha/circ/offline-mf.pl"' %]	10	[% SET manifestattr = 'manifest="/cgi-bin/koha/circ/offline-mf.pl"' %]
Lines 16-22 Link Here
16	</head>	19	</head>
17		20
18	<body id="circ_offline" class="circ">	21	<body id="circ_offline" class="circ">
19	[% INCLUDE 'header.inc' %]	22	[% INCLUDE 'header.inc' form = formulaire %]
20	<div class="loading-overlay" style="display: none;">	23	<div class="loading-overlay" style="display: none;">
21	<div>Downloading records, please wait...</div>	24	<div>Downloading records, please wait...</div>
22	</div>	25	</div>
Lines 31-36 Link Here
31	<a id="go-to-home" href="#offline-home" aria-current="page">Offline circulation</a>	34	<a id="go-to-home" href="#offline-home" aria-current="page">Offline circulation</a>
32	</li>	35	</li>
33	</ol>	36	</ol>
		37	<ol>
		38	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		39	</ol>
		40	<ol>
		41	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		42	</ol>
34	</nav>	43	</nav>
35		44
36	<div class="main container-fluid">	45	<div class="main container-fluid">

Lines 5-17 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt (-1 / +10 lines)
5	[% USE KohaDates %]	5	[% USE KohaDates %]
6	[% USE AuthorisedValues %]	6	[% USE AuthorisedValues %]
7	[% SET footerjs = 1 %]	7	[% SET footerjs = 1 %]
		8	[% formulaire = BLOCK %]
		9	[% INCLUDE 'circ-search.inc' %]
		10	[% END %]
8	[% INCLUDE 'doc-head-open.inc' %]	11	[% INCLUDE 'doc-head-open.inc' %]
9	<title>Pending on-site checkouts &rsaquo; Circulation &rsaquo; Koha</title>	12	<title>Pending on-site checkouts &rsaquo; Circulation &rsaquo; Koha</title>
10	[% INCLUDE 'doc-head-close.inc' %]	13	[% INCLUDE 'doc-head-close.inc' %]
11	</head>	14	</head>
12		15
13	<body id="circ_stats" class="circ">	16	<body id="circ_stats" class="circ">
14	[% INCLUDE 'header.inc' %]	17	[% INCLUDE 'header.inc' form=formulaire %]
15		18
16	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	19	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
17	<ol>	20	<ol>
Lines 27-32 Link Here
27	</a>	30	</a>
28	</li>	31	</li>
29	</ol>	32	</ol>
		33	<ol>
		34	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		35	</ol>
		36	<ol>
		37	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		38	</ol>
30	</nav>	39	</nav>
31		40
32	<div class="main container-fluid">	41	<div class="main container-fluid">

Lines 153-159 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt (-1 / +1 lines)
153	<fieldset class="brief">	153	<fieldset class="brief">
154	<h4>Filter on</h4>	154	<h4>Filter on</h4>
155		155
156	<fieldset><legend>Date due:</legend>	156	<fieldset><label>Date due:</label>
157	<li class="radio">	157	<li class="radio">
158	<p for="showall">Show any items currently checked out:	158	<p for="showall">Show any items currently checked out:
159	[% IF ( showall ) %]	159	[% IF ( showall ) %]

Lines 8-13 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt (-1 / +10 lines)
8	[% USE AuthorisedValues %]	8	[% USE AuthorisedValues %]
9	[% USE Price %]	9	[% USE Price %]
10	[% SET footerjs = 1 %]	10	[% SET footerjs = 1 %]
		11	[% formulaire = BLOCK %]
		12	[% INCLUDE 'circ-search.inc' %]
		13	[% END %]
11	[% SET article_requests_view = 1 %]	14	[% SET article_requests_view = 1 %]
12	[% SET biblionumber = biblio.biblionumber %]	15	[% SET biblionumber = biblio.biblionumber %]
13	[% INCLUDE 'doc-head-open.inc' %]	16	[% INCLUDE 'doc-head-open.inc' %]
Lines 59-65 Link Here
59	[% END %]	62	[% END %]
60		63
61	<body id="circ_request-article" class="circ">	64	<body id="circ_request-article" class="circ">
62	[% INCLUDE 'header.inc' %]	65	[% INCLUDE 'header.inc' form=formulaire %]
63		66
64	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	67	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
65	<ol>	68	<ol>
Lines 83-88 Link Here
83	</li>	86	</li>
84	[% END %]	87	[% END %]
85	</ol>	88	</ol>
		89	<ol>
		90	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		91	</ol>
		92	<ol>
		93	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		94	</ol>
86	</nav>	95	</nav>
87		96
88	[% INCLUDE 'blocking_errors.inc' %]	97	[% INCLUDE 'blocking_errors.inc' %]

Lines 4-17 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt (-2 / +10 lines)
4	[% USE Branches %]	4	[% USE Branches %]
5	[% USE Koha %]	5	[% USE Koha %]
6	[% SET footerjs = 1 %]	6	[% SET footerjs = 1 %]
		7	[% formulaire = BLOCK %]
		8	[% INCLUDE 'cat-search.inc' %]
		9	[% END %]
7	[% INCLUDE 'doc-head-open.inc' %]	10	[% INCLUDE 'doc-head-open.inc' %]
8	<title>Club enrollments &rsaquo; Patron clubs &rsaquo; Tools &rsaquo; Koha</title>	11	<title>Club enrollments &rsaquo; Patron clubs &rsaquo; Tools &rsaquo; Koha</title>
9	[% INCLUDE 'doc-head-close.inc' %]	12	[% INCLUDE 'doc-head-close.inc' %]
10	</head>	13	</head>
11		14
12	<body id="club_enrollments" class="clubs">	15	<body id="club_enrollments" class="clubs">
13	[% INCLUDE 'header.inc' %]	16	[% INCLUDE 'header.inc' form=formulaire %]
14	[% INCLUDE 'cat-search.inc' %]
15		17
16	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	18	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
17	<ol>	19	<ol>
Lines 30-35 Link Here
30	</a>	32	</a>
31	</li>	33	</li>
32	</ol>	34	</ol>
		35	<ol>
		36	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		37	</ol>
		38	<ol>
		39	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		40	</ol>
33	</nav>	41	</nav>
34		42
35	<div class="main container-fluid">	43	<div class="main container-fluid">

Lines 3-8 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt (-2 / +10 lines)
3	[% USE AuthorisedValues %]	3	[% USE AuthorisedValues %]
4	[% SET AuthorisedValuesCategories = AuthorisedValues.GetCategories %]	4	[% SET AuthorisedValuesCategories = AuthorisedValues.GetCategories %]
5	[% SET footerjs = 1 %]	5	[% SET footerjs = 1 %]
		6	[% formulaire = BLOCK %]
		7	[% INCLUDE 'cat-search.inc' %]
		8	[% END %]
6	[% INCLUDE 'doc-head-open.inc' %]	9	[% INCLUDE 'doc-head-open.inc' %]
7	<title>	10	<title>
8	[% IF club %]	11	[% IF club %]
Lines 15-22 Link Here
15	</head>	18	</head>
16		19
17	<body id="clubs_add_modify" class="clubs">	20	<body id="clubs_add_modify" class="clubs">
18	[% INCLUDE 'header.inc' %]	21	[% INCLUDE 'header.inc' form=formulaire %]
19	[% INCLUDE 'cat-search.inc' %]
20		22
21	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	23	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
22	<ol>	24	<ol>
Lines 39-44 Link Here
39	</a>	41	</a>
40	</li>	42	</li>
41	</ol>	43	</ol>
		44	<ol>
		45	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		46	</ol>
		47	<ol>
		48	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		49	</ol>
42	</nav>	50	</nav>
43		51
44	<div class="main container-fluid">	52	<div class="main container-fluid">

Lines 4-9 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt (-2 / +10 lines)
4	[% USE Branches %]	4	[% USE Branches %]
5	[% USE Koha %]	5	[% USE Koha %]
6	[% SET footerjs = 1 %]	6	[% SET footerjs = 1 %]
		7	[% formulaire = BLOCK %]
		8	[% INCLUDE 'cat-search.inc' %]
		9	[% END %]
7	[% INCLUDE 'doc-head-open.inc' %]	10	[% INCLUDE 'doc-head-open.inc' %]
8	<title>Patron clubs &rsaquo; Tools &rsaquo; Koha</title>	11	<title>Patron clubs &rsaquo; Tools &rsaquo; Koha</title>
9	[% INCLUDE 'doc-head-close.inc' %]	12	[% INCLUDE 'doc-head-close.inc' %]
Lines 11-18 Link Here
11	</head>	14	</head>
12		15
13	<body id="clubs_clubs" class="clubs">	16	<body id="clubs_clubs" class="clubs">
14	[% INCLUDE 'header.inc' %]	17	[% INCLUDE 'header.inc' form=formulaire %]
15	[% INCLUDE 'cat-search.inc' %]
16		18
17	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	19	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
18	<ol>	20	<ol>
Lines 28-33 Link Here
28	</a>	30	</a>
29	</li>	31	</li>
30	</ol>	32	</ol>
		33	<ol>
		34	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		35	</ol>
		36	<ol>
		37	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		38	</ol>
31	</nav>	39	</nav>
32		40
33	<div class="main container-fluid">	41	<div class="main container-fluid">

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt (-2 / +10 lines)
1	[% USE Branches %]	1	[% USE Branches %]
2	[% USE AuthorisedValues %]	2	[% USE AuthorisedValues %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'cat-search.inc' %]
		6	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
5	<title>	8	<title>
6	[% IF club_template %]	9	[% IF club_template %]
Lines 19-26 Link Here
19	</head>	22	</head>
20		23
21	<body id="clubs_templates_add_modify" class="clubs">	24	<body id="clubs_templates_add_modify" class="clubs">
22	[% INCLUDE 'header.inc' %]	25	[% INCLUDE 'header.inc' form=formulaire %]
23	[% INCLUDE 'cat-search.inc' %]
24		26
25	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	27	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
26	<ol>	28	<ol>
Lines 43-48 Link Here
43	</a>	45	</a>
44	</li>	46	</li>
45	</ol>	47	</ol>
		48	<ol>
		49	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		50	</ol>
		51	<ol>
		52	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		53	</ol>
46	</nav>	54	</nav>
47		55
48	<div class="main container-fluid">	56	<div class="main container-fluid">




[% USE raw %]
[% USE Asset %]
[% USE Koha %]
[% USE Branches %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Patron search &rsaquo; Koha</title>
[% INCLUDE 'doc-head-close.inc' %]
<style> .modal-body .close { display: none; } </style>
</head>

<body id="common_patron_search" class="common">
<div id="patron_search" class="yui-t7">
    <div class="container-fluid">

        <form id="searchform">
            <fieldset class="brief">
                <h3>Search for patron</h3>
                <ol>
                    <li>
                        <label for="searchmember_filter">Search:</label>
                        <input type="text" id="searchmember_filter" value="[% searchmember | html %]" class="focus" />
                    </li>
                    <li>
                        <label for="categorycode_filter">Category:</label>
                        <select id="categorycode_filter">
                            <option value="">Any</option>
                            [% FOREACH category IN categories %]
                                <option value="[% category.categorycode | html %]">[% category.description | html %]</option>
                            [% END %]
                        </select>
                    </li>
                    <li>
                        <label for="branchcode_filter">Library:</label>
                        <select id="branchcode_filter">
                            [% SET libraries = Branches.all( only_from_group => 1 ) %]
                            [% IF libraries.size != 1 %]
                                <option value="">Any</option>
                            [% END %]
                            [% FOREACH l IN libraries %]
                                <option value="[% l.branchcode | html %]">[% l.branchname | html %]</option>
                            [% END %]
                        </select>
                    </li>
                </ol>
                <fieldset class="action">
                    <input class="principal" type="submit" value="Search" />
                </fieldset>
            </fieldset>
        </form>

        [% IF patrons_with_acq_perm_only %]
            <div class="hint">Only staff with superlibrarian or acquisitions permissions (or order_manage permission if granular permissions are enabled) are returned in the search results</div>
        [% END %]

        [% IF patrons_with_suggestion_perm_only %]
            <div class="hint">Only staff with superlibrarian or suggestions_manage permissions are returned in the search results</div>
        [% END %]

        <div class="browse">
            Browse by last name:
            [% FOREACH letter IN alphabet.split(' ') %]
                <a href="#" class="filterByLetter">[% letter | html %]</a>
            [% END %]
        </div>

        <div id="info" class="dialog message"></div>
        <div id="error" class="dialog alert"></div>

        <input type="hidden" id="firstletter_filter" value="" />
        <div id="searchresults">
            <table id="memberresultst">
                <thead>
                    <tr>
                        [% FOR column IN columns %]
                            [% SWITCH column %]
                                [% CASE 'cardnumber' %]<th>Card</th>
                                [% CASE 'dateofbirth' %]<th>Date of birth</th>
                                [% CASE 'address' %]<th>Address</th>
                                [% CASE 'name' %]<th>Name</th>
                                [% CASE 'branch' %]<th>Library</th>
                                [% CASE 'category' %]<th>Category</th>
                                [% CASE 'dateexpiry' %]<th>Expires on</td>
                                [% CASE 'borrowernotes' %]<th>Notes</th>
                                [% CASE 'action' %]<th>&nbsp;</th>
                            [% END %]
                        [% END %]
                    </tr>
                  </thead>
                <tbody></tbody>
            </table>
        </div>

<div id="closewindow"><a href="#" class="btn btn-default btn-default close">Close</a></div>

<!-- Patron preview modal -->
<div class="modal" id="patronPreview" tabindex="-1" role="dialog" aria-labelledby="patronPreviewLabel">
    <div class="modal-dialog" role="document">
        <div class="modal-content">
            <div class="modal-header">
                <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
                <h4 class="modal-title" id="patronPreviewLabel"></h4>
            </div>
            <div class="modal-body">
                <div id="loading">
                    <img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" /> Loading
                </div>
            </div>
            <div class="modal-footer">
                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
            </div>
        </div>
    </div>
</div>

</div>
</div>

[% MACRO jsinclude BLOCK %]
    [% INCLUDE 'datatables.inc' %]

    <script>
        var search = 1;
        $(document).ready(function(){
            $("#info").hide();
            $("#error").hide();

            [% IF view != "show_results" %]
                $("#searchresults").hide();
                search = 0;
            [% END %]

            // Apply DataTables on the results table
            dtMemberResults = $("#memberresultst").dataTable($.extend(true, {}, dataTablesDefaults, {
                'bServerSide': true,
                'sAjaxSource': "/cgi-bin/koha/svc/members/search",
                'fnServerData': function(sSource, aoData, fnCallback) {
                    if ( ! search ) {
                        return;
                    }
                    aoData.push({
                        'name': 'searchmember',
                        'value': $("#searchmember_filter").val()
                    },{
                        'name': 'firstletter',
                        'value': $("#firstletter_filter").val()
                    },{
                        'name': 'categorycode',
                        'value': $("#categorycode_filter").val()
                    },{
                        'name': 'branchcode',
                        'value': $("#branchcode_filter").val()
                    },{
                        'name': 'name_sorton',
                        'value': 'borrowers.surname borrowers.firstname'
                    },{
                        'name': 'cardnumber_sorton',
                        'value': 'borrowers.cardnumber',
                    },{
                        'name': 'dateofbirth_sorton',
                        'value': 'borrowers.dateofbirth',
                    },{
                        'name': 'dateexpiry_sorton',
                        'value': 'borrowers.dateexpiry',
                    },{
                        'name': 'category_sorton',
                        'value': 'categories.description',
                    },{
                        'name': 'branch_sorton',
                        'value': 'branches.branchname'
                    },{
                        'name': 'borrowernotes_sorton',
                        'value': 'borrowers.borrowernotes'
                    },{
                        'name': 'template_path',
                        'value': '[% json_template | html %]',
                    },{
                        'name': 'selection_type',
                        'value': '[% selection_type | html %]',
                    }
                    [% IF patrons_with_acq_perm_only %]
                    ,{
                        'name': 'has_permission',
                        'value': 'acquisition.order_manage',
                    }
                    [% ELSIF patrons_with_suggestion_perm_only %]
                    ,{
                        'name': 'has_permission',
                        'value': 'suggestions.suggestions_manage',
                    }
                    [% END %]
                    );
                    $.ajax({
                        'dataType': 'json',
                        'type': 'POST',
                        'url': sSource,
                        'data': aoData,
                        'success': function(json){
                            fnCallback(json);
                        }
                    });
                },
                'aoColumns':[
                    [% FOR column IN columns %]
                        [% IF column == 'action' %]
                            { 'mDataProp': 'dt_action', 'bSortable': false, 'sClass': 'actions' }
                        [% ELSIF column == 'address' %]
                            { 'mDataProp': 'dt_address', 'bSortable': false }
                        [% ELSE %]
                            { 'mDataProp': 'dt_[% column | html %]' }
                        [% END %]
                        [% UNLESS loop.last %],[% END %]
                    [% END %]
                ],
                'bAutoWidth': false,
                'sPaginationType': 'full_numbers',
                "iDisplayLength": [% Koha.Preference('PatronsPerPage') | html %],
                'aaSorting': [[[% aaSorting || 0 | html %], 'asc']],
                'bFilter': false,
                'bProcessing': true,
            }));

            $("#searchform").on('submit', filter);
            $(".filterByLetter").on("click",function(e){
                e.preventDefault();
                filterByFirstLetterSurname($(this).text());
            });
            $("body").on("click",".add_user",function(e){
                e.preventDefault();
                var borrowernumber = $(this).data("borrowernumber");
                var firstname = $(this).data("firstname");
                var surname = $(this).data("surname");
                add_user( borrowernumber, firstname + " " + surname );
            });

            $("body").on("click",".select_user",function(e){
                e.preventDefault();
                var borrowernumber = $(this).data("borrowernumber");
                var borrower_data = $("#borrower_data"+borrowernumber).val();
                select_user( borrowernumber, JSON.parse(borrower_data) );
            });

            $("body").on("click",".patron_preview", function( e ){
                e.preventDefault();
                var borrowernumber = $(this).data("borrowernumber");
                var page = "/cgi-bin/koha/members/moremember.pl?print=brief&borrowernumber=" + borrowernumber;
                $("#patronPreview .modal-body").load( page + " div.container-fluid" );
                $('#patronPreview').modal({show:true});
            });

            $("#patronPreview").on('hidden.bs.modal', function (e) {
                $("#patronPreview .modal-body").html("<img src=\"[% interface | html %]/[% theme | html %]/img/spinner-small.gif\" alt=\"\" /> Loading");
            });

        });

        function filter() {
            search = 1;
            $("#firstletter_filter").val('');
            $("#searchresults").show();
            dtMemberResults.fnDraw();
            return false;
        }

        // User has clicked on a letter
        function filterByFirstLetterSurname(letter) {
            $("#firstletter_filter").val(letter);
            search = 1;
            $("#searchresults").show();
            dtMemberResults.fnDraw();
        }

        // modify parent window owner element
        [% IF selection_type == 'add' %]
            function add_user(borrowernumber, borrowername) {
                var p = window.opener;
                // In one place (serials/routing.tt), the page is reload on every add
                // We have to wait for the page to be there
                function wait_for_opener () {
                    if ( ! $(opener.document).find('body').size() ) {
                        setTimeout(wait_for_opener, 500);
                    } else {
                        [%# Note that add_user could sent data instead of borrowername too %]
                        $("#info").hide();
                        $("#error").hide();
                        if ( p.add_user(borrowernumber, borrowername) < 0 ) {
                            $("#error").html(_("Patron '%s' is already in the list.").format(borrowername));
                            $("#error").show();
                        } else {
                            $("#info").html(_("Patron '%s' added.").format(borrowername));
                            $("#info").show();
                        }
                    }
                }
                wait_for_opener();
            }
        [% ELSIF selection_type == 'select' %]
            function select_user(borrowernumber, data) {
                var p = window.opener;
                [%  IF callback %]
                    p.[% callback | html %](borrowernumber, data);
                [%  ELSE %]
                    p.select_user(borrowernumber, data);
                [%  END %]
                window.close();
            }
        [% END %]
    </script>
[% END %]

[% SET popup_window = 1 %]
[% INCLUDE 'intranet-bottom.inc' %]

Lines 1-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt (-2 / +10 lines)
1	[% SET footerjs = 1 %]	1	[% SET footerjs = 1 %]
		2	[% formulaire = BLOCK %]
		3	[% INCLUDE 'cat-search.inc' %]
		4	[% END %]
2	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
3	<title>Add items &rsaquo; Course reserves &rsaquo; Koha</title>	6	<title>Add items &rsaquo; Course reserves &rsaquo; Koha</title>
4	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]
5	</head>	8	</head>
6	<body id="courses_add_items_step1" class="course">	9	<body id="courses_add_items_step1" class="course">
7		10
8	[% INCLUDE 'header.inc' %]	11	[% INCLUDE 'header.inc' form=formulaire %]
9	[% INCLUDE 'cat-search.inc' %]
10		12
11	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	13	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
12	<ol>	14	<ol>
Lines 22-27 Link Here
22	</a>	24	</a>
23	</li>	25	</li>
24	</ol>	26	</ol>
		27	<ol>
		28	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		29	</ol>
		30	<ol>
		31	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		32	</ol>
25	</nav>	33	</nav>
26		34
27	<div class="main container-fluid">	35	<div class="main container-fluid">

Lines 1-5 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt (-2 / +10 lines)
1	[% USE Branches %]	1	[% USE Branches %]
2	[% SET footerjs = 1 %]	2	[% SET footerjs = 1 %]
		3	[% formulaire = BLOCK %]
		4	[% INCLUDE 'cat-search.inc' %]
		5	[% END %]
3	[% INCLUDE 'doc-head-open.inc' %]	6	[% INCLUDE 'doc-head-open.inc' %]
4	<title>[% IF is_edit \|\| course_reserve %]Edit item[% ELSE %]Add items[% END %] &rsaquo; Course reserves &rsaquo; Koha</title>	7	<title>[% IF is_edit \|\| course_reserve %]Edit item[% ELSE %]Add items[% END %] &rsaquo; Course reserves &rsaquo; Koha</title>
5	[% INCLUDE 'doc-head-close.inc' %]	8	[% INCLUDE 'doc-head-close.inc' %]
Lines 7-14 Link Here
7		10
8	<body id="courses_add_items_step2" class="course">	11	<body id="courses_add_items_step2" class="course">
9		12
10	[% INCLUDE 'header.inc' %]	13	[% INCLUDE 'header.inc' form=formulaire %]
11	[% INCLUDE 'cat-search.inc' %]
12		14
13	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	15	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
14	<ol>	16	<ol>
Lines 25-30 Link Here
25	</a>	27	</a>
26	</li>	28	</li>
27	</ol>	29	</ol>
		30	<ol>
		31	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		32	</ol>
		33	<ol>
		34	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		35	</ol>
28	</nav>	36	</nav>
29		37
30	<div class="main container-fluid">	38	<div class="main container-fluid">

Lines 3-8 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt (-2 / +10 lines)
3	[% USE ItemTypes %]	3	[% USE ItemTypes %]
4		4
5	[% SET footerjs = 1 %]	5	[% SET footerjs = 1 %]
		6	[% formulaire = BLOCK %]
		7	[% INCLUDE 'cat-search.inc' %]
		8	[% END %]
6		9
7	[% INCLUDE 'doc-head-open.inc' %]	10	[% INCLUDE 'doc-head-open.inc' %]
8	<title>Add items &rsaquo; Course reserves &rsaquo; Koha</title>	11	<title>Add items &rsaquo; Course reserves &rsaquo; Koha</title>
Lines 10-17 Link Here
10	</head>	13	</head>
11	<body id="courses_add_items_step1" class="course">	14	<body id="courses_add_items_step1" class="course">
12		15
13	[% INCLUDE 'header.inc' %]	16	[% INCLUDE 'header.inc' form=formulaire %]
14	[% INCLUDE 'cat-search.inc' %]
15		17
16	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	18	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
17	<ol>	19	<ol>
Lines 27-32 Link Here
27	</a>	29	</a>
28	</li>	30	</li>
29	</ol>	31	</ol>
		32	<ol>
		33	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		34	</ol>
		35	<ol>
		36	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		37	</ol>
30	</nav>	38	</nav>
31		39
32	<div class="main container-fluid">	40	<div class="main container-fluid">

Lines 1-5 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt (-2 / +10 lines)
1	[% PROCESS 'i18n.inc' %]	1	[% PROCESS 'i18n.inc' %]
2	[% SET footerjs = 1 %]	2	[% SET footerjs = 1 %]
		3	[% formulaire = BLOCK %]
		4	[% INCLUDE 'cat-search.inc' %]
		5	[% END %]
3		6
4	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
5	<title>Remove reserves &rsaquo; Course reserves &rsaquo; Koha</title>	8	<title>Remove reserves &rsaquo; Course reserves &rsaquo; Koha</title>
Lines 7-14 Link Here
7	</head>	10	</head>
8	<body id="courses_rm_items" class="course">	11	<body id="courses_rm_items" class="course">
9		12
10	[% INCLUDE 'header.inc' %]	13	[% INCLUDE 'header.inc' form=formulaire %]
11	[% INCLUDE 'cat-search.inc' %]
12		14
13	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	15	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
14	<ol>	16	<ol>
Lines 24-29 Link Here
24	</a>	26	</a>
25	</li>	27	</li>
26	</ol>	28	</ol>
		29	<ol>
		30	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		31	</ol>
		32	<ol>
		33	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		34	</ol>
27	</nav>	35	</nav>
28		36
29	<div class="main container-fluid">	37	<div class="main container-fluid">

Lines 6-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt (-2 / +10 lines)
6	[% USE TablesSettings %]	6	[% USE TablesSettings %]
7	[% PROCESS 'i18n.inc' %]	7	[% PROCESS 'i18n.inc' %]
8	[% SET footerjs = 1 %]	8	[% SET footerjs = 1 %]
		9	[% formulaire = BLOCK %]
		10	[% INCLUDE 'cat-search.inc' %]
		11	[% END %]
9	[% INCLUDE 'doc-head-open.inc' %]	12	[% INCLUDE 'doc-head-open.inc' %]
10	<title>Course details for [% course.course_name \| html %] &rsaquo; Course reserves &rsaquo; Koha</title>	13	<title>Course details for [% course.course_name \| html %] &rsaquo; Course reserves &rsaquo; Koha</title>
11	[% INCLUDE 'doc-head-close.inc' %]	14	[% INCLUDE 'doc-head-close.inc' %]
Lines 22-29 Link Here
22		25
23	<body id="courses_course_details" class="course">	26	<body id="courses_course_details" class="course">
24		27
25	[% INCLUDE 'header.inc' %]	28	[% INCLUDE 'header.inc' form=formulaire %]
26	[% INCLUDE 'cat-search.inc' %]
27		29
28	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	30	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
29	<ol>	31	<ol>
Lines 39-44 Link Here
39	</a>	41	</a>
40	</li>	42	</li>
41	</ol>	43	</ol>
		44	<ol>
		45	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		46	</ol>
		47	<ol>
		48	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		49	</ol>
42	</nav>	50	</nav>
43		51
44	<div class="main container-fluid">	52	<div class="main container-fluid">

Lines 3-8 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt (-2 / +10 lines)
3	[% USE AuthorisedValues %]	3	[% USE AuthorisedValues %]
4	[% USE TablesSettings %]	4	[% USE TablesSettings %]
5	[% SET footerjs = 1 %]	5	[% SET footerjs = 1 %]
		6	[% formulaire = BLOCK %]
		7	[% INCLUDE 'cat-search.inc' %]
		8	[% END %]
6	[% PROCESS 'i18n.inc' %]	9	[% PROCESS 'i18n.inc' %]
7	[% INCLUDE 'doc-head-open.inc' %]	10	[% INCLUDE 'doc-head-open.inc' %]
8	<title>Course reserves &rsaquo; Koha</title>	11	<title>Course reserves &rsaquo; Koha</title>
Lines 12-19 Link Here
12		15
13	<body id="courses_course_reserves" class="course">	16	<body id="courses_course_reserves" class="course">
14		17
15	[% INCLUDE 'header.inc' %]	18	[% INCLUDE 'header.inc' form=formulaire %]
16	[% INCLUDE 'cat-search.inc' %]
17		19
18	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	20	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
19	<ol>	21	<ol>
Lines 24-29 Link Here
24	<a href="#" aria-current="page">Course reserves</a>	26	<a href="#" aria-current="page">Course reserves</a>
25	</li>	27	</li>
26	</ol>	28	</ol>
		29	<ol>
		30	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		31	</ol>
		32	<ol>
		33	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		34	</ol>
27	</nav>	35	</nav>
28		36
29	<div class="main container-fluid">	37	<div class="main container-fluid">

Lines 1-5 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt (-2 / +10 lines)
1	[% PROCESS 'i18n.inc' %]	1	[% PROCESS 'i18n.inc' %]
2	[% SET footerjs = 1 %]	2	[% SET footerjs = 1 %]
		3	[% formulaire = BLOCK %]
		4	[% INCLUDE 'cat-search.inc' %]
		5	[% END %]
3	[% INCLUDE 'doc-head-open.inc' %]	6	[% INCLUDE 'doc-head-open.inc' %]
4	<title>[% IF course_name %] Edit [% course_name \| html %] [% ELSE %] New course [% END %] &rsaquo; Course reserves &rsaquo; Koha</title>	7	<title>[% IF course_name %] Edit [% course_name \| html %] [% ELSE %] New course [% END %] &rsaquo; Course reserves &rsaquo; Koha</title>
5	[% INCLUDE 'doc-head-close.inc' %]	8	[% INCLUDE 'doc-head-close.inc' %]
Lines 15-22 Link Here
15		18
16	<body id="courses_course" class="course">	19	<body id="courses_course" class="course">
17		20
18	[% INCLUDE 'header.inc' %]	21	[% INCLUDE 'header.inc' form=formulaire %]
19	[% INCLUDE 'cat-search.inc' %]
20		22
21	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	23	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
22	<ol>	24	<ol>
Lines 32-37 Link Here
32	</a>	34	</a>
33	</li>	35	</li>
34	</ol>	36	</ol>
		37	<ol>
		38	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		39	</ol>
		40	<ol>
		41	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		42	</ol>
35	</nav>	43	</nav>
36		44
37	[% IF ( departments ) %]	45	[% IF ( departments ) %]

Lines 1-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt (-2 / +12 lines)
		1
		2	[% formulaire = BLOCK %]
		3	[% INCLUDE 'cat-search.inc' %]
		4	[% END %]
		5
1	[% INCLUDE 'doc-head-open.inc' %]	6	[% INCLUDE 'doc-head-open.inc' %]
2	<title>Course reserves &rsaquo; Koha</title>	7	<title>Course reserves &rsaquo; Koha</title>
3	[% INCLUDE 'doc-head-close.inc' %]	8	[% INCLUDE 'doc-head-close.inc' %]
4	<body id="courses_invalid_course" class="course">	9	<body id="courses_invalid_course" class="course">
5		10
6	[% INCLUDE 'header.inc' %]	11	[% INCLUDE 'header.inc' form=formulaire %]
7	[% INCLUDE 'cat-search.inc' %]
8		12
9	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	13	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
10	<ol>	14	<ol>
Lines 17-22 Link Here
17	</a>	21	</a>
18	</li>	22	</li>
19	</ol>	23	</ol>
		24	<ol>
		25	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		26	</ol>
		27	<ol>
		28	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		29	</ol>
20	</nav>	30	</nav>
21		31
22	<div class="main container-fluid">	32	<div class="main container-fluid">

Lines 1-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt (-2 / +11 lines)
		1
		2	[% formulaire = BLOCK %]
		3	[% INCLUDE 'cat-search.inc' %]
		4	[% END %]
1	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
2	<title>Error [% errno \| html %] &rsaquo; Koha</title>	6	<title>Error [% errno \| html %] &rsaquo; Koha</title>
3	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]
4	</head>	8	</head>
5	<body id="err_[% errno \| html %]" class="err">	9	<body id="err_[% errno \| html %]" class="err">
6		10
7	[% INCLUDE 'header.inc' %]	11	[% INCLUDE 'header.inc' form=formulaire %]
8	[% INCLUDE 'cat-search.inc' %]
9		12
10	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	13	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
11	<ol>	14	<ol>
Lines 18-23 Link Here
18	</a>	21	</a>
19	</li>	22	</li>
20	</ol>	23	</ol>
		24	<ol>
		25	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		26	</ol>
		27	<ol>
		28	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		29	</ol>
21	</nav>	30	</nav>
22		31
23	<div class="main container-fluid">	32	<div class="main container-fluid">

Lines 4-9 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt (-2 / +10 lines)
4	[% USE Koha %]	4	[% USE Koha %]
5	[% USE KohaDates %]	5	[% USE KohaDates %]
6	[% SET footerjs = 1 %]	6	[% SET footerjs = 1 %]
		7	[% formulaire = BLOCK %]
		8	[% INCLUDE 'cat-search.inc' %]
		9	[% END %]
7	[% USE AuthorisedValues %]	10	[% USE AuthorisedValues %]
8	[% USE TablesSettings %]	11	[% USE TablesSettings %]
9	[% USE Price %]	12	[% USE Price %]
Lines 14-21 Link Here
14	</head>	17	</head>
15		18
16	<body id="illrequests" class="ill">	19	<body id="illrequests" class="ill">
17	[% INCLUDE 'header.inc' %]	20	[% INCLUDE 'header.inc' form=formulaire %]
18	[% INCLUDE 'cat-search.inc' %]
19		21
20	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	22	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
21	<ol>	23	<ol>
Lines 49-54 Link Here
49	</li>	51	</li>
50	[% END %]	52	[% END %]
51	</ol>	53	</ol>
		54	<ol>
		55	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		56	</ol>
		57	<ol>
		58	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		59	</ol>
52	</nav>	60	</nav>
53		61
54	<div class="main container-fluid">	62	<div class="main container-fluid">




            </div> <!-- /.col-sm-2 -->
            <div class="col-sm-9">
                <div class="row">
                    <div class="menuspe"><ul class="biglinks-list">
                        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
                            <li><a class="accueil" href="/cgi-bin/koha/circ/circulation-home.pl"><i class="fa fa-fw fa-exchange fa-2x"></i><h1>Circulation</h1></a></li>
                        [% END %]

                        [% IF CAN_user_borrowers_edit_borrowers %]
                            <li><a class="accueil" href="/cgi-bin/koha/members/members-home.pl"><i class="fa fa-fw fa-id-card-o fa-2x"></i><h1>Patrons</h1></a></li>
                        [% END %]

                         </ul></div>
                        <div class="menuspe"><ul class="biglinks-list">

                        [% IF ( CAN_user_catalogue ) %]
                            <li><a class="accueil" href="/cgi-bin/koha/catalogue/search.pl"><i class="fa fa-fw fa-search fa-2x"></i><h1>Advanced search</h1></a></li>
                            <li><a class="accueil" href="/cgi-bin/koha/catalogue/itemsearch.pl"><i class="fa fa-fw fa-search fa-2x"></i><h1>Item search</h1></a></li>
                                    <span class="fa-stack">
                                        <i class="fa fa-fw fa-book fa-stack-1x"></i>
                                        <i class="fa fa-fw fa-search fa-stack-2x"></i>
                                    </span>
                                </a>
                                <h7>
                                Advanced search
                                </h7>
                            </li>
                            <li>
                                <a class="accueil" href="/cgi-bin/koha/catalogue/itemsearch.pl">
                                    <span class="fa-stack">
                                        <i class="fa fa-fw fa-list fa-stack-1x"></i>
                                        <i class="fa fa-fw fa-search fa-stack-2x"></i>
                                    </span>
                                </a>
                                <h7>
                                Item search
                                </h7>
                            </li>
                        [% END %]

                        <li><a class="accueil" href="/cgi-bin/koha/virtualshelves/shelves.pl"><i class="fa fa-fw fa-list-alt"></i></a><h7>Lists</h7></li>

                        <li><a class="accueil" href="/cgi-bin/koha/virtualshelves/shelves.pl"><i class="fa fa-fw fa-list-alt fa-2x"></i><h1>Lists</h1></a></li>
                        
                        [% IF ( UseCourseReserves ) %]
                            <li><a class="accueil" href="/cgi-bin/koha/course_reserves/course-reserves.pl"><i class="fa fa-fw fa-book fa-2x"></i><h1>Course reserves</h1></a></li>
                        [% END %]

                            <li><a class="accueil" href="/cgi-bin/koha/authorities/authorities-home.pl"><i class="fa fa-fw fa-link"></i></a><h7>Authorities</h7></li>

                    </ul></div>
                    <div class="menuspe"><ul class="biglinks-list">
                            
                            <li><a class="accueil" href="/cgi-bin/koha/authorities/authorities-home.pl"><i class="fa fa-fw fa-link fa-2x"></i><h1>Authorities</h1></a></li>
                        [% IF Koha.Preference('ILLModule') && CAN_user_ill %]
                            <li><a class="accueil" href="/cgi-bin/koha/ill/ill-requests.pl"><i class="fa fa-fw fa-retweet fa-2x"></i><h1>ILL requests</h1></a></li>
                        [% END %]

                        [% IF ( Koha.Preference('EnablePointOfSale') && Koha.Preference('UseCashRegisters') && CAN_user_cash_management_takepayment ) %]
                            <li><a class="accueil" href="/cgi-bin/koha/pos/pay.pl"><i class="fa fa-fw fa-shopping-cart fa-2x"></i><h1>Point of sale</h1></a></li>
                        [% END %]

                        [% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items ) %]
                            <li><a class="accueil" href="/cgi-bin/koha/cataloguing/addbooks.pl"><i class="fa fa-fw fa-tag fa-2x"></i><h1>Cataloging</h1></a></li>
                        [% END %]

                        [% IF ( CAN_user_serials ) %]
                            <li><a class="accueil" href="/cgi-bin/koha/serials/serials-home.pl"><i class="fa fa-fw fa-newspaper-o fa-2x"></i><span class="biglink"></span><h1>Serials</h1></a></li>
                                <a class="accueil" href="/cgi-bin/koha/serials/serials-home.pl"><i class="fa fa-fw fa-newspaper-o"></i></a><span class="biglink"></span><h7>Serials</h7>
                            </li>
                        [% END %]

                        [% IF ( CAN_user_acquisition ) %]
                            <li><a class="accueil" href="/cgi-bin/koha/acqui/acqui-home.pl"><i class="fa fa-fw fa-gift fa-2x"></i><span class="biglink"></span><h1>Acquisitions</h1></a></li>
                                <a class="accueil" href="/cgi-bin/koha/acqui/acqui-home.pl"><i class="fa fa-fw fa-gift"></i></a><span class="biglink"></span><h7>Acquisitions</h7>
                            </li>
                        [% END %]
                    </ul></div>
                        <div class="vert"><ul class="biglinks-list">
                        [% IF ( CAN_user_reports ) %]
                            <li><a class="accueil" id="reglages" href="/cgi-bin/koha/reports/reports-home.pl"><i class="fa fa-fw fa-pie-chart fa-2x"></i><h1>Reports</h1></a></li>
                        [% END %]


                        [% IF ( CAN_user_tools ) %]
                            <li><a class="accueil" id="reglages" href="/cgi-bin/koha/tools/tools-home.pl"><i class="fa fa-fw fa-wrench fa-2x"></i><h1>Tools</h1></a></li>
                        [% END %]

                        [% IF ( CAN_user_parameters ) %]
                            <li><a class="accueil" id="reglages" href="/cgi-bin/koha/admin/admin-home.pl"><i class="fa fa-fw fa-cogs fa-2x"></i><h1>Administration</h1></a></li>
                        [% END %]

                            <li><a class="accueil" id="reglages" href="/cgi-bin/koha/about.pl"><img src="/intranet-tmpl/prog/img/koha-egg.svg" alt="Koha Logo SVG"><h1>About Koha</h1></a></li>
                        </div>
                    </ul></div>
                </div> <!-- /.row -->
                <div class="row">
                    <div class="col-sm-12">

                        </div>
                    </div>
                [% END %]

            </div> <!-- /.col-sm-9 -->

        </div> <!-- /.row -->
    </div> <!-- /.container-fluid -->
    <div class="menuspebas"><div class="bas"><a target="_blank" href="https://koha-community.org/"></a></div></div>

[% MACRO jsinclude BLOCK %]
    <script>

Lines 2-14 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt (-1 / +10 lines)
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE ItemTypes %]	3	[% USE ItemTypes %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE 'cat-search.inc' %]
		7	[% END %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	<title>[% IF batch_id %]Edit label batch ([% batch_id \| html %])[% ELSE %]New label batch[% END %]&rsaquo; Batches &rsaquo; Label creator &rsaquo; Tools &rsaquo; Koha</title>	9	<title>[% IF batch_id %]Edit label batch ([% batch_id \| html %])[% ELSE %]New label batch[% END %]&rsaquo; Batches &rsaquo; Label creator &rsaquo; Tools &rsaquo; Koha</title>
7	[% INCLUDE 'doc-head-close.inc' %]	10	[% INCLUDE 'doc-head-close.inc' %]
8	</head>	11	</head>
9		12
10	<body id="labels_label-edit-batch" class="tools labels" onload="dofocus();">	13	<body id="labels_label-edit-batch" class="tools labels" onload="dofocus();">
11	[% INCLUDE 'header.inc' %]	14	[% INCLUDE 'header.inc' form=formulaire %]
12		15
13	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	16	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
14	<ol>	17	<ol>
Lines 47-52 Link Here
47	</li>	50	</li>
48	[% END %]	51	[% END %]
49	</ol>	52	</ol>
		53	<ol>
		54	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		55	</ol>
		56	<ol>
		57	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		58	</ol>
50	</nav>	59	</nav>
51		60
52	<div class="main container-fluid">	61	<div class="main container-fluid">

Lines 1-5 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt (-1 / +10 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% SET footerjs = 1 %]	2	[% SET footerjs = 1 %]
		3	[% formulaire = BLOCK %]
		4	[% INCLUDE 'cat-search.inc' %]
		5	[% END %]
3	[%- BLOCK translate_label_types -%]	6	[%- BLOCK translate_label_types -%]
4	[%- SWITCH type -%]	7	[%- SWITCH type -%]
5	[%- CASE 'BIB' -%]<span> Only the bibliographic data is printed</span>	8	[%- CASE 'BIB' -%]<span> Only the bibliographic data is printed</span>
Lines 22-28 Link Here
22	[% END %]	25	[% END %]
23	[% END %]	26	[% END %]
24	<body id="labels_label-edit-layout" class="tools labels">	27	<body id="labels_label-edit-layout" class="tools labels">
25	[% INCLUDE 'header.inc' %]	28	[% INCLUDE 'header.inc'' form=formulaire %]
26		29
27	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	30	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
28	<ol>	31	<ol>
Lines 53-58 Link Here
53	</li>	56	</li>
54	[% END %]	57	[% END %]
55	</ol>	58	</ol>
		59	<ol>
		60	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		61	</ol>
		62	<ol>
		63	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		64	</ol>
56	</nav>	65	</nav>
57		66
58	<div class="main container-fluid">	67	<div class="main container-fluid">

Lines 1-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt (-1 / +10 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% SET footerjs = 1 %]	2	[% SET footerjs = 1 %]
		3	[% formulaire = BLOCK %]
		4	[% INCLUDE 'cat-search.inc' %]
		5	[% END %]
3	[% INCLUDE 'doc-head-open.inc' %]	6	[% INCLUDE 'doc-head-open.inc' %]
4	<title>[% IF ( profile_id ) %]Edit printer profile [% profile_id \| html %] [% ELSE %] New printer profile [% END%] &rsaquo; Profiles &rsaquo; Label creator &rsaquo; Tools &rsaquo; Koha</title>	7	<title>[% IF ( profile_id ) %]Edit printer profile [% profile_id \| html %] [% ELSE %] New printer profile [% END%] &rsaquo; Profiles &rsaquo; Label creator &rsaquo; Tools &rsaquo; Koha</title>
5	[% INCLUDE 'doc-head-close.inc' %]	8	[% INCLUDE 'doc-head-close.inc' %]
6	</head>	9	</head>
7		10
8	<body id="labels_label-edit-profile" class="tools labels">	11	<body id="labels_label-edit-profile" class="tools labels">
9	[% INCLUDE 'header.inc' %]	12	[% INCLUDE 'header.inc' form=formulaire %]
10		13
11	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	14	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
12	<ol>	15	<ol>
Lines 33-38 Link Here
33	</a>	36	</a>
34	</li>	37	</li>
35	</ol>	38	</ol>
		39	<ol>
		40	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		41	</ol>
		42	<ol>
		43	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		44	</ol>
36	</nav>	45	</nav>
37		46
38	<div class="main container-fluid">	47	<div class="main container-fluid">

Lines 1-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt (-1 / +10 lines)
1	[% SET footerjs = 1 %]	1	[% SET footerjs = 1 %]
		2	[% formulaire = BLOCK %]
		3	[% INCLUDE 'cat-search.inc' %]
		4	[% END %]
2	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
3	<title>Print barcode range &rsaquo; Label creator &rsaquo; Tools &rsaquo; Koha</title>	6	<title>Print barcode range &rsaquo; Label creator &rsaquo; Tools &rsaquo; Koha</title>
4	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]
5	[% INCLUDE 'greybox.inc' %]	8	[% INCLUDE 'greybox.inc' %]
6	</head>	9	</head>
7	<body id="labels_label-home" class="tools labels">	10	<body id="labels_label-home" class="tools labels">
8	[% INCLUDE 'header.inc' %]	11	[% INCLUDE 'header.inc' form=formulaire %]
9		12
10	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	13	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
11	<ol>	14	<ol>
Lines 24-29 Link Here
24	</a>	27	</a>
25	</li>	28	</li>
26	</ol>	29	</ol>
		30	<ol>
		31	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		32	</ol>
		33	<ol>
		34	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		35	</ol>
27	</nav>	36	</nav>
28		37
29	<div class="main container-fluid">	38	<div class="main container-fluid">

Lines 1-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt (-1 / +10 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% SET footerjs = 1 %]	2	[% SET footerjs = 1 %]
		3	[% formulaire = BLOCK %]
		4	[% INCLUDE 'cat-search.inc' %]
		5	[% END %]
3	[% INCLUDE 'doc-head-open.inc' %]	6	[% INCLUDE 'doc-head-open.inc' %]
4	<title>[% IF ( template_id ) %]Edit label template [% template_id \| html %] [% ELSE %] New label template [% END %] &rsaquo; Templates &rsaquo; Label creator &rsaquo; Tools &rsaquo; Koha</title>	7	<title>[% IF ( template_id ) %]Edit label template [% template_id \| html %] [% ELSE %] New label template [% END %] &rsaquo; Templates &rsaquo; Label creator &rsaquo; Tools &rsaquo; Koha</title>
5	[% INCLUDE 'doc-head-close.inc' %]	8	[% INCLUDE 'doc-head-close.inc' %]
6	</head>	9	</head>
7		10
8	<body id="labels_label-edit-template" class="tools labels">	11	<body id="labels_label-edit-template" class="tools labels">
9	[% INCLUDE 'header.inc' %]	12	[% INCLUDE 'header.inc' form=formulaire %]
10		13
11	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	14	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
12	<ol>	15	<ol>
Lines 32-37 Link Here
32	</a>	35	</a>
33	</li>	36	</li>
34	</ol>	37	</ol>
		38	<ol>
		39	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		40	</ol>
		41	<ol>
		42	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		43	</ol>
35	</nav>	44	</nav>
36		45
37	<div class="main container-fluid">	46	<div class="main container-fluid">

Lines 1-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt (-1 / +10 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'cat-search.inc' %]
		6	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
5	<title>Label creator &rsaquo; Tools &rsaquo; Koha</title>	8	<title>Label creator &rsaquo; Tools &rsaquo; Koha</title>
6	[% INCLUDE 'doc-head-close.inc' %]	9	[% INCLUDE 'doc-head-close.inc' %]
7	</head>	10	</head>
8	<body id="labels_label-home" class="tools labels">	11	<body id="labels_label-home" class="tools labels">
9	[% INCLUDE 'header.inc' %]	12	[% INCLUDE 'header.inc' form=formulaire %]
10		13
11	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	14	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
12	<ol>	15	<ol>
Lines 22-27 Link Here
22	</a>	25	</a>
23	</li>	26	</li>
24	</ol>	27	</ol>
		28	<ol>
		29	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		30	</ol>
		31	<ol>
		32	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		33	</ol>
25	</nav>	34	</nav>
26		35
27	<div class="main container-fluid">	36	<div class="main container-fluid">

Lines 2-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt (-3 / +12 lines)
2	[% USE Asset %]	2	[% USE Asset %]
3	[% PROCESS 'i18n.inc' %]	3	[% PROCESS 'i18n.inc' %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE 'cat-search.inc' %]
		7	[% END %]
5	[% BLOCK translate_label_element %]	8	[% BLOCK translate_label_element %]
6	[%- SWITCH element -%]	9	[%- SWITCH element -%]
7	[%- CASE 'layout' -%][% t('layout') \| html %]	10	[%- CASE 'layout' -%][% t('layout') \| html %]
Lines 20-26 Link Here
20	</head>	23	</head>
21		24
22	<body id="labels_label-manage" class="tools labels">	25	<body id="labels_label-manage" class="tools labels">
23	[% INCLUDE 'header.inc' %]	26	[% INCLUDE 'header.inc' form=formulaire %]
24		27
25	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	28	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
26	<ol>	29	<ol>
Lines 39-44 Link Here
39	</a>	42	</a>
40	</li>	43	</li>
41	</ol>	44	</ol>
		45	<ol>
		46	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		47	</ol>
		48	<ol>
		49	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		50	</ol>
42	</nav>	51	</nav>
43		52
44	<div class="main container-fluid">	53	<div class="main container-fluid">
Lines 98-105 Link Here
98	[% FOREACH text_field IN table_loo.text_fields %]	107	[% FOREACH text_field IN table_loo.text_fields %]
99	[% IF ( text_field.select_field ) %]	108	[% IF ( text_field.select_field ) %]
100	<td class="actions">	109	<td class="actions">
101	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/labels/label-edit-[% label_element \|url %].pl?op=edit&element_id=[% text_field.field_value \|url %]"><i class="fa fa-edit"></i> Edit</a>	110	<a id="lientype" class="btn btn-default btn-xs" href="/cgi-bin/koha/labels/label-edit-[% label_element \|url %].pl?op=edit&element_id=[% text_field.field_value \|url %]"><i class="fa fa-edit"></i> Edit</a>
102	<a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/labels/label-manage.pl?op=delete&label_element=[% label_element \| html %]&element_id=[% text_field.field_value \|url %]"><i class="fa fa-trash"></i> Delete</a>	111	<a id="lientype" class="btn btn-default btn-xs delete" href="/cgi-bin/koha/labels/label-manage.pl?op=delete&label_element=[% label_element \| html %]&element_id=[% text_field.field_value \|url %]"><i class="fa fa-trash"></i> Delete</a>
103	</td>	112	</td>
104	[% IF label_element == 'batch' %] <td><input type="checkbox" name="action" value="[% text_field.field_value \| html %]" /></td>[% END %]	113	[% IF label_element == 'batch' %] <td><input type="checkbox" name="action" value="[% text_field.field_value \| html %]" /></td>[% END %]
105	[% ELSIF ( text_field.field_value ) %]	114	[% ELSIF ( text_field.field_value ) %]

Lines 1-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt (-2 / +11 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'cat-search.inc' %]
		6	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]<title>Quick spine label creator &rsaquo; Tools &rsaquo; Koha</title>	7	[% INCLUDE 'doc-head-open.inc' %]<title>Quick spine label creator &rsaquo; Tools &rsaquo; Koha</title>
5	[% INCLUDE 'doc-head-close.inc' %]	8	[% INCLUDE 'doc-head-close.inc' %]
6	</head>	9	</head>
7		10
8	<body id="labels_spinelabel-home" class="tools labels">	11	<body id="labels_spinelabel-home" class="tools labels">
9	[% INCLUDE 'header.inc' %]	12	[% INCLUDE 'header.inc' form=formulaire %]
10		13
11	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	14	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
12	<ol>	15	<ol>
Lines 22-27 Link Here
22	</a>	25	</a>
23	</li>	26	</li>
24	</ol>	27	</ol>
		28	<ol>
		29	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		30	</ol>
		31	<ol>
		32	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		33	</ol>
25	</nav>	34	</nav>
26		35
27	<div class="main container-fluid">	36	<div class="main container-fluid">
Lines 37-43 Link Here
37	<input type="text" name="barcode" id="barcode" class="focus" required="required" />	46	<input type="text" name="barcode" id="barcode" class="focus" required="required" />
38	</li>	47	</li>
39	</ol>	48	</ol>
40	<fieldset class="action"><input type="submit" value="View spine label" /></fieldset>	49	<fieldset class="action"><input class="principal" type="submit" value="View spine label" /></fieldset>
41	</fieldset>	50	</fieldset>
42	</form>	51	</form>
43		52

Lines 14-20 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt (-2 / +8 lines)
14	[% INCLUDE 'doc-head-close.inc' %]	14	[% INCLUDE 'doc-head-close.inc' %]
15	</head>	15	</head>
16		16
17	<body id="pat_accountline_details" class="pat">	17	<body id="pat_accountline_details">
18	[% INCLUDE 'header.inc' form=formulaire %]	18	[% INCLUDE 'header.inc' form=formulaire %]
19		19
20	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	20	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
Lines 55-60 Link Here
55	</li>	55	</li>
56	[% END %]	56	[% END %]
57	</ol>	57	</ol>
		58	<ol>
		59	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		60	</ol>
		61	<ol>
		62	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		63	</ol>
58	</nav>	64	</nav>
59		65
60	<div class="main container-fluid">	66	<div class="main container-fluid">
Lines 147-153 Link Here
147	</tbody>	153	</tbody>
148	</table>	154	</table>
149		155
150	<h3>History</h3>	156	<h2>History</h2>
151	<table class="accountline-offsets-table" id="accountline-debits-table">	157	<table class="accountline-offsets-table" id="accountline-debits-table">
152	<thead>	158	<thead>
153	<tr>	159	<tr>

Lines 3-9 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt (-1 / +7 lines)
3	[% USE Asset %]	3	[% USE Asset %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
5	[% formulaire = BLOCK %]	5	[% formulaire = BLOCK %]
6	[% INCLUDE 'patron-search-header.inc' %]	6	[% INCLUDE 'patron-search.inc' %]
7	[% END %]	7	[% END %]
8	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
9	<title>API Keys &rsaquo; Patrons &rsaquo; Koha</title>	9	<title>API Keys &rsaquo; Patrons &rsaquo; Koha</title>
Lines 26-31 Link Here
26	</a>	26	</a>
27	</li>	27	</li>
28	</ol>	28	</ol>
		29	<ol>
		30	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		31	</ol>
		32	<ol>
		33	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		34	</ol>
29	</nav>	35	</nav>
30		36
31	<div class="main container-fluid">	37	<div class="main container-fluid">

Lines 10-16 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt (-12 / +18 lines)
10	[% USE Registers %]	10	[% USE Registers %]
11	[% SET footerjs = 1 %]	11	[% SET footerjs = 1 %]
12	[% formulaire = BLOCK %]	12	[% formulaire = BLOCK %]
13	[% INCLUDE 'patron-search-header.inc' %]	13	[% INCLUDE 'patron-search.inc' %]
14	[% END %]	14	[% END %]
15	[% SET registers = Registers.all( filters => { current_branch => 1 } ) %]	15	[% SET registers = Registers.all( filters => { current_branch => 1 } ) %]
16		16
Lines 21-27 Link Here
21	[% INCLUDE 'doc-head-close.inc' %]	21	[% INCLUDE 'doc-head-close.inc' %]
22	</head>	22	</head>
23		23
24	<body id="pat_borraccount" class="pat">	24	<body id="pat_borraccount">
25	[% INCLUDE 'header.inc' form=formulaire %]	25	[% INCLUDE 'header.inc' form=formulaire %]
26		26
27	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	27	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
Lines 38-43 Link Here
38	</a>	38	</a>
39	</li>	39	</li>
40	</ol>	40	</ol>
		41	<ol>
		42	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		43	</ol>
		44	<ol>
		45	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		46	</ol>
41	</nav>	47	</nav>
42		48
43	<div class="main container-fluid">	49	<div class="main container-fluid">
Lines 108-123 Link Here
108	[% IF account.amountoutstanding <= 0 %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amountoutstanding \| $Price %]</td>	114	[% IF account.amountoutstanding <= 0 %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amountoutstanding \| $Price %]</td>
109	<td class="actions">	115	<td class="actions">
110	[% IF ( account.is_credit ) %]	116	[% IF ( account.is_credit ) %]
111	<a target="_blank" href="printfeercpt.pl?action=print&accountlines_id=[% account.accountlines_id \| uri %]" class="btn btn-default btn-xs receipt-print-action"><i class="fa fa-print"></i> Print</a>	117	<a target="_blank" href="printfeercpt.pl?action=print&accountlines_id=[% account.accountlines_id \| uri %]" class="btn btn-default btn-xs receipt-print-action" id="lientype"><i class="fa fa-print"></i> Print</a>
112	[% ELSE %]	118	[% ELSE %]
113	<a target="_blank" href="printinvoice.pl?action=print&accountlines_id=[% account.accountlines_id \| uri %]" class="btn btn-default btn-xs invoice-print-action"><i class="fa fa-print"></i> Print</a>	119	<a target="_blank" href="printinvoice.pl?action=print&accountlines_id=[% account.accountlines_id \| uri %]" class="btn btn-default btn-xs invoice-print-action" id="lientype"><i class="fa fa-print"></i> Print</a>
114	[% END %]	120	[% END %]
115	<a href="accountline-details.pl?accountlines_id=[% account.accountlines_id \| uri %]" class="btn btn-default btn-xs details-action"><i class="fa fa-list"></i> Details</a>	121	<a href="accountline-details.pl?accountlines_id=[% account.accountlines_id \| uri %]" class="btn btn-default btn-xs details-action" id="lientype"><i class="fa fa-list"></i> Details</a>
116	[% IF account.is_debit && account.amountoutstanding > 0 %]	122	[% IF account.is_debit && account.amountoutstanding > 0 %]
117	<a class="btn btn-default btn-xs pay-action" href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% account.borrowernumber \| html %]&pay_individual=1&debit_type_code=[% account.debit_type_code \| html %]&amount=[% account.amount \| html %]&amountoutstanding=[% account.amountoutstanding \| html %]&description=[% account.description \| html %]&itemnumber=[% account.itemnumber \| html %]&accountlines_id=[% account.accountlines_id \| html %]"><i class="fa fa-money"></i> Pay</a>	123	<a class="btn btn-default btn-xs pay-action" href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% account.borrowernumber \| html %]&pay_individual=1&debit_type_code=[% account.debit_type_code \| html %]&amount=[% account.amount \| html %]&amountoutstanding=[% account.amountoutstanding \| html %]&description=[% account.description \| html %]&itemnumber=[% account.itemnumber \| html %]&accountlines_id=[% account.accountlines_id \| html %]"><i class="fa fa-money"></i> Pay</a>
118	[% END %]	124	[% END %]
119	[% IF account.is_credit && account.status != 'VOID' %]	125	[% IF account.is_credit && account.status != 'VOID' %]
120	<a href="boraccount.pl?action=void&accountlines_id=[% account.accountlines_id \| uri %]&borrowernumber=[% account.borrowernumber \| uri %]" class="btn btn-default btn-xs void-action"><i class="fa fa-ban"></i> Void payment</a>	126	<a href="boraccount.pl?action=void&accountlines_id=[% account.accountlines_id \| uri %]&borrowernumber=[% account.borrowernumber \| uri %]" class="btn btn-default btn-xs void-action" id="lientype"><i class="fa fa-ban"></i> Void payment</a>
121	[% END %]	127	[% END %]
122	[% IF account.is_debit && account.amount == account.amountoutstanding && account.status != 'CANCELLED' && !(account.debit_type_code == 'PAYOUT') %]	128	[% IF account.is_debit && account.amount == account.amountoutstanding && account.status != 'CANCELLED' && !(account.debit_type_code == 'PAYOUT') %]
123	<form method="post" action="/cgi-bin/koha/members/cancel-charge.pl">	129	<form method="post" action="/cgi-bin/koha/members/cancel-charge.pl">
Lines 131-137 Link Here
131	</form>	137	</form>
132	[% END %]	138	[% END %]
133	[% IF CAN_user_updatecharges_payout && account.is_credit && ( account.amountoutstanding < 0 ) %]	139	[% IF CAN_user_updatecharges_payout && account.is_credit && ( account.amountoutstanding < 0 ) %]
134	<button type="button" data-toggle="modal" data-target="#issuePayoutModal" data-account="[%- PROCESS account_type_description account=account -%]" data-accountline="[% account.accountlines_id \| html %]" data-amount="[% account.amountoutstanding \| $Price %]" class="btn btn-default btn-xs payout-action"><i class="fa fa-money"></i> Issue payout</button>	140	<button type="button" data-toggle="modal" data-target="#issuePayoutModal" data-account="[%- PROCESS account_type_description account=account -%]" data-accountline="[% account.accountlines_id \| html %]" data-amount="[% account.amountoutstanding \| $Price %]" class="btn btn-default btn-xs payout-action" id="lientype"><i class="fa fa-money"></i> Issue payout</button>
135	[% END %]	141	[% END %]
136	[% IF CAN_user_updatecharges_refund && account.is_debit && ( account.amountoutstanding != account.amount ) && !(account.status == 'REFUNDED') && !(account.debit_type_code == 'PAYOUT') %]	142	[% IF CAN_user_updatecharges_refund && account.is_debit && ( account.amountoutstanding != account.amount ) && !(account.status == 'REFUNDED') && !(account.debit_type_code == 'PAYOUT') %]
137	<button type="button" class="btn btn-default btn-xs refund-action" data-toggle="modal" data-target="#issueRefundModal" data-item="[%- PROCESS account_type_description account=account -%]" data-accountline="[% account.accountlines_id \| html %]" data-amount="[% account.amount \| $Price %]" data-amountoutstanding="[% account.amountoutstanding \| $Price %]" data-member="[% account.borrowernumber \| html %]"><i class="fa fa-money"></i> Issue refund</button>	143	<button type="button" class="btn btn-default btn-xs refund-action" data-toggle="modal" data-target="#issueRefundModal" data-item="[%- PROCESS account_type_description account=account -%]" data-accountline="[% account.accountlines_id \| html %]" data-amount="[% account.amount \| $Price %]" data-amountoutstanding="[% account.amountoutstanding \| $Price %]" data-member="[% account.borrowernumber \| html %]"><i class="fa fa-money"></i> Issue refund</button>
Lines 150-156 Link Here
150	<td class="credit" style="text-align: right;">[% total \| $Price %]</td>	156	<td class="credit" style="text-align: right;">[% total \| $Price %]</td>
151	<td>	157	<td>
152	[% IF CAN_user_updatecharges_payout %]	158	[% IF CAN_user_updatecharges_payout %]
153	<button type="button" data-toggle="modal" data-target="#issuePayoutModal" data-amount="[% total \| $Price %]" class="btn btn-default btn-xs payout-amount-action"><i class="fa fa-money"></i> Payout amount</button>	159	<button type="button" data-toggle="modal" data-target="#issuePayoutModal" data-amount="[% total \| $Price %]" class="btn btn-default btn-xs payout-amount-action" id="lientype"><i class="fa fa-money"></i> Payout amount</button>
154	[% END %]	160	[% END %]
155	</td>	161	</td>
156	[% ELSE %]	162	[% ELSE %]
Lines 183-189 Link Here
183	<div class="modal-content">	189	<div class="modal-content">
184	<div class="modal-header">	190	<div class="modal-header">
185	<button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>	191	<button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
186	<h4 class="modal-title" id="issuePayoutLabel">Issue payout</h4>	192	<h2 class="modal-title" id="issuePayoutLabel">Issue payout</h2>
187	</div>	193	</div>
188	<div class="modal-body">	194	<div class="modal-body">
189	[% IF Koha.Preference('UseCashRegisters') && ( registers.size == 0 ) %]	195	[% IF Koha.Preference('UseCashRegisters') && ( registers.size == 0 ) %]
Lines 191-197 Link Here
191	You must have at least one cash register associated with this branch before you can record cash payouts.	197	You must have at least one cash register associated with this branch before you can record cash payouts.
192	</div>	198	</div>
193	[% END %]	199	[% END %]
194	<fieldset class="rows">	200	<fieldset>
195	<ol>	201	<ol>
196	<li>	202	<li>
197	<span id="paid" class="label">Outstanding credit: </span><span>[% payout.amount \| $Price %]</span>	203	<span id="paid" class="label">Outstanding credit: </span><span>[% payout.amount \| $Price %]</span>
Lines 219-226 Link Here
219	</div> <!-- /.modal-body -->	225	</div> <!-- /.modal-body -->
220	<div class="modal-footer">	226	<div class="modal-footer">
221	<input type="hidden" name="op" value="payout">	227	<input type="hidden" name="op" value="payout">
222	<button type="submit" class="btn btn-default" id="borr_payout_confirm">Confirm</button>	228	<button type="submit" class="btn btn-default principal" id="borr_payout_confirm">Confirm</button>
223	<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>	229	<button type="button" class="btn btn-default cancel" data-dismiss="modal">Cancel</button>
224	</div> <!-- /.modal-footer -->	230	</div> <!-- /.modal-footer -->
225	</div> <!-- /.modal-content -->	231	</div> <!-- /.modal-content -->
226	</div> <!-- /.modal-dialog -->	232	</div> <!-- /.modal-dialog -->

Lines 4-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt (-1 / +7 lines)
4	[% USE Branches %]	4	[% USE Branches %]
5	[% SET footerjs = 1 %]	5	[% SET footerjs = 1 %]
6	[% formulaire = BLOCK %]	6	[% formulaire = BLOCK %]
7	[% INCLUDE 'patron-search-header.inc' %]	7	[% INCLUDE 'patron-search.inc' %]
8	[% END %]	8	[% END %]
9	[% INCLUDE 'doc-head-open.inc' %]	9	[% INCLUDE 'doc-head-open.inc' %]
10	<title>Delete patron [% patron.firstname \| html %] [% patron.surname \| html %] &rsaquo; Koha</title>	10	<title>Delete patron [% patron.firstname \| html %] [% patron.surname \| html %] &rsaquo; Koha</title>
Lines 27-32 Link Here
27	</a>	27	</a>
28	</li>	28	</li>
29	</ol>	29	</ol>
		30	<ol>
		31	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		32	</ol>
		33	<ol>
		34	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		35	</ol>
30	</nav>	36	</nav>
31		37
32	<div class="main container-fluid">	38	<div class="main container-fluid">

Lines 5-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt (-1 / +7 lines)
5	[% USE Branches %]	5	[% USE Branches %]
6	[% SET footerjs = 1 %]	6	[% SET footerjs = 1 %]
7	[% formulaire = BLOCK %]	7	[% formulaire = BLOCK %]
8	[% INCLUDE 'patron-search-header.inc' %]	8	[% INCLUDE 'patron-search.inc' %]
9	[% END %]	9	[% END %]
10	[% INCLUDE 'doc-head-open.inc' %]	10	[% INCLUDE 'doc-head-open.inc' %]
11	<title>[% UNLESS blocking_error %]Discharge for [% patron.firstname \| html %] [% patron.surname \| html %] ([% patron.cardnumber \| html %])[% END %] &rsaquo; Patrons &rsaquo; Koha</title>	11	<title>[% UNLESS blocking_error %]Discharge for [% patron.firstname \| html %] [% patron.surname \| html %] ([% patron.cardnumber \| html %])[% END %] &rsaquo; Patrons &rsaquo; Koha</title>
Lines 37-42 Link Here
37	</li>	37	</li>
38	[% END %]	38	[% END %]
39	</ol>	39	</ol>
		40	<ol>
		41	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		42	</ol>
		43	<ol>
		44	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		45	</ol>
40	</nav>	46	</nav>
41		47
42	<div class="main container-fluid">	48	<div class="main container-fluid">

Lines 3-18 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt (+13 lines)
3	[% USE Branches %]	3	[% USE Branches %]
4	[% USE KohaDates %]	4	[% USE KohaDates %]
5	[% SET footerjs = 1 %]	5	[% SET footerjs = 1 %]
		6	[% formulaire = BLOCK %]
		7	[% INCLUDE 'patron-search.inc' %]
		8	[% END %]
6	[% INCLUDE 'doc-head-open.inc' %]	9	[% INCLUDE 'doc-head-open.inc' %]
7	<title>Pending discharge requests &rsaquo; Patrons &rsaquo; Koha</title>	10	<title>Pending discharge requests &rsaquo; Patrons &rsaquo; Koha</title>
8	[% INCLUDE 'doc-head-close.inc' %]	11	[% INCLUDE 'doc-head-close.inc' %]
9	</head>	12	</head>
10	<body id="pat_discharges" class="pat">	13	<body id="pat_discharges" class="pat">
		14	<<<<<<< HEAD
11	[% INCLUDE 'header.inc' %]	15	[% INCLUDE 'header.inc' %]
12	<<<<<<< HEAD	16	<<<<<<< HEAD
13	[% INCLUDE 'patron-search-header.inc' %]	17	[% INCLUDE 'patron-search-header.inc' %]
14	=======	18	=======
15	>>>>>>> Bug 30952: Patrons Module	19	>>>>>>> Bug 30952: Patrons Module
		20	=======
		21	[% INCLUDE 'header.inc' form=formulaire %]
		22	>>>>>>> Bug 30952: Search bar
16		23
17	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	24	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
18	<ol>	25	<ol>
Lines 28-33 Link Here
28	</a>	35	</a>
29	</li>	36	</li>
30	</ol>	37	</ol>
		38	<ol>
		39	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		40	</ol>
		41	<ol>
		42	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		43	</ol>
31	</nav>	44	</nav>
32		45
33	<div class="main container-fluid">	46	<div class="main container-fluid">




[% USE AuthorisedValues %]
[% SET footerjs = 1 %]
[% formulaire = BLOCK %]
    [% INCLUDE 'patron-search.inc' %]
[% END %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Files for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>
[% INCLUDE 'doc-head-close.inc' %]
</head>

<body id="pat_files">
[% INCLUDE 'header.inc' form=formulaire %]

<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">

            </a>
        </li>
    </ol>
        <ol>
            [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
        </ol>
        <ol>
            <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
        </ol>
</nav>

<div class="main container-fluid">


                [% INCLUDE 'members-toolbar.inc' %]

                <h2>Files</h2>

                [% IF errors %]
                    <div class="dialog alert">

                                 <td>[% f.file_type | html %]</td>
                                 <td>[% f.file_description | html %]</td>
                                 <td>[% f.date_uploaded | $KohaDates %]</td>
                                 [% IF CAN_user_borrowers_edit_borrowers %]<td><a class="btn btn-default btn-xs confirmdelete" href="?borrowernumber=[% patron.borrowernumber | html %]&amp;op=delete&amp;file_id=[% f.file_id | html %]" id="lientype"><i class="fa fa-trash"></i> Delete</a></td>[% END %]
                            </tr>
                        [% END %]
                    </tbody>


                <form method="post" action="/cgi-bin/koha/members/files.pl" enctype="multipart/form-data">
                    <fieldset class="rows">
                        <h3>Upload new file</h3>
                        <ol>
                        <li><input type="hidden" name="op" value="upload" />
                        <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />

                        <li><label for="uploadfile">File:</label><input name="uploadfile" type="file" id="uploadfile" /></li>

                        </ol>
                        <fieldset class="action"><input name="upload" type="submit" id="upload" class="principal" value="Upload file" /></fieldset>
                    </fieldset>
                </form>





[% USE ItemTypes %]
[% SET footerjs = 1 %]
[% formulaire = BLOCK %]
    [% INCLUDE 'patron-search.inc' %]
[% END %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Holds history for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>
[% INCLUDE 'doc-head-close.inc' %]
</head>

<body id="pat_holdshistory">
[% INCLUDE 'header.inc' form=formulaire %]

<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
    <ol>

            </a>
        </li>
    </ol>
        <ol>
            [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
        </ol>
        <ol>
            <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
        </ol>
</nav>

<div class="main container-fluid">

            <main>

[% INCLUDE 'members-toolbar.inc' %]
<h2>Holds history</h2>

[% UNLESS Koha.Preference('intranetreadinghistory') %]
    <div class="dialog alert">Staff members are not allowed to access patron's holds history</div>

Lines 6-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt (-2 / +8 lines)
6	[% USE Branches %]	6	[% USE Branches %]
7	[% SET footerjs = 1 %]	7	[% SET footerjs = 1 %]
8	[% formulaire = BLOCK %]	8	[% formulaire = BLOCK %]
9	[% INCLUDE 'patron-search-header.inc.inc' %]	9	[% INCLUDE 'patron-search.inc' %]
10	[% END %]	10	[% END %]
11	[% INCLUDE 'doc-head-open.inc' %]	11	[% INCLUDE 'doc-head-open.inc' %]
12	<title>Details for [% INCLUDE 'patron-title.inc' no_html = 1 %] &rsaquo; Housebound &rsaquo; Koha</title>	12	<title>Details for [% INCLUDE 'patron-title.inc' no_html = 1 %] &rsaquo; Housebound &rsaquo; Koha</title>
Lines 14-20 Link Here
14	</head>	14	</head>
15		15
16	<body id="housebound-home" class="housebound">	16	<body id="housebound-home" class="housebound">
17	[% INCLUDE 'header.inc' form= formulaire %]	17	[% INCLUDE 'header.inc' form=formulaire %]
18		18
19	[% BLOCK 'homebound-details' %]	19	[% BLOCK 'homebound-details' %]
20	<div class="rows">	20	<div class="rows">
Lines 74-79 Link Here
74	</a>	74	</a>
75	</li>	75	</li>
76	</ol>	76	</ol>
		77	<ol>
		78	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		79	</ol>
		80	<ol>
		81	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		82	</ol>
77	</nav>	83	</nav>
78		84
79	<div class="main container-fluid">	85	<div class="main container-fluid">

Lines 5-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt (-2 / +8 lines)
5	[% USE KohaDates %]	5	[% USE KohaDates %]
6	[% SET footerjs = 1 %]	6	[% SET footerjs = 1 %]
7	[% formulaire = BLOCK %]	7	[% formulaire = BLOCK %]
8	[% INCLUDE 'patron-search-header.inc.inc' %]	8	[% INCLUDE 'patron-search.inc' %]
9	[% END %]	9	[% END %]
10	[% USE AuthorisedValues %]	10	[% USE AuthorisedValues %]
11	[% USE TablesSettings %]	11	[% USE TablesSettings %]
Lines 16-22 Link Here
16	</head>	16	</head>
17		17
18	<body id="pat_illrequestshistory" class="pat">	18	<body id="pat_illrequestshistory" class="pat">
19	[% INCLUDE 'header.inc' form= formulaire %]	19	[% INCLUDE 'header.inc' form=formulaire %]
20		20
21	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	21	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
22	<ol>	22	<ol>
Lines 32-37 Link Here
32	</a>	32	</a>
33	</li>	33	</li>
34	</ol>	34	</ol>
		35	<ol>
		36	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		37	</ol>
		38	<ol>
		39	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		40	</ol>
35	</nav>	41	</nav>
36		42
37	<div class="main container-fluid">	43	<div class="main container-fluid">

Lines 4-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt (-6 / +12 lines)
4	[% USE Branches %]	4	[% USE Branches %]
5	[% SET footerjs = 1 %]	5	[% SET footerjs = 1 %]
6	[% formulaire = BLOCK %]	6	[% formulaire = BLOCK %]
7	[% INCLUDE 'patron-search-header.inc.inc' %]	7	[% INCLUDE 'patron-search.inc' %]
8	[% END %]	8	[% END %]
9		9
10	[% PROCESS 'accounts.inc' %]	10	[% PROCESS 'accounts.inc' %]
Lines 14-21 Link Here
14	[% INCLUDE 'doc-head-close.inc' %]	14	[% INCLUDE 'doc-head-close.inc' %]
15	</head>	15	</head>
16		16
17	<body id="pat_mancredit" class="pat">	17	<body id="pat_mancredit">
18	[% INCLUDE 'header.inc' form= formulaire %]	18	[% INCLUDE 'header.inc' form=formulaire %]
19		19
20	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	20	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
21	<ol>	21	<ol>
Lines 31-36 Link Here
31	</a>	31	</a>
32	</li>	32	</li>
33	</ol>	33	</ol>
		34	<ol>
		35	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		36	</ol>
		37	<ol>
		38	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		39	</ol>
34	</nav>	40	</nav>
35		41
36	<div class="main container-fluid">	42	<div class="main container-fluid">
Lines 56-63 Link Here
56	<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber \| html %]" />	62	<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber \| html %]" />
57	<input type="hidden" name="csrf_token" value="[% csrf_token \| html %]" />	63	<input type="hidden" name="csrf_token" value="[% csrf_token \| html %]" />
58		64
59	<fieldset class="rows">	65	<fieldset>
60	<legend>Manual credit</legend>	66	<h3>Manual credit</h3>
61	<ol>	67	<ol>
62	<li>	68	<li>
63	<label for="type">Credit type: </label>	69	<label for="type">Credit type: </label>
Lines 74-80 Link Here
74	</ol>	80	</ol>
75	</fieldset>	81	</fieldset>
76		82
77	<fieldset class="action"><input type="submit" name="add" value="Add credit" /> <a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber \| html %]">Cancel</a></fieldset>	83	<fieldset class="action"><input type="submit" name="add" class="principal" value="Add credit" /> <a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber \| html %]" class="cancel">Cancel</a></fieldset>
78	</form>	84	</form>
79		85
80	</div>	86	</div>

Lines 5-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt (-8 / +14 lines)
5	[% USE Branches %]	5	[% USE Branches %]
6	[% SET footerjs = 1 %]	6	[% SET footerjs = 1 %]
7	[% formulaire = BLOCK %]	7	[% formulaire = BLOCK %]
8	[% INCLUDE 'patron-search-header.inc.inc' %]	8	[% INCLUDE 'patron-search.inc' %]
9	[% END %]	9	[% END %]
10		10
11	[% PROCESS 'accounts.inc' %]	11	[% PROCESS 'accounts.inc' %]
Lines 15-22 Link Here
15	[% INCLUDE 'doc-head-close.inc' %]	15	[% INCLUDE 'doc-head-close.inc' %]
16	</head>	16	</head>
17		17
18	<body id="pat_maninvoice" class="pat">	18	<body id="pat_maninvoice">
19	[% INCLUDE 'header.inc' form= formulaire %]	19	[% INCLUDE 'header.inc' form=formulaire %]
20		20
21	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	21	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
22	<ol>	22	<ol>
Lines 32-37 Link Here
32	</a>	32	</a>
33	</li>	33	</li>
34	</ol>	34	</ol>
		35	<ol>
		36	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		37	</ol>
		38	<ol>
		39	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		40	</ol>
35	</nav>	41	</nav>
36		42
37	<div class="main container-fluid">	43	<div class="main container-fluid">
Lines 66-73 Link Here
66	<form action="/cgi-bin/koha/members/maninvoice.pl" method="post" id="maninvoice">	72	<form action="/cgi-bin/koha/members/maninvoice.pl" method="post" id="maninvoice">
67	<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber \| html %]" />	73	<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber \| html %]" />
68	<input type="hidden" name="csrf_token" value="[% csrf_token \| html %]" />	74	<input type="hidden" name="csrf_token" value="[% csrf_token \| html %]" />
69	<fieldset class="rows">	75	<fieldset>
70	<legend>Manual invoice</legend>	76	<h3>Manual invoice</h3>
71	<ol>	77	<ol>
72	<li>	78	<li>
73	<label for="type">Type: </label>	79	<label for="type">Type: </label>
Lines 88-96 Link Here
88	</ol>	94	</ol>
89	</fieldset>	95	</fieldset>
90	<fieldset class="action">	96	<fieldset class="action">
91	<button type="submit" name="add" value="save">Save</button>	97	<button type="submit" name="add" class="principal" value="save">Save</button>
92	<button type="submit" name="add" value="save and pay">Save and pay</button>	98	<button type="submit" name="add" class="principal" value="save and pay">Save and pay</button>
93	<a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber \| html %]">Cancel</a>	99	<a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber \| html %]" class="cancel">Cancel</a>
94	</fieldset>	100	</fieldset>
95	</form>	101	</form>
96		102

Lines 3-9 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt (-6 / +12 lines)
3	[% USE Branches %]	3	[% USE Branches %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
5	[% formulaire = BLOCK %]	5	[% formulaire = BLOCK %]
6	[% INCLUDE 'patron-search-header.inc' %]	6	[% INCLUDE 'patron-search.inc' %]
7	[% END %]	7	[% END %]
8	[% PROCESS 'permissions.inc' %]	8	[% PROCESS 'permissions.inc' %]
9	[% INCLUDE 'doc-head-open.inc' %]	9	[% INCLUDE 'doc-head-open.inc' %]
Lines 13-19 Link Here
13	[% INCLUDE 'doc-head-close.inc' %]	13	[% INCLUDE 'doc-head-close.inc' %]
14	</head>	14	</head>
15		15
16	<body id="pat_member-flags" class="pat">	16	<body id="pat_member-flags">
17	[% INCLUDE 'header.inc' form=formulaire %]	17	[% INCLUDE 'header.inc' form=formulaire %]
18		18
19	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	19	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
Lines 30-35 Link Here
30	</a>	30	</a>
31	</li>	31	</li>
32	</ol>	32	</ol>
		33	<ol>
		34	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		35	</ol>
		36	<ol>
		37	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		38	</ol>
33	</nav>	39	</nav>
34		40
35	<div class="main container-fluid">	41	<div class="main container-fluid">
Lines 43-54 Link Here
43	<input type="hidden" name="csrf_token" value="[% csrf_token \| html %]" />	49	<input type="hidden" name="csrf_token" value="[% csrf_token \| html %]" />
44	<input type="hidden" name="member" id="borrowernumber" value="[% patron.borrowernumber \| html %]" />	50	<input type="hidden" name="member" id="borrowernumber" value="[% patron.borrowernumber \| html %]" />
45	<input type="hidden" name="newflags" value="1" />	51	<input type="hidden" name="newflags" value="1" />
46	<h1>Set permissions for [% INCLUDE 'patron-title.inc' no_html = 1 %]</h1>	52	<h2>Set permissions for [% INCLUDE 'patron-title.inc' no_html = 1 %]</h2>
47		53
48	<div id="permissionstree">	54	<div id="permissionstree">
49	<div id="permissions_toolbar" class="btn-toolbar">	55	<div id="permissions_toolbar" class="btn-toolbar">
50	<button type="submit" class="btn btn-default"><i class="fa fa-save"></i> Save</button>	56	<button type="submit" class="principal"><i class="fa fa-save"></i> Save</button>
51	<a class="btn btn-default" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber \| html %]"><i class="fa fa-remove"></i> Cancel</a>	57	<a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber \| html %]"><i class="fa fa-remove"></i> Cancel</a>
52	<a class="toggleall toggleall_on btn btn-link" href="#"><i class="fa fa-plus-square-o"></i> Show all</a>	58	<a class="toggleall toggleall_on btn btn-link" href="#"><i class="fa fa-plus-square-o"></i> Show all</a>
53	<a class="toggleall toggleall_off btn btn-link" href="#"><i class="fa fa-minus-square-o"></i> Hide all</a>	59	<a class="toggleall toggleall_off btn btn-link" href="#"><i class="fa fa-minus-square-o"></i> Hide all</a>
54	<a id="CheckAllFlags" class="btn btn-link" href="#">	60	<a id="CheckAllFlags" class="btn btn-link" href="#">
Lines 89-95 Link Here
89	[% IF ( loo.flag == "superlibrarian" ) %]<div class="hint superlibrarian-hint">This permission grants access to all areas. If selected, specific sub-permissions cannot be selected.</div>[% END %]	95	[% IF ( loo.flag == "superlibrarian" ) %]<div class="hint superlibrarian-hint">This permission grants access to all areas. If selected, specific sub-permissions cannot be selected.</div>[% END %]
90	[% IF ( loo.sub_perm_loop ) %]	96	[% IF ( loo.sub_perm_loop ) %]
91	<a class="toggle-[% loo.bit \| html %] togglechildren_off" href="#" data-bit="[% loo.bit \| html %]"><i class="fa fa-minus-square-o"></i> Hide details</a>	97	<a class="toggle-[% loo.bit \| html %] togglechildren_off" href="#" data-bit="[% loo.bit \| html %]"><i class="fa fa-minus-square-o"></i> Hide details</a>
92	<a class="toggle-[% loo.bit \| html %] togglechildren_on" href="#" data-bit="[% loo.bit \| html %]"><i class="fa fa-plus-square-o"></i> Show details</a>	98	<a class="toggle-[% loo.bit \| html %] togglechildren_on" href="#" data-bit="[% loo.bit \| html %]" id="lientype"><i class="fa fa-plus-square-o"></i> Show details</a>
93	<div class="children" id="flag-[% loo.bit \| html %]-children">	99	<div class="children" id="flag-[% loo.bit \| html %]-children">
94	[% FOREACH sub_perm_loo IN loo.sub_perm_loop %]	100	[% FOREACH sub_perm_loo IN loo.sub_perm_loop %]
95	<div class="child-flags">	101	<div class="child-flags">

Lines 4-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt (-5 / +15 lines)
4	[% USE Branches %]	4	[% USE Branches %]
5	[% SET footerjs = 1 %]	5	[% SET footerjs = 1 %]
6	[% formulaire = BLOCK %]	6	[% formulaire = BLOCK %]
7	[% INCLUDE 'patron-search-header.inc' %]	7	[% INCLUDE 'patron-search.inc' %]
8	[% END %]	8	[% END %]
9	[% INCLUDE 'doc-head-open.inc' %]	9	[% INCLUDE 'doc-head-open.inc' %]
10	<title>	10	<title>
Lines 13-19 Link Here
13	[% INCLUDE 'doc-head-close.inc' %]	13	[% INCLUDE 'doc-head-close.inc' %]
14	</head>	14	</head>
15		15
16	<body id="pat_member-password" class="pat">	16	<body id="pat_member-password">
17	[% INCLUDE 'header.inc' form=formulaire %]	17	[% INCLUDE 'header.inc' form=formulaire %]
18		18
19	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	19	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
Lines 37-42 Link Here
37	</a>	37	</a>
38	</li>	38	</li>
39	</ol>	39	</ol>
		40	<ol>
		41	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		42	</ol>
		43	<ol>
		44	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		45	</ol>
40	</nav>	46	</nav>
41		47
42	<div class="main container-fluid">	48	<div class="main container-fluid">
Lines 47-53 Link Here
47	[% INCLUDE 'members-toolbar.inc' %]	53	[% INCLUDE 'members-toolbar.inc' %]
48		54
49	[% IF ( newpassword ) %]	55	[% IF ( newpassword ) %]
50	<h1>Password updated</h1>	56	<h2>Password updated</h2>
51		57
52	[% ELSE %]	58	[% ELSE %]
53		59
Lines 84-90 Link Here
84	[% END %]	90	[% END %]
85		91
86		92
		93	<<<<<<< HEAD
87	<fieldset class="brief"><legend><h1>Change username and/or password for [% patron.firstname \| html %] [% patron.surname \| html %]</h1></legend>	94	<fieldset class="brief"><legend><h1>Change username and/or password for [% patron.firstname \| html %] [% patron.surname \| html %]</h1></legend>
		95	=======
		96	<fieldset class="brief"><h3>Change username and/or password for [% patron.firstname \| html %] [% patron.surname \| html %]</h3>
		97	>>>>>>> Bug 30952: Search bar
88	<ol>	98	<ol>
89	<li><label for="newuserid">New username:</label>	99	<li><label for="newuserid">New username:</label>
90	<input type="hidden" name="member" value="[% patron.borrowernumber \| html %]" /><input type="text" id="newuserid" name="newuserid" size="20" value="[% patron.userid \| html %]" /></li>	100	<input type="hidden" name="member" value="[% patron.borrowernumber \| html %]" /><input type="text" id="newuserid" name="newuserid" size="20" value="[% patron.userid \| html %]" /></li>
Lines 102-113 Link Here
102	<input name="newpassword2" id="newpassword2" type="password" size="20" />	112	<input name="newpassword2" id="newpassword2" type="password" size="20" />
103	</li>	113	</li>
104	</ol>	114	</ol>
105	</fieldset>
106	<fieldset class="action">	115	<fieldset class="action">
107	<input type="hidden" name="csrf_token" value="[% csrf_token \| html %]" />	116	<input type="hidden" name="csrf_token" value="[% csrf_token \| html %]" />
108	<input type="submit" value="Save" />	117	<input type="submit" class="principal" value="Save" />
109	<a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber \| html %]">Cancel</a>	118	<a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber \| html %]">Cancel</a>
110	</fieldset>	119	</fieldset>
		120	</fieldset>
111	</form>[% END %]	121	</form>[% END %]
112		122
113		123




          [% END %]

          <div id="searchresults">
<<<<<<< HEAD
=======
            <h3>Patrons found for: <span id="searchpattern">[% IF searchmember %] for '[% searchmember | html %]'[% END %]</span></h3>


>>>>>>> Bug 30952: Patrons Module
            [% IF CAN_user_tools_manage_patron_lists || CAN_user_borrowers_edit_borrowers %]
              <div class="searchheader fh-fixedHeader" id="searchheader" style="display:none;">
                  <div>


        <div class="col-sm-2 col-sm-pull-10">
            <aside>
<<<<<<< HEAD
                [% PROCESS patron_search_filters categories => categories, libraries => libraries, filters => ['search_field', 'search_type', 'category', 'branch'], search_filter => searchmember %]
=======
                <div id="filters">
                    <form method="get" id="searchform">
                        <input type="hidden" id="firstletter_filter" value="" />

                        </fieldset>
                    </form>
                </div>
>>>>>>> Bug 30952: Patrons Module
            </aside>
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
    </div> <!-- /.row -->




[% PROCESS 'member-alt-contact-style.inc' %]
[% SET footerjs = 1 %]
[% formulaire = BLOCK %]
    [% INCLUDE 'patron-search.inc' %]
[% END %]
[% INCLUDE 'doc-head-open.inc' %]
    <title>

        [% END %] &rsaquo; Patrons &rsaquo; Koha
    </title>
<style>
h3:hover {
    cursor: pointer;
}
</style>

</head>

<body id="pat_memberentrygen"s>
    [% INCLUDE 'header.inc' form= formulaire %]

    <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
        <ol>

                    [% INCLUDE 'noadd-warnings.inc' %]

                    [% UNLESS ( no_add ) %]
                        <h2>
                            [% IF ( opadd ) %]
                                Add patron
                            [% ELSIF ( opduplicate ) %]

                            [% END %]
                            [% INCLUDE 'patron-title.inc' %]
                            [% IF categoryname %]([% categoryname | html %])[% END %]
                        </h2>

                        [% IF quickadd && opadd && !check_member %]
                            <a href="#" class="toggle_quick_add"><i class="fa fa-plus-square"></i> Show full form</a>


                        [% UNLESS ( check_member ) %]
                            <div id="toolbar" class="btn-toolbar">
                            <div>
                                [% IF quickadd && opadd %]
                                    <button class="btn btn-default toggler principal" id="save_quick_add" name="save"><i class="fa fa-save"></i> Save</button>
                                [% END %]
                                <button class="btn btn-default toggler principal" id="saverecord" name="save" ><i class="fa fa-save"></i> Save</button>
                                [% IF opadd %]
                                    <a class="cancel" href="/cgi-bin/koha/members/member.pl" class="toggler save_entryform">
                                [% ELSE %]
                                    <a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | html %]">
                                [% END %]
                                    <i class="fa fa-times"></i> Cancel
                                </a>
                            </div></div>
                        [% END %]

                        <form name="form" id="entryform" action="/cgi-bin/koha/members/memberentry.pl" method="post" autocomplete="off" class="toggler">

                            [% IF ( step_1 ) %]
                                [% UNLESS notitle && nosurname && nofirstname && nodateofbirth && noinitials && noothernames &&nosex %]
                                    <fieldset class="rows" id="memberentry_identity">
                                        <h3 id="identity_lgd">[% IF ( I ) %]Organization [% ELSE %]Patron [% END %]identity</h3>
                                        <ol>
                                            [% UNLESS ( I ) %]
                                                [% UNLESS notitle %]

                                    [% SET possible_relationships = Koha.Preference('borrowerRelationship') %]
                                    <div id="memberentry_guarantor_anchor">
                                        <fieldset id="memberentry_guarantor" class="rows">
                                            <h3>Patron guarantor</h3>

                                            <div id="guarantor_relationships">
                                                [% FOREACH r IN relationships %]


                                    [% UNLESS nocontactname && nocontactfirstname && norelationship %]
                                        <fieldset class="rows" id="non_patron_guarantor">
                                            <h3>Non-patron guarantor</h3>
                                            <ol>
                                                [% UNLESS nocontactname %]
                                                    <li>


                                [% UNLESS nophone && nophonepro && nomobile && noemail && noemailpro && nofax %]
                                    <fieldset class="rows" id="memberentry_contact">
                                        <h3 id="contact_lgd">Contact information</h3>
                                        <ol>
                                            [% UNLESS nophone %]
                                                <li>

                            [% IF ( step_3 ) %]
                                [% SET autoMemberNum = Koha.Preference('autoMemberNum') %]
                                <fieldset class="rows" id="memberentry_library_management">
                                    <h3 id="library_management_lgd">Library management</h3>
                                    <ol>
                                        [% UNLESS nocardnumber %]
                                            <li>


                                [% UNLESS nodateenrolled &&  noopacnote && noborrowernotes %]
                                    <fieldset class="rows" id="memberentry_subscription">
                                        <h3 id="library_setup_lgd">Library setup</h3><ol>
                                        [% UNLESS nodateenrolled %]
                                            <li>
                                                [% IF ( mandatorydateenrolled ) %]


                                [% UNLESS nouserid && nopassword && !CanUpdatePasswordExpiration %]
                                    <fieldset class="rows" id="memberentry_userid">
                                        <h3 id="opac_staff_login_lgd">OPAC/Staff interface login</h3>
                                        <ol>
                                            [% UNLESS nouserid %]
                                                <li>

                                <!--this zones are not necessary in modif mode -->
                                [% UNLESS ( opadd || opduplicate ) %]
                                    <fieldset class="rows" id="memberentry_account_flags">
                                        <h3 id="account_flags_lgd">Patron account flags</h3>
                                        <ol class="radio">
                                            [% FOREACH flagloo IN flagloop %]
                                                <li>

                                    </fieldset> <!-- /#memberentry_account_flags -->

                                    <fieldset class="rows" id="memberentry_restrictions">
                                        <h3 id="restrictions_lgd">Patron restrictions</h3>
                                        [% IF ( debarments ) %]
                                            <table>
                                                <thead>

                                        [% END # /IF ( debarments ) %]

                                        [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
                                            <p><a href="#" id="add_manual_restriction"><i class="fa fa-plus"></i> Add manual restriction</a></p>
                                            <fieldset id="manual_restriction_form">
                                                <input type="hidden" id="add_debarment" name="add_debarment" value="0" />
                                                <h3 id="manual_restriction_lgd">Add manual restriction</h3>
                                                <ol>
                                                    <li>
                                                        <label for="debarred_comment">Comment: </label>

                            [% IF ( step_7 ) %]
                                [% IF Koha.Preference('HouseboundModule') %]
                                    <fieldset class="rows" id="memberentry_housebound_roles">
                                        <h3 id="housebound_roles">Housebound roles</h3>
                                        <ol class="radio">
                                            <li>
                                                <label class="radio" for="housebound_chooser">

                                [% IF Koha.Preference('ExtendedPatronAttributes') %]
                                    [% UNLESS ( no_patron_attribute_types ) %]
                                        <fieldset class="rows" id="memberentry_patron_attributes">
                                            <h3 id="patron_attributes_lgd">Additional attributes and identifiers</h3>
                                            <input type="hidden" name="setting_extended_patron_attributes" value="1" />
                                            [% FOREACH pa_loo IN patron_attributes %]
                                                <ol class="attributes_table">
                                                    [% IF pa_loo.class %]
                                                        <fieldset id="aai_[% pa_loo.class | html %]">
                                                        <h3 id="[% pa_loo.class | html %]_lgd">[% pa_loo.lib | html %]</h3>
                                                    [% END %]
                                                    [% FOREACH patron_attribute IN pa_loo.items %]
                                                        <li data-category_code="[% patron_attribute.category_code | html %]">

                                                                [% END %]
                                                            [% END # /IF ( patron_attribute.use_dropdown ) %]
                                                            <input type="hidden" id="[% patron_attribute.form_id | html %]_code" name="[% patron_attribute.form_id | html %]_code" value="[% patron_attribute.code | html %]" />
                                                            <a href="#" class="clear_attribute" id="lientype"><i class="fa fa-fw fa-trash"></i> Clear</a>
                                                            [% IF ( patron_attribute.repeatable ) %]
                                                                <a href="#" class="clone_attribute"><i class="fa fa-fw fa-plus"></i> New</a>
                                                            [% END %]

                            [% IF ( step_5 ) %]
                                [% IF ( EnhancedMessagingPreferences ) %]
                                    <fieldset class="rows" id="memberentry_messaging_prefs">
                                        <h3 id="patron_messaging_prefs_lgd">Patron messaging preferences</h3>
                                        <div id="messaging_prefs_loading" class="form-message" style="display:none">
                                            <img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" /> Loading new messaging defaults
                                        </div>


                        [% IF quickadd && opadd  && !check_member %]
                            <form id="quick_add_form" class="toggler">
                                <fieldset class="rows quick_add"><h3>Quick add</h3>
                                    <ol id="quick_add_list">
                                    </ol>
                                </fieldset>

        function showHideFields(){
            [% UNLESS step == 1 %]
                [% IF fieldstohide.match('identity') %]
                    $("#memberentry_identity").find('h3').nextAll().toggle();
                [% END %]
                [% IF show_guarantor || guarantor %]
                    [% IF fieldstohide.match('guarantor') %]
                        $("#memberentry_guarantor").find('h3').nextAll().toggle();
                        $("#guarantor_template").toggle();
                    [% END %]
                [% END %]
                [% IF fieldstohide.match('primary_address') %]
                    $("#memberentry_mainaddress").find('h3').nextAll().toggle();
                [% END %]
                [% IF fieldstohide.match('primary_contact') %]
                    $("#memberentry_contact").find('h3').nextAll().toggle();
                [% END %]
            [% END %]
            [% UNLESS step == 6 %]
                [% IF fieldstohide.match('alt_address') %]
                    $("#memberentry_address").find('h3').nextAll().toggle();
                [% END %]
            [% END %]
            [% UNLESS step == 2 %]
                [% IF fieldstohide.match('alt_contact') %]
                    $("#memberentry_altaddress").find('h3').nextAll().toggle();
                [% END %]
            [% END %]
            [% UNLESS step == 3 %]
                [% IF fieldstohide.match('lib_mgmt') %]
                        $("#memberentry_library_management").find('h3').nextAll().toggle();
                [% END %]
                [% UNLESS nodateenrolled && noopacnote && noborrowernotes %]
                    [% IF fieldstohide.match('lib_setup') %]
                        $("#memberentry_subscription").find('h3').nextAll().toggle();
                    [% END %]
                [% END %]
                [% UNLESS nouserid && nopassword %]
                    [% IF fieldstohide.match('login') %]
                        $("#memberentry_userid").find('h3').nextAll().toggle();
                    [% END %]
                [% END %]
                [% UNLESS ( opadd || opduplicate ) %]
                    [% IF fieldstohide.match('flags') %]
                        $("#memberentry_account_flags").find('h3').nextAll().toggle();
                    [% END %]
                [% END %]
                [% IF fieldstohide.match('debarments') %]
                    $("#memberentry_restrictions").find('h3').nextAll().toggle();
                [% END %]
            [% END %]
            [% UNLESS step == 7 %]
                [% IF Koha.Preference('HouseboundModule') %]
                    [% IF fieldstohide.match('housebound') %]
                        $("#memberentry_housebound_roles").find('h3').nextAll().toggle();
                    [% END %]
                [% END %]
            [% END %]
            [% UNLESS step == 4 %]
                [% IF Koha.Preference('ExtendedPatronAttributes') %]
                    [% IF fieldstohide.match('additional') %]
                        $("#memberentry_patron_attributes").find('h3').nextAll().toggle();
                    [% END %]
                [% END %]
            [% END %]
            [% UNLESS step == 5 %]
                [% IF Koha.Preference('EnhancedMessagingPreferences') %]
                    [% IF fieldstohide.match('messaging') %]
                        $("#memberentry_messaging_prefs").find('h3').nextAll().toggle();
                        $("#messaging_prefs_loading").toggle();
                    [% END %]
                [% END %]

                showHideFields();
            });

            $("h3").click(function(){
                $(this).nextAll().toggle();
                $("#messaging_prefs_loading").hide();
                $("#guarantor_template").hide();

Lines 6-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt (-1 / +7 lines)
6	[% USE KohaDates %]	6	[% USE KohaDates %]
7	[% SET footerjs = 1 %]	7	[% SET footerjs = 1 %]
8	[% formulaire = BLOCK %]	8	[% formulaire = BLOCK %]
9	[% INCLUDE 'patron-search-header.inc' %]	9	[% INCLUDE 'patron-search.inc' %]
10	[% END %]	10	[% END %]
11	[% INCLUDE 'doc-head-open.inc' %]	11	[% INCLUDE 'doc-head-open.inc' %]
12	<title>Update patron records &rsaquo; Patrons &rsaquo; Koha</title>	12	<title>Update patron records &rsaquo; Patrons &rsaquo; Koha</title>
Lines 104-109 Link Here
104	</a>	104	</a>
105	</li>	105	</li>
106	</ol>	106	</ol>
		107	<ol>
		108	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		109	</ol>
		110	<ol>
		111	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		112	</ol>
107	</nav>	113	</nav>
108		114
109	<div class="main container-fluid">	115	<div class="main container-fluid">

Lines 5-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt (-6 / +12 lines)
5	[% USE KohaDates %]	5	[% USE KohaDates %]
6	[% SET footerjs = 1 %]	6	[% SET footerjs = 1 %]
7	[% formulaire = BLOCK %]	7	[% formulaire = BLOCK %]
8	[% INCLUDE 'patron-search-header.inc' %]	8	[% INCLUDE 'patron-search.inc' %]
9	[% END %]	9	[% END %]
10	[% INCLUDE 'doc-head-open.inc' %]	10	[% INCLUDE 'doc-head-open.inc' %]
11	<title>Merge patron records &rsaquo; Patrons &rsaquo; Koha</title>	11	<title>Merge patron records &rsaquo; Patrons &rsaquo; Koha</title>
Lines 48-54 Link Here
48	</style>	48	</style>
49	[% END %]	49	[% END %]
50	</head>	50	</head>
51	<body id="pat_merge" class="pat">	51	<body id="pat_merge">
52	[% INCLUDE 'header.inc' form=formulaire %]	52	[% INCLUDE 'header.inc' form=formulaire %]
53		53
54	[% BLOCK display_names %]	54	[% BLOCK display_names %]
Lines 93-111 Link Here
93	<a href="#" aria-current="page">Merge patron records</a>	93	<a href="#" aria-current="page">Merge patron records</a>
94	</li>	94	</li>
95	</ol>	95	</ol>
		96	<ol>
		97	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		98	</ol>
		99	<ol>
		100	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		101	</ol>
96	</nav>	102	</nav>
97		103
98	<div class="main container-fluid">	104	<div class="main container-fluid">
99	<div class="row">	105	<div class="row">
100	<div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">	106	<div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
101	<h1>Merge patron records</h1>	107	<h2>Merge patron records</h2>
102		108
103	[% IF action == 'show' %]	109	[% IF action == 'show' %]
104	[% IF patrons.count > 1 %]	110	[% IF patrons.count > 1 %]
105	[% IF ( patrons.count == 2 ) %]	111	[% IF ( patrons.count == 2 ) %]
106	<div id="toolbar" class="btn-toolbar">	112	<div id="toolbar" class="btn-toolbar">
107	<div class="btn-group">	113	<div class="btn-group">
108	<button class="btn btn-default" id="compare_patrons">	114	<button class="btn btn-default pat" id="compare_patrons">
109	<i class="fa fa-arrows-h"></i> Compare patrons	115	<i class="fa fa-arrows-h"></i> Compare patrons
110	</button>	116	</button>
111	</div>	117	</div>
Lines 156-162 Link Here
156	<input type="hidden" name="id" value="[% p.id \| html %]" />	162	<input type="hidden" name="id" value="[% p.id \| html %]" />
157	[% END %]	163	[% END %]
158	<input type="hidden" name="action" value="merge" />	164	<input type="hidden" name="action" value="merge" />
159	<input id="merge-patrons" type="submit" value="Merge patrons" />	165	<input id="merge-patrons" class="principal" type="submit" value="Merge patrons" />
160	</fieldset>	166	</fieldset>
161		167
162	[% ELSE %]	168	[% ELSE %]
Lines 199-205 Link Here
199	[% END %]	205	[% END %]
200		206
201	[% UNLESS error %]	207	[% UNLESS error %]
202	<a class="btn btn-default" href="moremember.pl?borrowernumber=[% keeper.id \| html %]">View patron record</a>	208	<a class="btn btn-default" href="moremember.pl?borrowernumber=[% keeper.id \| html %]" id="lientype">View patron record</a>
203	[% END %]	209	[% END %]
204	[% END %]	210	[% END %]
205	</div>	211	</div>




[% PROCESS 'member-display-alt-address-style.inc' %]
[% SET footerjs = 1 %]
[% formulaire = BLOCK %]
    [% INCLUDE 'patron-search.inc' %]
[% END %]
[% INCLUDE 'doc-head-open.inc' %]
[% Asset.css("lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css") | $raw %]

                        </div>
                    [% END %]

                    <div>

                        <h2>
                            [% UNLESS ( I ) %]
                                [% patron.title | html %] [% patron.firstname | html %]
                            [% END %]
                            [% patron.surname | html %] ([% patron.cardnumber | html %])
                        </h2>

                        <fieldset id="searchresults">
                            [% IF ( was_renewed ) %]
                            <div class="dialog message">
                                Patron's account has been renewed until [% patron.dateexpiry | $KohaDates %]
                            </div>
                            [% END %]

                            <div id="patron_messages" class="circmessage attention">
                                [% INCLUDE 'patron_messages.inc' %]
                            </div>
                        </fieldset>

                        <h1>
                            [% UNLESS ( I ) %]

                            [% patron.surname | html %] ([% patron.cardnumber | html %])
                        </h1>
                        <div class="col-sm-6">
                            <fieldset class="rows">

                            <div id="patron-information" class="patroninfo-section">

                                <div class="patroninfo-heading">
                                    <h3>Contact information</h3>
                                    [% IF ( guarantor.borrowernumber ) %]
                                        <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber | html %]&amp;step=1&amp;guarantorid=[% guarantor.borrowernumber | html %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a>
                                    [% ELSE %]
                                        <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber | html %]&amp;step=1" id="lientype"><i class="fa fa-pencil"></i> Edit</a>
                                    [% END %]
                                </div>


                                </div> [% # /div.rows %]
                            </div> [% # /div#patron-information %]

                            [% IF ( patronimages ) %]
                                [% IF ( CAN_user_tools_batch_upload_patron_images ) %]
                                    <div id="manage-patron-image" class="patroninfo-section">
                                        [% IF ( patron.image ) %]
                                            <div class="patroninfo-heading">
                                                <h3>Manage patron image</h3>
                                                <a class="btn btn-default btn-xs" id="show-picture-upload" href="#" id="lientype"><i class="fa fa-pencil"></i> Edit</a>
                                            </div>
                                        [% ELSE %]
                                            <div class="patroninfo-heading">
                                                <h3>Upload patron image</h3>
                                                <a class="btn btn-default btn-xs" id="show-picture-upload" href="#"><i class="fa fa-plus"></i> Add</a>
                                            </div>
                                        [% END %]
                                        <form method="post" id="picture-upload" style="display:none;" action="/cgi-bin/koha/tools/picture-upload.pl" enctype="multipart/form-data">
                                            [% IF ( patron.image ) %]
                                                <div class="hint">To update the image for [% patron.title | html %] [% patron.firstname | html %] [% patron.surname | html %], select a new image file and click 'Upload.' <br />Click the 'Delete' button to remove the current image.</div>
                                            [% ELSE %]
                                                <div class="hint">[% patron.title | html %] [% patron.firstname | html %] [% patron.surname | html %] does not currently have an image available. To import an image for [% patron.title | html %] [% patron.firstname | html %] [% patron.surname | html %], enter the name of an image file to upload.</div>
                                            [% END %]
                                            <p>Only PNG, GIF, JPEG, XPM formats are supported. Maximum image size is 2MB.</p>
                                            <label for="uploadfile">Select the file to upload: </label>
                                            <input type="file" id="uploadfile" name="uploadfile" required="required" />
                                            <div class="action">
                                                <input type="hidden" name="csrf_token" value="[% csrf_token | html %]" />
                                                <input type="hidden" id="image" name="filetype" value="image" />
                                                <input type="hidden" id="cardnumber" name="cardnumber" value="[% patron.cardnumber | html %]" />
                                                <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
                                                <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-upload"></i> Upload</button>
                                                <input name="op" type="hidden" value="Upload" />
                                                [% IF ( patron.image ) %]
                                                    <a id="delpicture" href="/cgi-bin/koha/tools/picture-upload.pl?op=Delete&amp;borrowernumber=[% patron.borrowernumber | html %]&amp;csrf_token=[% csrf_token | html %]" class="btn btn-default btn-xs delete"><i class="fa fa-trash"></i> Delete</a>
                                                [% END %]
                                                <a href="#" id="cancel-picture-upload" class="cancel">Cancel</a>
                                            </div>
                                        </form>
                                    </div> [% # /div#manage-patron-image %]
                                [% END %]
                            [% END %]

                            [% IF Koha.Preference('HouseboundModule') %]
                                <div id="houseboundroles" class="patroninfo-section">
                                    [% IF ( housebound_role.housebound_chooser == 1 OR housebound_role.housebound_deliverer == 1 ) %]
                                        <div class="patroninfo-heading">
                                            <h3>Housebound roles</h3>
                                            <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber | html %]&amp;step=7" id="lientype"><i class="fa fa-pencil"></i> Edit</a>
                                        </div>
                                        <div class="rows">
                                            <ol>

                                    [% ELSE %]
                                        <div class="patroninfo-heading">
                                            <h3>Housebound roles</h3>
                                            <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber | html %]&amp;step=7" id="lientype"><i class="fa fa-plus"></i> Add</a>
                                        </div>
                                    [% END %]
                                </div> [% #/ div#houseboundroles %]

                                        [% IF ( attributes_loop ) %]
                                            <div class="patroninfo-heading">
                                                <h3>Additional attributes and identifiers</h3>
                                                <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber | html %]&amp;step=4" id="lientype"><i class="fa fa-pencil"></i> Edit</a>
                                            </div>
                                            [% FOREACH attribute IN attributes_loop %]
                                                [% IF attribute.class %]

                                        [% ELSE %]
                                            <div class="patroninfo-heading">
                                                <h3>Additional attributes and identifiers</h3>
                                                <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber | html %]&amp;step=4" id="lientype"><i class="fa fa-plus"></i> Add</a>
                                            </div>
                                        [% END %]
                                    </div> [% # /div#patron-extended-attributes %]

                                <div id="patron-messaging-prefs" class="patroninfo-section">
                                    <div class="patroninfo-heading">
                                        <h3>Patron messaging preferences</h3>
                                        <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber | html %]&amp;step=5" id="lientype"><i class="fa fa-pencil"></i> Edit</a>
                                    </div>
                                    [% INCLUDE 'messaging-preference-form.inc' %]
                                    [% IF Koha.Preference('SMSSendDriver') %]

                                    [% END %]
                                </div> [% # /div#patron-messaging-prefs %]
                            [% END %]
                            </fieldset>
                        </div> <!-- /.col-sm-6 -->

                        <div class="col-sm-6">
                        <fieldset class="rows">
                            <div id="patron-library-details" class="patroninfo-section">
                                <div class="patroninfo-heading">
                                    <h3>Library use</h3>
                                    <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber | html %]&amp;step=3" id="lientype"><i class="fa fa-pencil"></i> Edit</a>
                                </div>
                                <div class="rows">
                                    <ol>

                                                <span class="blocker">
                                                    [% patron.dateexpiry | $KohaDates %]
                                                    <strong><em>Expired</em></strong>
                                                    <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber | html %]" id="lientype">Edit details</a>
                                                </span>
                                            [% ELSIF ( patron.is_going_to_expire ) %]
                                                [% patron.dateexpiry | $KohaDates %]
                                                <strong><em>Patron expires soon</em></strong>
                                                <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber | html %]" id="lientype">Edit details</a>
                                            [% ELSE %]
                                                [% patron.dateexpiry | $KohaDates %]
                                            [% END %]

                                [% IF ( patron.B_phone || patron.B_email || patron.contactnote || patron.B_address || patron.B_address2 || patron.B_city || patron.B_zipcode || patron.B_country ) %]
                                    <div class="patroninfo-heading">
                                        <h3>Alternate address</h3>
                                        <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber | html %]&amp;step=6" id="lientype"><i class="fa fa-pencil"></i> Edit</a>
                                    </div>
                                    <div class="address">
                                        <ul>

                                [% ELSE %]
                                    <div class="patroninfo-heading">
                                      <h3 class="inline">Alternate address</h3>
                                        <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber | html %]&amp;step=6" id="lientype"><i class="fa fa-plus"></i> Add</a>
                                    </div>
                                [% END %]
                            </div> [% # /div#patron-alternate-address %]

                                [% IF ( patron.altcontactsurname || patron.altcontactfirstname || patron.altcontactaddress1 || patron.altcontactaddress2 || patron.altcontactaddress3 || patron.altcontactstate || patron.altcontactzipcode || patron.altcontactcountry || patron.altcontactphone ) %]
                                    <div class="patroninfo-heading">
                                        <h3>Alternative contact</h3>
                                        <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber | html %]&amp;step=2" id="lientype"><i class="fa fa-pencil"></i> Edit</a>
                                    </div>
                                    <div class="rows">
                                        <ol>

                                [% ELSE %]
                                    <div class="patroninfo-heading">
                                        <h3>Alternative contact</h3>
                                        <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber | html %]&amp;step=2" id="lientype"><i class="fa fa-plus"></i> Add</a>
                                    </div>
                                [% END %]
                            </div> [% # /div#patron-alternative-contact %]

                                <div id="patron-files" class="patroninfo-section">
                                    <div class="patroninfo-heading">
                                        <h3>Files</h3>
                                        <a class="btn btn-default btn-xs" href="/cgi-bin/koha/members/files.pl?borrowernumber=[% patron.borrowernumber | uri %]" id="lientype"><i class="fa fa-list"></i> Manage</a>

                                        [% IF ( files ) %]
                                            <div class="rows">

                                    </div> <!-- /.patroninfo-heading -->
                                </div> <!-- /#patron-files -->
                            [% END # /IF EnableBorrowerFiles %]
                            </fieldset>

                        </div> <!-- /div.col-sm-6 -->
                    </div> <!-- /div.row -->

                    <fieldset id="finesholdsissues" class="toptabs">
                    <fieldset id="searchresultst">
                        <ul>
                            <li>
                                <a href="#checkouts">Checkouts ([% issuecount || 0 | html %])</a>

                                            <fieldset class="action">
                                                <input type="hidden" name="from" value="borrower" />
                                                <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
                                                <input type="submit" class="principal" value="Suspend all holds" />

                                                [% IF Koha.Preference('AutoResumeSuspendedHolds') %]
                                                    <label for="suspend_until">until</label>

                                                <input type="hidden" name="from" value="borrower" />
                                                <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
                                                <input type="hidden" name="suspend" value="0" />
                                                <input type="submit" class="principal" value="Resume all suspended holds" />
                                            </fieldset>
                                        </form>
                                    [% END # IF SuspendHoldsIntranet %]

                        [% IF Koha.Preference('ArticleRequests') %]
                            [% INCLUDE 'patron-article-requests.inc' %]
                        [% END %]
                    </fieldset>
                    </fieldset> <!-- /div#finesholdsissues -->
                </main>
            </div> <!-- /.col-sm-10.col-sm-push-2 -->


                for (var i=0;i < Nodes.length;i++){
                    if (Nodes[i].nodeName=="INPUT" && Nodes[i].getAttribute("type")=="checkbox"){
                        Nodes[i].checked=false;
       view_restrictions             }
                }
            } else {
                var Node=me.parentNode.nextSibling;

Lines 6-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt (-3 / +11 lines)
6	[% USE KohaDates %]	6	[% USE KohaDates %]
7	[% SET footerjs = 1 %]	7	[% SET footerjs = 1 %]
8	[% formulaire = BLOCK %]	8	[% formulaire = BLOCK %]
9	[% INCLUDE 'patron-search-header.inc' %]	9	[% INCLUDE 'patron-search.inc' %]
10	[% END %]	10	[% END %]
11	[% INCLUDE 'doc-head-open.inc' %]	11	[% INCLUDE 'doc-head-open.inc' %]
12	<title>Sent notices for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>	12	<title>Sent notices for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>
Lines 16-22 Link Here
16	</style>	16	</style>
17	</head>	17	</head>
18		18
19	<body id="pat_notices" class="pat">	19	<body id="pat_notices">
20	[% INCLUDE 'header.inc' form=formulaire %]	20	[% INCLUDE 'header.inc' form=formulaire %]
21		21
22	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	22	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
Lines 33-38 Link Here
33	</a>	33	</a>
34	</li>	34	</li>
35	</ol>	35	</ol>
		36	<ol>
		37	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		38	</ol>
		39	<ol>
		40	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		41	</ol>
36	</nav>	42	</nav>
37		43
38	<div class="main container-fluid">	44	<div class="main container-fluid">
Lines 41-48 Link Here
41	<main>	47	<main>
42		48
43	[% INCLUDE 'members-toolbar.inc' %]	49	[% INCLUDE 'members-toolbar.inc' %]
44	<h1>Sent notices for [% INCLUDE 'patron-title.inc' %]</h1>	50	<h2>Sent notices for [% INCLUDE 'patron-title.inc' %]</h2>
45		51
		52	<div id="searchresults">
46	[% IF ( QUEUED_MESSAGES ) %]	53	[% IF ( QUEUED_MESSAGES ) %]
47	<table id="noticestable">	54	<table id="noticestable">
48	<thead>	55	<thead>
Lines 109-114 Link Here
109	[% ELSE %]	116	[% ELSE %]
110	<div class="dialog message">There is no record of any messages that have been sent to this patron.</div>	117	<div class="dialog message">There is no record of any messages that have been sent to this patron.</div>
111	[% END %]	118	[% END %]
		119	</div>
112		120
113	</main>	121	</main>
114	</div> <!-- /.col-sm-10.col-sm-push-2 -->	122	</div> <!-- /.col-sm-10.col-sm-push-2 -->

Lines 8-14 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt (-2 / +8 lines)
8	[% USE KohaDates %]	8	[% USE KohaDates %]
9	[% SET footerjs = 1 %]	9	[% SET footerjs = 1 %]
10	[% formulaire = BLOCK %]	10	[% formulaire = BLOCK %]
11	[% INCLUDE 'patron-search-header.inc' %]	11	[% INCLUDE 'patron-search.inc' %]
12	[% END %]	12	[% END %]
13	[% PROCESS 'accounts.inc' %]	13	[% PROCESS 'accounts.inc' %]
14	[% INCLUDE 'doc-head-open.inc' %]	14	[% INCLUDE 'doc-head-open.inc' %]
Lines 16-22 Link Here
16	[% INCLUDE 'doc-head-close.inc' %]	16	[% INCLUDE 'doc-head-close.inc' %]
17	</head>	17	</head>
18		18
19	<body id="pat_pay" class="pat">	19	<body id="pat_pay">
20	[% INCLUDE 'header.inc' form=formulaire %]	20	[% INCLUDE 'header.inc' form=formulaire %]
21		21
22	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	22	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
Lines 33-38 Link Here
33	</a>	33	</a>
34	</li>	34	</li>
35	</ol>	35	</ol>
		36	<ol>
		37	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		38	</ol>
		39	<ol>
		40	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		41	</ol>
36	</nav>	42	</nav>
37		43
38	<div class="main container-fluid">	44	<div class="main container-fluid">

Lines 6-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt (-2 / +8 lines)
6	[% USE Price %]	6	[% USE Price %]
7	[% SET footerjs = 1 %]	7	[% SET footerjs = 1 %]
8	[% formulaire = BLOCK %]	8	[% formulaire = BLOCK %]
9	[% INCLUDE 'patron-search-header.inc' %]	9	[% INCLUDE 'patron-search.inc' %]
10	[% END %]	10	[% END %]
11	[% PROCESS 'accounts.inc' %]	11	[% PROCESS 'accounts.inc' %]
12	[% INCLUDE 'doc-head-open.inc' %]	12	[% INCLUDE 'doc-head-open.inc' %]
Lines 35-41 Link Here
35	</head>	35	</head>
36		36
37	<body id="pat_paycollect" class="pat">	37	<body id="pat_paycollect" class="pat">
38	[% INCLUDE 'header.inc' form=formulaire %]	38	[% INCLUDE 'header.inc' form=formulaire %]
39		39
40	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	40	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
41	<ol>	41	<ol>
Lines 68-73 Link Here
68	</a>	68	</a>
69	</li>	69	</li>
70	</ol>	70	</ol>
		71	<ol>
		72	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		73	</ol>
		74	<ol>
		75	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		76	</ol>
71	</nav>	77	</nav>
72		78
73	<div class="main container-fluid">	79	<div class="main container-fluid">




[% USE Branches %]
[% SET footerjs = 1 %]
[% formulaire = BLOCK %]
    [% INCLUDE 'patron-search.inc' %]
[% END %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Purchase suggestions for [% INCLUDE 'patron-title.inc' no_html = 1 %] &rsaquo; Patrons &rsaquo; Koha</title>
[% INCLUDE 'doc-head-close.inc' %]
</head>

<body id="pat_purchase_suggestions">
[% INCLUDE 'header.inc' form=formulaire %]

<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">

            </a>
        </li>
    </ol>
        <ol>
            [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
        </ol>
        <ol>
            <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
        </ol>
</nav>

<div class="main container-fluid">

            <main>

                [% INCLUDE 'members-toolbar.inc' %]
                <h1>Purchase suggestions</h1>

                <div id="toolbar" class="btn-toolbar">
                    <div>
                        <a class="pat" id="newsuggestion" href="/cgi-bin/koha/suggestion/suggestion.pl?op=add&amp;suggestedby=[% patron.borrowernumber | html %]&amp;redirect=purchase_suggestions&amp;borrowernumber=[% patron.borrowernumber | html %]"><i class="fa fa-plus"></i> New purchase suggestion</a>
                    </div>
                </div>

                <h2>Purchase suggestions</h2>

                [% IF suggestions %]
                  <table id="suggestions">
                    <thead>




[% USE TablesSettings %]
[% SET footerjs = 1 %]
[% formulaire = BLOCK %]
    [% INCLUDE 'patron-search.inc' %]
[% END %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Circulation history for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>
[% INCLUDE 'doc-head-close.inc' %]
</head>

<body id="pat_readingrec">
[% INCLUDE 'header.inc' form=formulaire %]

<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">

            </a>
        </li>
    </ol>
        <ol>
            [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
        </ol>
        <ol>
            <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
        </ol>
</nav>

<div class="main container-fluid">

            <main>

[% INCLUDE 'members-toolbar.inc' %]
<h2>Circulation history</h2>

[% UNLESS Koha.Preference('intranetreadinghistory') %]
    <div class="dialog alert">Staff members are not allowed to access patron's checkout history</div>




[% USE Branches %]
[% SET footerjs = 1 %]
[% formulaire = BLOCK %]
    [% INCLUDE 'patron-search.inc' %]
[% END %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Subscription routing lists for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>
[% INCLUDE 'doc-head-close.inc' %]
</head>

<body id="pat_routing_lists">
[% INCLUDE 'header.inc' form=formulaire %]

<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">

            </a>
        </li>
    </ol>
        <ol>
            [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
        </ol>
        <ol>
            <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
        </ol>
</nav>

<div class="main container-fluid">

                <h1>Subscription routing lists for [% INCLUDE 'patron-title.inc' %]</h1>
<!-- Search Bar -->
<p class="tip">Search subscriptions:</p>
<form action="/cgi-bin/koha/serials/serials-search.pl" method="get">[% IF ( routing ) %]<input type="hidden" name="routing" value="[% routing | html %]" />[% END %]<input type="hidden" name="searched" value="1" /> <label for="ISSN_filter">ISSN:</label> <input type="text" size="10" maxlength="11" name="ISSN_filter" id="ISSN_filter" value="[% ISSN_filter | html %]" /> <label for="title_filter">Title:</label> <input type="text" size="20" maxlength="40" name="title_filter" id="title_filter" value="[% title_filter | html %]" /><input type="submit" value="Search" class="principal" />
</form>
<!-- Search Bar End -->


Lines 5-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt (-4 / +10 lines)
5	[% USE Branches %]	5	[% USE Branches %]
6	[% SET footerjs = 1 %]	6	[% SET footerjs = 1 %]
7	[% formulaire = BLOCK %]	7	[% formulaire = BLOCK %]
8	[% INCLUDE 'patron-search-header.inc' %]	8	[% INCLUDE 'patron-search.inc' %]
9	[% END %]	9	[% END %]
10	[% INCLUDE 'doc-head-open.inc' %]	10	[% INCLUDE 'doc-head-open.inc' %]
11	<title>	11	<title>
Lines 16-23 Link Here
16	[% INCLUDE 'doc-head-close.inc' %]	16	[% INCLUDE 'doc-head-close.inc' %]
17	</head>	17	</head>
18		18
19	<body id="pat_statistics" class="pat">	19	<body id="pat_statistics">
20	[% INCLUDE 'header.inc' form=formulaire %]	20	[% INCLUDE 'header.inc' %]
21		21
22	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	22	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
23	<ol>	23	<ol>
Lines 44-49 Link Here
44	</li>	44	</li>
45	[% END %]	45	[% END %]
46	</ol>	46	</ol>
		47	<ol>
		48	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		49	</ol>
		50	<ol>
		51	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		52	</ol>
47	</nav>	53	</nav>
48		54
49	<div class="main container-fluid">	55	<div class="main container-fluid">
Lines 53-59 Link Here
53		59
54	[% INCLUDE 'members-toolbar.inc' %]	60	[% INCLUDE 'members-toolbar.inc' %]
55		61
56	<h1>Statistics for [% INCLUDE 'patron-title.inc' %]</h1>	62	<h2>Statistics for [% INCLUDE 'patron-title.inc' %]</h2>
57	[% IF ( datas.size ) %]	63	[% IF ( datas.size ) %]
58	<table id="statistics">	64	<table id="statistics">
59	<thead>	65	<thead>

Lines 1-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt (-2 / +10 lines)
1	[% INCLUDE 'doc-head-open.inc' %]	1	[% INCLUDE 'doc-head-open.inc' %]
2	<title>Add offline circulations to queue &rsaquo; Circulation &rsaquo; Koha</title>	2	<title>Add offline circulations to queue &rsaquo; Circulation &rsaquo; Koha</title>
3	[% INCLUDE 'doc-head-close.inc' %]	3	[% INCLUDE 'doc-head-close.inc' %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'circ-search.inc' %]
		6	[% END %]
4	</head>	7	</head>
5	<body id="ocirc_enqueue_koc" class="circ ocirc">	8	<body id="ocirc_enqueue_koc" class="circ ocirc">
6	[% INCLUDE 'header.inc' %]	9	[% INCLUDE 'header.inc' form = formulaire %]
7	[% INCLUDE 'circ-search.inc' %]
8		10
9	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	11	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
10	<ol>	12	<ol>
Lines 18-23 Link Here
18	<a href="#" aria-current="page">Add offline circulations to queue</a>	20	<a href="#" aria-current="page">Add offline circulations to queue</a>
19	</li>	21	</li>
20	</ol>	22	</ol>
		23	<ol>
		24	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		25	</ol>
		26	<ol>
		27	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		28	</ol>
21	</nav>	29	</nav>
22		30
23	<div class="main container-fluid">	31	<div class="main container-fluid">

Lines 1-14 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt (-2 / +10 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'circ-search.inc' %]
		6	[% END %]
4	[% INCLUDE "doc-head-open.inc" %]	7	[% INCLUDE "doc-head-open.inc" %]
5	<title>Offline circulation &rsaquo; Circulation &rsaquo; Koha</title>	8	<title>Offline circulation &rsaquo; Circulation &rsaquo; Koha</title>
6	[% INCLUDE "doc-head-close.inc" %]	9	[% INCLUDE "doc-head-close.inc" %]
7	</head>	10	</head>
8		11
9	<body id="ocirc_list" class="circ ocirc">	12	<body id="ocirc_list" class="circ ocirc">
10	[% INCLUDE 'header.inc' %]	13	[% INCLUDE 'header.inc' form = formulaire %]
11	[% INCLUDE 'circ-search.inc' %]
12		14
13	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	15	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
14	<ol>	16	<ol>
Lines 24-29 Link Here
24	</a>	26	</a>
25	</li>	27	</li>
26	</ol>	28	</ol>
		29	<ol>
		30	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		31	</ol>
		32	<ol>
		33	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		34	</ol>
27	</nav>	35	</nav>
28		36
29	<div class="main container-fluid">	37	<div class="main container-fluid">

Lines 1-14 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt (-5 / +13 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'circ-search.inc' %]
		6	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
5	<title>Offline circulation file upload &rsaquo; Circulation &rsaquo; Koha</title>	8	<title>Offline circulation file upload &rsaquo; Circulation &rsaquo; Koha</title>
6	[% INCLUDE 'doc-head-close.inc' %]	9	[% INCLUDE 'doc-head-close.inc' %]
7	</head>	10	</head>
8		11
9	<body id="ocirc_process_koc" class="circ ocirc">	12	<body id="ocirc_process_koc" class="circ ocirc">
10	[% INCLUDE 'header.inc' %]	13	[% INCLUDE 'header.inc' form = formulaire %]
11	[% INCLUDE 'circ-search.inc' %]
12		14
13	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	15	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
14	<ol>	16	<ol>
Lines 36-41 Link Here
36	</li>	38	</li>
37	[% END %]	39	[% END %]
38	</ol>	40	</ol>
		41	<ol>
		42	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		43	</ol>
		44	<ol>
		45	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		46	</ol>
39	</nav>	47	</nav>
40		48
41	<div class="main container-fluid">	49	<div class="main container-fluid">
Lines 67-73 Link Here
67	<input class="required" required="required" type="file" id="fileToUpload" size="50" name="fileToUpload" />	75	<input class="required" required="required" type="file" id="fileToUpload" size="50" name="fileToUpload" />
68	<span class="required">Required</span>	76	<span class="required">Required</span>
69	</li></ol>	77	</li></ol>
70	<fieldset class="action"><input type="button" class="submit" value="Upload file" id="upload_file" /></fieldset>	78	<fieldset class="action"><input type="button" id="principal" class="submit" value="Upload file" id="upload_file" /></fieldset>
71	</fieldset>	79	</fieldset>
72	</form>	80	</form>
73	<div id="fileuploadstatus" class="progress_panel" style="display:none">Upload progress: <progress id="fileuploadprogress" max="100" value="0"></progress> <span class="fileuploadpercent">0</span>%</div>	81	<div id="fileuploadstatus" class="progress_panel" style="display:none">Upload progress: <progress id="fileuploadprogress" max="100" value="0"></progress> <span class="fileuploadpercent">0</span>%</div>
Lines 76-89 Link Here
76		84
77	<form action="enqueue_koc.pl" id="processfile" method="post" enctype="multipart/form-data">	85	<form action="enqueue_koc.pl" id="processfile" method="post" enctype="multipart/form-data">
78	<input type="hidden" name="uploadedfileid" id="uploadedfileid" value="" />	86	<input type="hidden" name="uploadedfileid" id="uploadedfileid" value="" />
79	<input type="submit" value="Add to offline circulation queue" id="queueformsubmit" />	87	<input type="submit" class="principal" value="Add to offline circulation queue" id="queueformsubmit" />
80	</form>	88	</form>
81		89
82	<form action="process_koc.pl" id="enqueuefile" method="post" enctype="multipart/form-data">	90	<form action="process_koc.pl" id="enqueuefile" method="post" enctype="multipart/form-data">
83	<input type="hidden" name="uploadedfileid" id="uploadedfileid" value="" />	91	<input type="hidden" name="uploadedfileid" id="uploadedfileid" value="" />
84	<input type="hidden" name="runinbackground" id="runinbackground" value="" />	92	<input type="hidden" name="runinbackground" id="runinbackground" value="" />
85	<input type="hidden" name="completedJobID" id="completedJobID" value="" />	93	<input type="hidden" name="completedJobID" id="completedJobID" value="" />
86	<!-- <input type="submit" value="Apply directly" id="mainformsubmit" /> -->	94	<!-- <input class="principal" type="submit" value="Apply directly" id="mainformsubmit" /> -->
87	<!-- FIXME: Job freezes when submitted, disabling button as a temporary mitigation -->	95	<!-- FIXME: Job freezes when submitted, disabling button as a temporary mitigation -->
88	<div id="jobstatus" style="display:none">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div>	96	<div id="jobstatus" style="display:none">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div>
89	<div id="jobfailed" style="display:none"></div>	97	<div id="jobfailed" style="display:none"></div>

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt (-12 / +20 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'circ-search.inc' %]
		6	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
5	<title>	8	<title>
6	[% IF list.patron_list_id %]	9	[% IF list.patron_list_id %]
Lines 12-19 Link Here
12	[% INCLUDE 'doc-head-close.inc' %]	15	[% INCLUDE 'doc-head-close.inc' %]
13	</head>	16	</head>
14		17
15	<body id="patlist_add_modify" class="pat patlist">	18	<body id="patlist_add_modify" class="patlist">
16	[% INCLUDE 'header.inc' %]	19	[% INCLUDE 'header.inc' form = formulaire %]
17		20
18	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	21	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
19	<ol>	22	<ol>
Lines 36-69 Link Here
36	</a>	39	</a>
37	</li>	40	</li>
38	</ol>	41	</ol>
		42	<ol>
		43	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		44	</ol>
		45	<ol>
		46	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		47	</ol>
39	</nav>	48	</nav>
40		49
41		50
42	<div class="container-fluid">	51	<div class="container-fluid">
43	<div class="row">	52	<div class="row">
44	<div class="col-sm-6 col-sm-offset-3 col-md-6 col-md-offset-3">	53	<div class="col-sm-6 col-sm-offset-3 col-md-6 col-md-offset-3">
45	<h1>	54	<h2>
46	[% IF list.patron_list_id %]	55	[% IF list.patron_list_id %]
47	Modify patron list	56	Modify patron list
48	[% ELSE %]	57	[% ELSE %]
49	New patron list	58	New patron list
50	[% END %]	59	[% END %]
51	</h1>	60	</h2>
52		61
53	<form method="post" action="/cgi-bin/koha/patron_lists/add-modify.pl" class="validated">	62	<form method="post" action="/cgi-bin/koha/patron_lists/add-modify.pl" class="validated">
54	<fieldset class="rows">	63	<fieldset class="rows">
55		64
56	<legend>	65	<h3>
57	[% IF list.patron_list_id %]	66	[% IF list.patron_list_id %]
58	Modify patron list	67	Modify patron list
59	[% ELSE %]	68	[% ELSE %]
60	Create a new patron list	69	Create a new patron list
61	[% END %]	70	[% END %]
62	</legend>	71	</h3>
63		72
64	<ol>	73	<ol>
65	<li>	74	<li>
66	<label class="required" for="list-name">Name:</label>	75	<label class="req[% formulaire = BLOCK %]
		76	[% INCLUDE 'circ-search.inc' %]
		77	[% END %]uired" for="list-name">Name:</label>
67	<input id="list-name" name="name" type="text" class="required" required="required" value="[% list.name \| html %]" />	78	<input id="list-name" name="name" type="text" class="required" required="required" value="[% list.name \| html %]" />
68	</li>	79	</li>
69		80
Lines 77-91 Link Here
77	</li>	88	</li>
78		89
79	<li>	90	<li>
80	<span class="label">Owner: </span>[% logged_in_user.userid \| html %]	91	<label>Owner: </label>[% logged_in_user.userid \| html %]
81	</li>	92	</li>
82	</ol>	93	</ol>
83		94
84	</fieldset>
85
86	<fieldset class="action">
87	<input type="hidden" name="patron_list_id" value="[% list.patron_list_id \| html %]" />	95	<input type="hidden" name="patron_list_id" value="[% list.patron_list_id \| html %]" />
88	<input type="submit" value="Save" />	96	<button type="submit" id="principal">Save</button>
89	<a href="lists.pl" class="cancel">Cancel</a>	97	<a href="lists.pl" class="cancel">Cancel</a>
90	</fieldset>	98	</fieldset>
91	</form>	99	</form>

Lines 3-8 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt (-15 / +24 lines)
3	[% USE KohaDates %]	3	[% USE KohaDates %]
4	[% USE TablesSettings %]	4	[% USE TablesSettings %]
5	[% SET footerjs = 1 %]	5	[% SET footerjs = 1 %]
		6	[% formulaire = BLOCK %]
		7	[% INCLUDE 'circ-search.inc' %]
		8	[% END %]
6	[% INCLUDE 'doc-head-open.inc' %]	9	[% INCLUDE 'doc-head-open.inc' %]
7	[% INCLUDE 'columns_settings.inc' %]	10	[% INCLUDE 'columns_settings.inc' %]
8	<title>Add patrons &rsaquo; [% list.name \| html %] &rsaquo; Patron lists &rsaquo; Tools &rsaquo; Koha</title>	11	<title>Add patrons &rsaquo; [% list.name \| html %] &rsaquo; Patron lists &rsaquo; Tools &rsaquo; Koha</title>
Lines 24-31 Link Here
24	</style>	27	</style>
25	</head>	28	</head>
26		29
27	<body id="patlist_list" class="pat patlist">	30	<body id="patlist_list" class="patlist">
28	[% INCLUDE 'header.inc' %]	31	[% INCLUDE 'header.inc' form = formulaire %]
29		32
30	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	33	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
31	<ol>	34	<ol>
Lines 47-52 Link Here
47	</a>	50	</a>
48	</li>	51	</li>
49	</ol>	52	</ol>
		53	<ol>
		54	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		55	</ol>
		56	<ol>
		57	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		58	</ol>
50	</nav>	59	</nav>
51		60
52	<div class="main container-fluid">	61	<div class="main container-fluid">
Lines 54-60 Link Here
54	<div class="col-sm-10 col-sm-push-2">	63	<div class="col-sm-10 col-sm-push-2">
55	<main>	64	<main>
56		65
57	<h1>[% list.name \| html %]</h1>	66	<h2>[% list.name \| html %]</h2>
58		67
59	[% IF ( not_found.size > 0 ) %]	68	[% IF ( not_found.size > 0 ) %]
60	[% IF id_column == 'borrowernumbers' %]	69	[% IF id_column == 'borrowernumbers' %]
Lines 102-108 Link Here
102		111
103	<form action="list.pl" id="add_patrons" method="post" class="clearfix">	112	<form action="list.pl" id="add_patrons" method="post" class="clearfix">
104	<fieldset class="rows">	113	<fieldset class="rows">
105	<legend>Add patrons</legend>	114	<h3>Add patrons</h3>
106	<ol>	115	<ol>
107	<li id="patron_search_line">	116	<li id="patron_search_line">
108	<label for="find_patron">Patron search: </label>	117	<label for="find_patron">Patron search: </label>
Lines 132-146 Link Here
132	</li>	141	</li>
133	</span>	142	</span>
134	</ol>	143	</ol>
135	</fieldset>	144	<button id="principal" type="submit">Submit</button>
136	<fieldset id="patron_ids_submit" class="action">
137	<input type="submit" value="Submit" />
138	</fieldset>	145	</fieldset>
139		146
140	<div class="clearfix"></div>	147	<div class="clearfix"></div>
141		148
142	<fieldset id="patrons_to_add_fieldset">	149	<fieldset id="patrons_to_add_fieldset">
143	<legend>Patrons to be added</legend>	150	<h3>Patrons to be added</h3>
144	<div id="patrons_to_add"></div>	151	<div id="patrons_to_add"></div>
145		152
146	<fieldset class="action">	153	<fieldset class="action">
Lines 152-169 Link Here
152	</form>	159	</form>
153		160
154	<form action="list.pl" id="remove_patrons" method="post">	161	<form action="list.pl" id="remove_patrons" method="post">
		162	<div id="searchresults">
		163
155		164
156	<div class="searchheader" id="searchheader">	165	<div class="searchheader" id="searchheader">
157	<span class="checkall"><a id="CheckAll" href="#"><i class="fa fa-check"></i> Select all</a></span> \|	166	<div>
158	<span class="clearall"><a id="CheckNone" href="#"><i class="fa fa-remove"></i> Clear all</a></span> \|	167	<span class="checkall"><a id="CheckAll" class="btn btn-link" href="#"><i class="fa fa-check"></i> Select all</a></span>
		168	<span class="clearall"><a id="CheckNone" class="btn btn-link" href="#"><i class="fa fa-remove"></i> Clear all</a></span> \|
159	<div class="btn-group">	169	<div class="btn-group">
160	<button class="btn btn-default btn-xs list-remove" type="submit"><i class="fa fa-trash"></i> Remove selected</button>	170	<button id="merge-patrons" class="btn btn-default btn-xs list-remove" type="submit"><i class="fa fa-trash"></i> Remove selected</button>
161	</div>	171	</div>
162	\|
163	<div class="btn-group">	172	<div class="btn-group">
164	<button class="btn btn-default btn-xs merge-patrons"><i class="fa fa-compress"></i> Merge selected patrons</button>	173	<button id="merge-patrons" class="btn btn-default btn-xs merge-patrons"><i class="fa fa-compress"></i> Merge selected patrons</button>
165	</div>	174	</div>
166	</div>	175	</div>
		176	</div>
167		177
168	<table id="patron-list-table">	178	<table id="patron-list-table">
169	<thead>	179	<thead>
Lines 211-218 Link Here
211	</table>	221	</table>
212		222
213	<input type="hidden" name="patron_list_id" value="[% list.patron_list_id \| html %]" />	223	<input type="hidden" name="patron_list_id" value="[% list.patron_list_id \| html %]" />
214	<button type="submit" class="btn btn-default btn-sm list-remove"><i class="fa fa-trash" aria-hidden="true"></i> Remove selected patrons</button>	224	</div>
215	<button class="btn btn-default btn-sm merge-patrons" type="submit"><i class="fa fa-compress"></i> Merge selected patrons</button>
216	</form>	225	</form>
217		226
218	</main>	227	</main>

Lines 1-14 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt (-5 / +18 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'circ-search.inc' %]
		6	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
5	<title>Patron lists &rsaquo; Tools &rsaquo; Koha</title>	8	<title>Patron lists &rsaquo; Tools &rsaquo; Koha</title>
6	[% INCLUDE 'doc-head-close.inc' %]	9	[% INCLUDE 'doc-head-close.inc' %]
7	[% INCLUDE 'greybox.inc' %]	10	[% INCLUDE 'greybox.inc' %]
8	</head>	11	</head>
9		12
10	<body id="patlist_lists" class="pat patlist">	13	<body id="patlist_lists" class="patlist">
11	[% INCLUDE 'header.inc' %]	14	[% INCLUDE 'header.inc' form = formulaire %]
12		15
13	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	16	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
14	<ol>	17	<ol>
Lines 24-29 Link Here
24	</a>	27	</a>
25	</li>	28	</li>
26	</ol>	29	</ol>
		30	<ol>
		31	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		32	</ol>
		33	<ol>
		34	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		35	</ol>
27	</nav>	36	</nav>
28		37
29	<div class="main container-fluid">	38	<div class="main container-fluid">
Lines 33-46 Link Here
33		42
34	<div id="toolbar" class="btn-toolbar">	43	<div id="toolbar" class="btn-toolbar">
35	<div class="btn-group">	44	<div class="btn-group">
36	<a class="btn btn-default" href="add-modify.pl"><i class="fa fa-plus"></i> New patron list</a>	45	<a class="pat" class="btn btn-default" href="add-modify.pl"><i class="fa fa-plus"></i> New patron list</a>
37	</div>	46	</div>
38	</div>	47	</div>
39		48
40	<h1>Your patron lists</h1>	49	<h2>Your patron lists</h2>
41		50
42	[% IF ( lists ) %]	51	[% IF ( lists ) %]
43		52
		53	<div id="searchresults">
		54
44	<table id="patron-lists-table">	55	<table id="patron-lists-table">
45	<thead>	56	<thead>
46	<tr>	57	<tr>
Lines 68-74 Link Here
68	</td>	79	</td>
69	<td>	80	<td>
70	<div class="btn-group dropup">	81	<div class="btn-group dropup">
71	<a class="btn btn-default btn-xs dropdown-toggle" id="listactions[% l.patron_list_id \| html %]" role="button" data-toggle="dropdown" href="#">	82	<a id="lientype" class="btn btn-default btn-xs dropdown-toggle" id="listactions[% l.patron_list_id \| html %]" role="button" data-toggle="dropdown" href="#">
72	Actions <b class="caret"></b>	83	Actions <b class="caret"></b>
73	</a>	84	</a>
74	<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="listactions[% l.patron_list_id \| html %]">	85	<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="listactions[% l.patron_list_id \| html %]">
Lines 122-127 Link Here
122		133
123	[% ELSE %]	134	[% ELSE %]
124	<div class="dialog message">There are no patron lists.</div>	135	<div class="dialog message">There are no patron lists.</div>
		136
		137	</div>
125	[% END %]	138	[% END %]
126		139
127	</main>	140	</main>

Lines 1-13 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt (-8 / +17 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'cat-search.inc' %]
		6	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
5	<title>[% IF batch_id %]Edit ([% batch_id \| html %])[% ELSE %]New[% END %] &rsaquo; Batches &rsaquo; Patron card creator &rsaquo; Tools &rsaquo; Koha</title>	8	<title>[% IF batch_id %]Edit ([% batch_id \| html %])[% ELSE %]New[% END %] &rsaquo; Batches &rsaquo; Patron card creator &rsaquo; Tools &rsaquo; Koha</title>
6	[% INCLUDE 'doc-head-close.inc' %]	9	[% INCLUDE 'doc-head-close.inc' %]
7	</head>	10	</head>
8		11
9	<body id="pcard_edit-batch" class="tools pcard">	12	<body id="pcard_edit-batch" class="tools pcard">
10	[% INCLUDE 'header.inc' %]	13	[% INCLUDE 'header.inc' form=formulaire %]
11		14
12	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	15	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
13	<ol>	16	<ol>
Lines 35-40 Link Here
35	</a>	38	</a>
36	</li>	39	</li>
37	</ol>	40	</ol>
		41	<ol>
		42	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		43	</ol>
		44	<ol>
		45	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		46	</ol>
38	</nav>	47	</nav>
39		48
40	<div class="main container-fluid">	49	<div class="main container-fluid">
Lines 72-84 Link Here
72	</div>	81	</div>
73	</form>	82	</form>
74	<div id="batch-manage" class="action">	83	<div id="batch-manage" class="action">
75	<a class="btn btn-default" id="additems" href="#"><i class="fa fa-plus"></i> Add patron(s)</a>[% IF ( table_loop ) %]	84	<a id="additems" href="#"><i class="fa fa-plus"></i> Add patron(s)</a>[% IF ( table_loop ) %]
76	<a class="btn btn-default" id="savedesc" href="#" data-batch_id="[% batch_id \| html %]"><i class="fa fa-save"></i> Save description</a>	85	<a id="savedesc" href="#" data-batch_id="[% batch_id \| html %]"><i class="fa fa-save"></i> Save description</a>
77	<a class="btn btn-default" id="removeitems" href="#"><i class="fa fa-trash"></i> Remove selected patrons</a>	86	<a id="removeitems" href="#"><i class="fa fa-trash"></i> Remove selected patrons</a>
78	<a class="btn btn-default" id="deletebatch" href="#"><i class="fa fa-minus-square"></i> Delete batch</a>	87	<a ="deletebatch" href="#"><i class="fa fa-minus-square"></i> Delete batch</a>
79	<a class="btn btn-default" id="deduplicate" href="#"><i class="fa fa-minus"></i> Remove duplicates</a>	88	<a id="deduplicate" href="#"><i class="fa fa-minus"></i> Remove duplicates</a>
80	<a class="btn btn-default" id="exportitems" href="#"><i class="fa fa-share-square-o"></i> Export selected card(s)</a>	89	<a id="exportitems" href="#"><i class="fa fa-share-square-o"></i> Export selected card(s)</a>
81	<a class="btn btn-default" id="exportbatch" href="#"><i class="fa fa-share-square-o"></i> Export card batch</a>[% END %]	90	<a id="exportbatch" href="#"><i class="fa fa-share-square-o"></i> Export card batch</a>[% END %]
82	</div>	91	</div>
83	[% IF ( table_loop ) %]	92	[% IF ( table_loop ) %]
84	<form name="items">	93	<form name="items">

Lines 1-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt (-4 / +13 lines)
1	[% SET footerjs = 1 %]	1	[% SET footerjs = 1 %]
		2	[% formulaire = BLOCK %]
		3	[% INCLUDE 'cat-search.inc' %]
		4	[% END %]
2	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
3	<title>[% IF ( layout_id ) %]Edit ([% layout_id \| html %])[% ELSE %]New[% END %] &rsaquo; Layout &rsaquo; Patron card creator &rsaquo; Tools &rsaquo; Koha</title>	6	<title>[% IF ( layout_id ) %]Edit ([% layout_id \| html %])[% ELSE %]New[% END %] &rsaquo; Layout &rsaquo; Patron card creator &rsaquo; Tools &rsaquo; Koha</title>
4	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]
5	</head>	8	</head>
6		9
7	<body id="pcard_edit-layout" class="tools pcard">	10	<body id="pcard_edit-layout" class="tools pcard">
8	[% INCLUDE 'header.inc' %]	11	[% INCLUDE 'header.inc' form=formulaire %]
9		12
10	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	13	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
11	<ol>	14	<ol>
Lines 31-36 Link Here
31	</a>	34	</a>
32	</li>	35	</li>
33	</ol>	36	</ol>
		37	<ol>
		38	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		39	</ol>
		40	<ol>
		41	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		42	</ol>
34	</nav>	43	</nav>
35		44
36	<div class="main container-fluid">	45	<div class="main container-fluid">
Lines 47-53 Link Here
47	<div class="row">	56	<div class="row">
48	<div class="col-sm-6">	57	<div class="col-sm-6">
49	<fieldset class="rows">	58	<fieldset class="rows">
50	<legend>[% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] patron card text layout</legend>	59	<h3>[% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] patron card text layout</h3>
51	<ol>	60	<ol>
52	<li>	61	<li>
53	<fieldset>	62	<fieldset>
Lines 278-284 Link Here
278	</div>	287	</div>
279	<div class="col-sm-6">	288	<div class="col-sm-6">
280	<fieldset class="rows">	289	<fieldset class="rows">
281	<legend>[% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] patron card graphic layout</legend>	290	<h3>[% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] patron card graphic layout</h3>
282	<ol>	291	<ol>
283	<!--	292	<!--
284	<li>	293	<li>
Lines 471-477 Link Here
471	</div>	480	</div>
472	</div>	481	</div>
473	<fieldset class="action">	482	<fieldset class="action">
474	<input class="btn btn-default btn-default" type="submit" value="Save" />	483	<input class="btn btn-default btn-default principal" type="submit" value="Save" />
475	<a class="cancel" href="/cgi-bin/koha/patroncards/manage.pl?card_element=layout">Cancel</a>	484	<a class="cancel" href="/cgi-bin/koha/patroncards/manage.pl?card_element=layout">Cancel</a>
476	<input type="hidden" name="op" value="save" />	485	<input type="hidden" name="op" value="save" />
477	<input type="hidden" name="layout_id" value="[% layout_id \| html %]" />	486	<input type="hidden" name="layout_id" value="[% layout_id \| html %]" />

Lines 1-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt (-6 / +15 lines)
1	[% SET footerjs = 1 %]	1	[% SET footerjs = 1 %]
		2	[% formulaire = BLOCK %]
		3	[% INCLUDE 'cat-search.inc' %]
		4	[% END %]
2	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
3	<title>[% IF ( profile_id ) %]Edit ([% profile_id \| html %])[% ELSE %]New[% END%] &rsaquo; Profiles &rsaquo; Patron card creator &rsaquo; Tools &rsaquo; Koha</title>	6	<title>[% IF ( profile_id ) %]Edit ([% profile_id \| html %])[% ELSE %]New[% END%] &rsaquo; Profiles &rsaquo; Patron card creator &rsaquo; Tools &rsaquo; Koha</title>
4	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]
5	</head>	8	</head>
6		9
7	<body id="pcard_edit-profile" class="tools pcard">	10	<body id="pcard_edit-profile" class="tools pcard">
8	[% INCLUDE 'header.inc' %]	11	[% INCLUDE 'header.inc' form=formulaire %]
9		12
10	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	13	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
11	<ol>	14	<ol>
Lines 31-36 Link Here
31	</a>	34	</a>
32	</li>	35	</li>
33	</ol>	36	</ol>
		37	<ol>
		38	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		39	</ol>
		40	<ol>
		41	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		42	</ol>
34	</nav>	43	</nav>
35		44
36	<div class="main container-fluid">	45	<div class="main container-fluid">
Lines 40-48 Link Here
40		49
41	[% INCLUDE 'patroncards-toolbar.inc' %]	50	[% INCLUDE 'patroncards-toolbar.inc' %]
42		51
43	<h1>[% IF (profile_id) %]Edit[% ELSE %]Create[% END%] printer profile[% IF (profile_id) %] ([% profile_id \| html %])[% END %]</h1>	52	<h2>[% IF (profile_id) %]Edit[% ELSE %]Create[% END%] printer profile[% IF (profile_id) %] ([% profile_id \| html %])[% END %]</h2>
44	<form name="input" action="/cgi-bin/koha/patroncards/edit-profile.pl" method="get">	53	<form name="input" action="/cgi-bin/koha/patroncards/edit-profile.pl" method="get">
45	<fieldset class="rows"><legend>Profile settings</legend>	54	<fieldset class="rows"><h3>Profile settings</h3>
46	<ol>	55	<ol>
47	<li>	56	<li>
48	[% IF ( profile_id ) %]	57	[% IF ( profile_id ) %]
Lines 84-90 Link Here
84	</ol>	93	</ol>
85	</fieldset>	94	</fieldset>
86		95
87	<fieldset class="rows"><legend>Offset:</legend>	96	<fieldset class="rows"><h3>Offset:</h3>
88	<ol>	97	<ol>
89	<li>	98	<li>
90	<label for="offset_horz">Horizontal: </label><input type="text" size="4" name="offset_horz" id="offset_horz" value="[% offset_horz \| html %]" />	99	<label for="offset_horz">Horizontal: </label><input type="text" size="4" name="offset_horz" id="offset_horz" value="[% offset_horz \| html %]" />
Lines 95-101 Link Here
95	</ol>	104	</ol>
96	</fieldset>	105	</fieldset>
97		106
98	<fieldset class="rows"><legend>Creep:</legend>	107	<fieldset class="rows"><h3>Creep:</h3>
99	<ol>	108	<ol>
100	<li>	109	<li>
101	<label for="creep_horz">Horizontal: </label><input type="text" size="4" name="creep_horz" id="creep_horz" value="[% creep_horz \| html %]" />	110	<label for="creep_horz">Horizontal: </label><input type="text" size="4" name="creep_horz" id="creep_horz" value="[% creep_horz \| html %]" />
Lines 106-112 Link Here
106	</ol>	115	</ol>
107	</fieldset>	116	</fieldset>
108	<fieldset class="action">	117	<fieldset class="action">
109	<input type="submit" value="Save" />	118	<input type="submit" class="principal" value="Save" />
110	<a href="/cgi-bin/koha/patroncards/manage.pl?card_element=profile" class="cancel">Cancel</a>	119	<a href="/cgi-bin/koha/patroncards/manage.pl?card_element=profile" class="cancel">Cancel</a>
111	<input type="hidden" name="op" value="save" />	120	<input type="hidden" name="op" value="save" />
112	<input type="hidden" name="profile_id" value="[% profile_id \| html %]" />	121	<input type="hidden" name="profile_id" value="[% profile_id \| html %]" />

Lines 1-13 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt (-2 / +12 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'cat-search.inc' %]
		6	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
5	<title>[% IF (template_id) %]Edit ([% template_id \| html %])[% ELSE %]New[% END %] &rsaquo; Templates &rsaquo; Patron card creator &rsaquo; Tools &rsaquo; Koha</title>	8	<title>[% IF (template_id) %]Edit ([% template_id \| html %])[% ELSE %]New[% END %] &rsaquo; Templates &rsaquo; Patron card creator &rsaquo; Tools &rsaquo; Koha</title>
6	[% INCLUDE 'doc-head-close.inc' %]	9	[% INCLUDE 'doc-head-close.inc' %]
7	</head>	10	</head>
8		11
9	<body id="pcard_edit-template" class="tools pcard">	12	<body id="pcard_edit-template" class="tools pcard">
10	[% INCLUDE 'header.inc' %]	13	[% INCLUDE 'header.inc' form=formulaire %]
11		14
12	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	15	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
13	<ol>	16	<ol>
Lines 33-38 Link Here
33	</a>	36	</a>
34	</li>	37	</li>
35	</ol>	38	</ol>
		39	<ol>
		40	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		41	</ol>
		42	<ol>
		43	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		44	</ol>
36	</nav>	45	</nav>
37		46
38	<div class="main container-fluid">	47	<div class="main container-fluid">
Lines 43-48 Link Here
43	[% INCLUDE 'patroncards-toolbar.inc' %]	52	[% INCLUDE 'patroncards-toolbar.inc' %]
44	<h1>[% IF (template_id) %]Edit[% ELSE %]Create[% END %] patron card template[% IF (template_id) %] ([% template_id \| html %])[% END %]</h1>	53	<h1>[% IF (template_id) %]Edit[% ELSE %]Create[% END %] patron card template[% IF (template_id) %] ([% template_id \| html %])[% END %]</h1>
45	<form name="input" action="/cgi-bin/koha/patroncards/edit-template.pl" method="get">	54	<form name="input" action="/cgi-bin/koha/patroncards/edit-template.pl" method="get">
		55	<h2>[% IF (template_id) %]Edit[% ELSE %]Create[% END %] patron card template[% IF (template_id) %] ([% template_id \| html %])[% END %]</h2>
46	<div class="row">	56	<div class="row">
47	<div class="col-sm-6">	57	<div class="col-sm-6">
48	<fieldset class="rows">	58	<fieldset class="rows">
Lines 158-164 Link Here
158	</div>	168	</div>
159		169
160	<fieldset class="action">	170	<fieldset class="action">
161	<input type="submit" class="submit" value="Save" />	171	<input class="principal" type="submit" class="submit" value="Save" />
162	<a class="cancel" href="/cgi-bin/koha/patroncards/manage.pl?card_element=template">Cancel</a>	172	<a class="cancel" href="/cgi-bin/koha/patroncards/manage.pl?card_element=template">Cancel</a>
163	<input type="hidden" name="op" value="save" />	173	<input type="hidden" name="op" value="save" />
164	[% IF ( template_id ) %]	174	[% IF ( template_id ) %]

Lines 1-9 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt (-1 / +11 lines)
		1
		2	[% formulaire = BLOCK %]
		3	[% INCLUDE 'cat-search.inc' %]
		4	[% END %]
1	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
2	<title>Patron card creator &rsaquo; Tools &rsaquo; Koha</title>	6	<title>Patron card creator &rsaquo; Tools &rsaquo; Koha</title>
3	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]
4	</head>	8	</head>
5	<body id="pcard_home" class="tools pcard">	9	<body id="pcard_home" class="tools pcard">
6	[% INCLUDE 'header.inc' %]	10	[% INCLUDE 'header.inc' form=formulaire %]
7	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	11	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
8	<ol>	12	<ol>
9	<li>	13	<li>
Lines 18-23 Link Here
18	</a>	22	</a>
19	</li>	23	</li>
20	</ol>	24	</ol>
		25	<ol>
		26	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		27	</ol>
		28	<ol>
		29	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		30	</ol>
21	</nav>	31	</nav>
22		32
23	<div class="main container-fluid">	33	<div class="main container-fluid">

Lines 1-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt (-2 / +11 lines)
1	[% SET footerjs = 1 %]	1	[% SET footerjs = 1 %]
		2	[% formulaire = BLOCK %]
		3	[% INCLUDE 'cat-search.inc' %]
		4	[% END %]
2	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
3	<title>Images &rsaquo; Patron card creator &rsaquo; Tools &rsaquo; Koha</title>	6	<title>Images &rsaquo; Patron card creator &rsaquo; Tools &rsaquo; Koha</title>
4	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]
5	</head>	8	</head>
6		9
7	<body id="pcard_image-manage" class="tools pcard">	10	<body id="pcard_image-manage" class="tools pcard">
8	[% INCLUDE 'header.inc' %]	11	[% INCLUDE 'header.inc' form=formulaire %]
9	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	12	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
10	<ol>	13	<ol>
11	<li>	14	<li>
Lines 23-28 Link Here
23	</a>	26	</a>
24	</li>	27	</li>
25	</ol>	28	</ol>
		29	<ol>
		30	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		31	</ol>
		32	<ol>
		33	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		34	</ol>
26	</nav>	35	</nav>
27		36
28	<div class="main container-fluid">	37	<div class="main container-fluid">
Lines 60-66 Link Here
60	</ol>	69	</ol>
61	<div class="action">	70	<div class="action">
62	<input type="hidden" name="op" value="upload" />	71	<input type="hidden" name="op" value="upload" />
63	<input class="btn btn-default btn-default" id="uploadsu" type="submit" value="Upload" />	72	<input class="btn btn-default btn-default principal" id="uploadsu" type="submit" value="Upload" />
64	</div>	73	</div>
65	[% IF ( IMPORT_SUCCESSFUL ) %]	74	[% IF ( IMPORT_SUCCESSFUL ) %]
66	<div class="dialog message">	75	<div class="dialog message">

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt (-3 / +12 lines)
1	[% USE CGI %]	1	[% USE CGI %]
2	[% PROCESS 'i18n.inc' %]	2	[% PROCESS 'i18n.inc' %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'cat-search.inc' %]
		6	[% END %]
4	[% BLOCK translate_card_element %]	7	[% BLOCK translate_card_element %]
5	[%- SWITCH element -%]	8	[%- SWITCH element -%]
6	[%- CASE 'layout' -%][% t('layout') \| html %]	9	[%- CASE 'layout' -%][% t('layout') \| html %]
Lines 29-35 Link Here
29	</head>	32	</head>
30		33
31	<body id="pcard_manage" class="tools pcard">	34	<body id="pcard_manage" class="tools pcard">
32	[% INCLUDE 'header.inc' %]	35	[% INCLUDE 'header.inc' form=formulaire %]
33		36
34	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	37	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
35	<ol>	38	<ol>
Lines 48-53 Link Here
48	</a>	51	</a>
49	</li>	52	</li>
50	</ol>	53	</ol>
		54	<ol>
		55	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		56	</ol>
		57	<ol>
		58	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		59	</ol>
51	</nav>	60	</nav>
52		61
53	<div class="main container-fluid">	62	<div class="main container-fluid">
Lines 92-100 Link Here
92	[% FOREACH text_field IN table_loo.text_fields %]	101	[% FOREACH text_field IN table_loo.text_fields %]
93	[% IF ( text_field.select_field ) %]	102	[% IF ( text_field.select_field ) %]
94	<td>	103	<td>
95	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/patroncards/edit-[% card_element \| html %].pl?op=edit&element_id=[% text_field.field_value \| html %]"><i class="fa fa-edit"></i> Edit</a>	104	<a id="lientype" class="btn btn-default btn-xs" href="/cgi-bin/koha/patroncards/edit-[% card_element \| html %].pl?op=edit&element_id=[% text_field.field_value \| html %]"><i class="fa fa-edit"></i> Edit</a>
96	[% IF ( print ) %]<a class="btn btn-default btn-xs export" data-batch-id="[% text_field.field_value \|url %]" href="/cgi-bin/koha/patroncards/print.pl?batch_id=[% text_field.field_value \|url %]"><i class="fa fa-share-square-o"></i> Export</a>[% END %]	105	[% IF ( print ) %]<a class="btn btn-default btn-xs export" data-batch-id="[% text_field.field_value \|url %]" href="/cgi-bin/koha/patroncards/print.pl?batch_id=[% text_field.field_value \|url %]"><i class="fa fa-share-square-o"></i> Export</a>[% END %]
97	<a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/patroncards/manage.pl?op=delete&card_element=[% card_element \| html %]&element_id=[% text_field.field_value \| html %]"><i class="fa fa-trash"></i> Delete</a>	106	<a id="lientype" class="btn btn-default btn-xs delete" href="/cgi-bin/koha/patroncards/manage.pl?op=delete&card_element=[% card_element \| html %]&element_id=[% text_field.field_value \| html %]"><i class="fa fa-trash"></i> Delete</a>
98	</td>	107	</td>
99	[% IF ( print ) %]<td><input type="checkbox" name="action" value="[% text_field.field_value \| html %]" /></td>[% END %]	108	[% IF ( print ) %]<td><input type="checkbox" name="action" value="[% text_field.field_value \| html %]" /></td>[% END %]
100	[% ELSIF ( text_field.field_value ) %]	109	[% ELSIF ( text_field.field_value ) %]

Lines 1-3 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-disabled.tt (-2 / +11 lines)
		1
		2	[% formulaire = BLOCK %]
		3	[% INCLUDE 'circ-search.inc' %]
		4	[% END %]
1	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
2	<title>Upload plugin &rsaquo; Plugins &rsaquo; Tools &rsaquo; Koha</title>	6	<title>Upload plugin &rsaquo; Plugins &rsaquo; Tools &rsaquo; Koha</title>
3	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]
Lines 5-12 Link Here
5	</head>	9	</head>
6		10
7	<body id="plugins_plugins_disabled" class="plugins">	11	<body id="plugins_plugins_disabled" class="plugins">
8	[% INCLUDE 'header.inc' %]	12	[% INCLUDE 'header.inc' form=formulaire %]
9	[% INCLUDE 'circ-search.inc' %]
10		13
11	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	14	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
12	<ol>	15	<ol>
Lines 22-27 Link Here
22	</a>	25	</a>
23	</li>	26	</li>
24	</ol>	27	</ol>
		28	<ol>
		29	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		30	</ol>
		31	<ol>
		32	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		33	</ol>
25	</nav>	34	</nav>
26		35
27	<div class="container-fluid">	36	<div class="container-fluid">

Lines 1-3 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt (-4 / +13 lines)
		1
		2	[% formulaire = BLOCK %]
		3	[% INCLUDE 'circ-search.inc' %]
		4	[% END %]
1	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
2	<title>Upload plugin &rsaquo; Plugins &rsaquo; Tools &rsaquo; Koha </title>	6	<title>Upload plugin &rsaquo; Plugins &rsaquo; Tools &rsaquo; Koha </title>
3	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]
Lines 5-12 Link Here
5	</head>	9	</head>
6		10
7	<body id="plugins_plugins_upload" class="plugins">	11	<body id="plugins_plugins_upload" class="plugins">
8	[% INCLUDE 'header.inc' %]	12	[% INCLUDE 'header.inc' form=formulaire %]
9	[% INCLUDE 'circ-search.inc' %]
10		13
11	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	14	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
12	<ol>	15	<ol>
Lines 22-34 Link Here
22	</a>	25	</a>
23	</li>	26	</li>
24	</ol>	27	</ol>
		28	<ol>
		29	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		30	</ol>
		31	<ol>
		32	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		33	</ol>
25	</nav>	34	</nav>
26		35
27	<div class="container-fluid">	36	<div class="container-fluid">
28	<div class="row">	37	<div class="row">
29	<div class="col-sm-6 col-sm-offset-3 col-md-6 col-md-offset-3">	38	<div class="col-sm-6 col-sm-offset-3 col-md-6 col-md-offset-3">
30		39
31	<h1>Upload Koha plugin</h1>	40	<h2>Upload Koha plugin</h2>
32	[% IF ( ERRORS ) %]	41	[% IF ( ERRORS ) %]
33	<div class="dialog alert">	42	<div class="dialog alert">
34	[% FOREACH ERROR IN ERRORS %]	43	[% FOREACH ERROR IN ERRORS %]
Lines 52-58 Link Here
52	</fieldset>	61	</fieldset>
53	<fieldset class="action">	62	<fieldset class="action">
54	<input type="hidden" name="op" value="Upload" />	63	<input type="hidden" name="op" value="Upload" />
55	<input type="submit" value="Upload" class="submit" />	64	<input class="principal" type="submit" value="Upload" class="submit" />
56	</fieldset>	65	</fieldset>
57	</form>	66	</form>
58		67

Lines 6-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt (-2 / +10 lines)
6	[% USE TablesSettings %]	6	[% USE TablesSettings %]
7	[% USE Registers %]	7	[% USE Registers %]
8	[% SET footerjs = 1 %]	8	[% SET footerjs = 1 %]
		9	[% formulaire = BLOCK %]
		10	[% INCLUDE 'circ-search.inc' %]
		11	[% END %]
9	[% INCLUDE 'doc-head-open.inc' %]	12	[% INCLUDE 'doc-head-open.inc' %]
10	[% SET registers = Registers.all( filters => { current_branch => 1 } ) %]	13	[% SET registers = Registers.all( filters => { current_branch => 1 } ) %]
11	<title>Payments &rsaquo; Koha</title>	14	<title>Payments &rsaquo; Koha</title>
Lines 13-20 Link Here
13	</head>	16	</head>
14		17
15	<body id="payments" class="pos">	18	<body id="payments" class="pos">
16	[% INCLUDE 'header.inc' %]	19	[% INCLUDE 'header.inc' form=formulaire %]
17	[% INCLUDE 'circ-search.inc' %]
18		20
19	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	21	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
20	<ol>	22	<ol>
Lines 27-32 Link Here
27	</a>	29	</a>
28	</li>	30	</li>
29	</ol>	31	</ol>
		32	<ol>
		33	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		34	</ol>
		35	<ol>
		36	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		37	</ol>
30	</nav>	38	</nav>
31		39
32	<div class="main container-fluid">	40	<div class="main container-fluid">

Lines 5-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt (-2 / +10 lines)
5	[% USE AuthorisedValues %]	5	[% USE AuthorisedValues %]
6	[% USE Price %]	6	[% USE Price %]
7	[% SET footerjs = 1 %]	7	[% SET footerjs = 1 %]
		8	[% formulaire = BLOCK %]
		9	[% INCLUDE 'circ-search.inc' %]
		10	[% END %]
8	[% PROCESS 'accounts.inc' %]	11	[% PROCESS 'accounts.inc' %]
9	[% INCLUDE 'doc-head-open.inc' %]	12	[% INCLUDE 'doc-head-open.inc' %]
10	<title>Cashup &rsaquo; Koha</title>	13	<title>Cashup &rsaquo; Koha</title>
Lines 13-20 Link Here
13	</head>	16	</head>
14		17
15	<body id="register" class="pos">	18	<body id="register" class="pos">
16	[% INCLUDE 'header.inc' %]	19	[% INCLUDE 'header.inc' form=formulaire %]
17	[% INCLUDE 'circ-search.inc' %]
18		20
19	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	21	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
20	<ol>	22	<ol>
Lines 30-35 Link Here
30	</a>	32	</a>
31	</li>	33	</li>
32	</ol>	34	</ol>
		35	<ol>
		36	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		37	</ol>
		38	<ol>
		39	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		40	</ol>
33	</nav>	41	</nav>
34		42
35	<div class="main container-fluid">	43	<div class="main container-fluid">

Lines 4-17 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt (-2 / +10 lines)
4	[% USE KohaDates %]	4	[% USE KohaDates %]
5	[% USE Price %]	5	[% USE Price %]
6	[% SET footerjs = 1 %]	6	[% SET footerjs = 1 %]
		7	[% formulaire = BLOCK %]
		8	[% INCLUDE 'circ-search.inc' %]
		9	[% END %]
7	[% INCLUDE 'doc-head-open.inc' %]	10	[% INCLUDE 'doc-head-open.inc' %]
8	<title>Cashup &rsaquo; Koha</title>	11	<title>Cashup &rsaquo; Koha</title>
9	[% INCLUDE 'doc-head-close.inc' %]	12	[% INCLUDE 'doc-head-close.inc' %]
10	</head>	13	</head>
11		14
12	<body id="cashup" class="pos">	15	<body id="cashup" class="pos">
13	[% INCLUDE 'header.inc' %]	16	[% INCLUDE 'header.inc' form=formulaire %]
14	[% INCLUDE 'circ-search.inc' %]
15		17
16	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	18	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
17	<ol>	19	<ol>
Lines 27-32 Link Here
27	</a>	29	</a>
28	</li>	30	</li>
29	</ol>	31	</ol>
		32	<ol>
		33	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		34	</ol>
		35	<ol>
		36	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		37	</ol>
30	</nav>	38	</nav>
31		39
32	<div class="main container-fluid">	40	<div class="main container-fluid">




<h1>Acquisitions statistics </h1>
[% IF ( do_it ) %]
	[% FOREACH mainloo IN mainloop %]
		<h2>Acquisitions statistics </h2>
        [% IF ( mainloo.loopfilter.size ) %]
            <p><strong>Filtered on:</strong></p>
            [% FOREACH loopfilte IN mainloo.loopfilter %]

[% ELSE %]
	<form method="post" action="/cgi-bin/koha/reports/acquisitions_stats.pl">
	<fieldset class="rows">
	<h3>Acquisitions statistics</h3>
	<table>
		<thead>
			<tr>

	</fieldset>

<fieldset class="rows">
    <h3> Cell value </h3>
    <ol>
        <li>
            <label for="cellvalue1">Count items:</label><input type="radio" name="Cellvalue" id="cellvalue1" value="1" checked="checked" />

</fieldset>

	<fieldset class="rows">
	<h3>Output</h3>
    <ol>
        <li>
            <label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" />

	</fieldset>

	<fieldset class="action">
	<input type="submit" class="principal" value="Submit" />
	<input type="hidden" name="report_name" value="[% report_name | html %]" />
	<input type="hidden" name="do_it" value="1" />
	</fieldset>





[% IF ( do_it ) %]
	[% FOREACH mainloo IN mainloop %]
        <h2>Patrons with the most checkouts</h2>
		[% IF ( mainloo.loopfilter ) %]
            [% IF mainloo.loopfilter.size %]
                <p>Filtered on:</p>

		</table>
	[% END %]
[% ELSE %]
    <h2>Patrons with the most checkouts</h2>
	<form method="post" action="/cgi-bin/koha/reports/bor_issues_top.pl">
	<fieldset class="rows">
        <ol>

	</fieldset>

<fieldset class="rows">
	<h3>Output</h3>
	<ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /></li>
		<li><label for="outputfile">To a file: </label><input type="radio" name="output" value="file" id="outputfile" />
			<label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" />

	</fieldset>

	<fieldset class="action">
	<input type="submit" class="principal" value="Submit" />
	<input type="hidden" name="report_name" value="[% report_name | html %]" />
	<input type="hidden" name="do_it" value="1" />
	</fieldset>

Lines 1-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt (-6 / +9 lines)
1	[% SET footerjs = 1 %]	1	[% SET footerjs = 1 %]
		2	[% formulaire = BLOCK %]
		3	[% INCLUDE 'cat-search.inc' %]
		4	[% END %]
2	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
3	<title>Patrons with no checkouts &rsaquo; Reports &rsaquo; Koha</title>	6	<title>Patrons with no checkouts &rsaquo; Reports &rsaquo; Koha</title>
4	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]
5	</head>	8	</head>
6		9
7	<body id="rep_borrowers_out" class="rep">	10	<body id="rep_borrowers_out" class="rep">
8	[% INCLUDE 'header.inc' %]	11	[% INCLUDE 'header.inc' form=formulaire %]
9		12
10	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	13	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
11	<ol>	14	<ol>
Lines 38-44 Link Here
38		41
39	[% IF ( do_it ) %]	42	[% IF ( do_it ) %]
40	[% FOREACH mainloo IN mainloop %]	43	[% FOREACH mainloo IN mainloop %]
41	<h1>Patrons with no checkouts</h1>	44	<h2>Patrons with no checkouts</h2>
42	[% IF ( mainloo.loopfilter ) %]	45	[% IF ( mainloo.loopfilter ) %]
43	<p>Filtered on:</p>	46	<p>Filtered on:</p>
44	[% FOREACH loopfilte IN mainloo.loopfilter %]	47	[% FOREACH loopfilte IN mainloo.loopfilter %]
Lines 65-71 Link Here
65	</table>	68	</table>
66	[% END %]	69	[% END %]
67	[% ELSE %]	70	[% ELSE %]
68	<h1>Patrons with no checkouts</h1>	71	<h2>Patrons with no checkouts</h2>
69	<form method="post" action="/cgi-bin/koha/reports/borrowers_out.pl">	72	<form method="post" action="/cgi-bin/koha/reports/borrowers_out.pl">
70	<fieldset class="rows">	73	<fieldset class="rows">
71	<ol>	74	<ol>
Lines 81-87 Link Here
81	</fieldset>	84	</fieldset>
82		85
83	<fieldset class="rows">	86	<fieldset class="rows">
84	<legend>Limits</legend>	87	<h3>Limits</h3>
85	<ol>	88	<ol>
86	<li><label for="numberlimit">Limit to: </label><select name="Limit" id="numberlimit">	89	<li><label for="numberlimit">Limit to: </label><select name="Limit" id="numberlimit">
87	<option value ="" selected="selected">None</option>	90	<option value ="" selected="selected">None</option>
Lines 103-109 Link Here
103	</fieldset>	106	</fieldset>
104		107
105	<fieldset class="rows">	108	<fieldset class="rows">
106	<legend>Output</legend>	109	<h3>Output</h3>
107	<ol>	110	<ol>
108	<li>	111	<li>
109	<label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" />	112	<label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" />
Lines 131-137 Link Here
131	</fieldset>	134	</fieldset>
132		135
133	<fieldset class="action">	136	<fieldset class="action">
134	<input type="submit" value="Submit" />	137	<input type="submit" class="principal" value="Submit" />
135	<input type="hidden" name="report_name" value="[% report_name \| html %]" />	138	<input type="hidden" name="report_name" value="[% report_name \| html %]" />
136	<input type="hidden" name="do_it" value="1" />	139	<input type="hidden" name="do_it" value="1" />
137	</fieldset>	140	</fieldset>




<h1>Patrons statistics</h1>
[% IF ( do_it ) %]
	[% FOREACH mainloo IN mainloop %]
		<h2>Patrons statistics</h2>
        [% IF ( mainloo.loopfilter.size>0 ) %]
            <p>Filtered on:</p>
			[% FOREACH loopfilte IN mainloo.loopfilter %]

[% ELSE %]

	<form method="post" action="/cgi-bin/koha/reports/borrowers_stats.pl">
	<fieldset class="rows"><h3>Patrons statistics</h3>
	<table>
		<thead>
			<tr>


	
	<fieldset class="rows">
	<h3>Output</h3>
    <ol>
        <li>
            <label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" />

	</fieldset>

	<fieldset class="action">
	<input type="submit" class="principal" value="Submit" />
	<input type="hidden" name="report_name" value="[% report_name | html %]" />
	<input type="hidden" name="do_it" value="1" />
	</fieldset>




        <div class="col-sm-10 col-sm-push-2">
            <main>

    <h2>Cash register statistics</h2>
    <form method="post" action="/cgi-bin/koha/reports/cash_register_stats.pl" id="frmCashRegister">
        <fieldset class="rows">
            <h3>Cash register statistics [% beginDate | $KohaDates %] to [% endDate | $KohaDates %]</h3>
            <ol>
                <br>
                <li>

        </fieldset>

        <fieldset class="rows">
            <h3>Output</h3>
            <ol>
                <li>
                    <label for="outputscreen">To screen into the browser: </label>

        </fieldset>

        <fieldset class="action">
        <input type="submit" class="principal" value="Submit" name="do_it" />
        </fieldset>
    </form>





[% IF ( do_it ) %]

	[% FOREACH mainloo IN mainloop %]
        <h2>Top [% mainloo.limit | html %] Most-circulated items</h2>
		[% IF ( mainloo.loopfilter ) %]
            <p>Filtered on:</p>
			[% FOREACH loopfilte IN mainloo.loopfilter %]

		</table>
	[% END %]
[% ELSE %]
    <h2>Most-circulated items</h2>
	<form method="post" action="/cgi-bin/koha/reports/cat_issues_top.pl">
	<fieldset class="rows">
	<ol>

	</fieldset>
	
	<fieldset class="rows">
	<h3>Limits</h3>
	<ol><li><label for="numberlimit">Limit to:</label><select name="Limit" id="numberlimit">
                        <option value ="" selected="selected">None</option>
						<option value="5" selected="selected"> 5</option>

	</fieldset>
	
	<fieldset class="rows">
	<h3>Output</h3>
    <ol>
        <li>
            <label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" />

	</fieldset>

	<fieldset class="action">
	<input type="submit" class="principal" value="Submit" />
	<input type="hidden" name="report_name" value="[% report_name | html %]" />
	<input type="hidden" name="do_it" value="1" />
	</fieldset>

Lines 1-3 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt (-5 / +9 lines)
		1
		2	[% SET footerjs = 1 %][% formulaire = BLOCK %]
		3	[% INCLUDE 'cat-search.inc' %]
		4	[% END %]
1	[% USE Branches %]	5	[% USE Branches %]
2	[% INCLUDE 'doc-head-open.inc' %]	6	[% INCLUDE 'doc-head-open.inc' %]
3	<title>Items with no checkouts &rsaquo; Reports &rsaquo; Koha</title>	7	<title>Items with no checkouts &rsaquo; Reports &rsaquo; Koha</title>
Lines 7-13 Link Here
7	</style>	11	</style>
8	</head>	12	</head>
9	<body id="rep_catalogue_out" class="rep">	13	<body id="rep_catalogue_out" class="rep">
10	[% INCLUDE 'header.inc' %]	14	[% INCLUDE 'header.inc' form=formulaire %]
11		15
12	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	16	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
13	<ol>	17	<ol>
Lines 39-45 Link Here
39	<main>	43	<main>
40		44
41	[% IF ( do_it ) %]	45	[% IF ( do_it ) %]
42	<h1>Items with no checkouts</h1>	46	<h2>Items with no checkouts</h2>
43	[% FOREACH mainloo IN mainloop %]	47	[% FOREACH mainloo IN mainloop %]
44	[% IF ( mainloo.loopfilter ) %]	48	[% IF ( mainloo.loopfilter ) %]
45	<p>Filtered on:</p>	49	<p>Filtered on:</p>
Lines 105-111 Link Here
105	[% END %]	109	[% END %]
106	[% END %]	110	[% END %]
107	[% ELSE %]	111	[% ELSE %]
108	<h1>Items with no checkouts</h1>	112	<h2>Items with no checkouts</h2>
109	<form method="post" action="/cgi-bin/koha/reports/catalogue_out.pl">	113	<form method="post" action="/cgi-bin/koha/reports/catalogue_out.pl">
110		114
111	<fieldset class="rows">	115	<fieldset class="rows">
Lines 127-133 Link Here
127	</fieldset>	131	</fieldset>
128		132
129	<fieldset class="rows">	133	<fieldset class="rows">
130	<legend>Limits</legend>	134	<h3>Limits</h3>
131	<ol>	135	<ol>
132	<li>	136	<li>
133	<label for="numberlimit">Limit to: </label>	137	<label for="numberlimit">Limit to: </label>
Lines 152-158 Link Here
152	</fieldset>	156	</fieldset>
153		157
154	<fieldset class="action">	158	<fieldset class="action">
155	<input type="submit" value="Submit" />	159	<input type="submit" class="principal" value="Submit" />
156	<input type="hidden" name="report_name" value="[% report_name \| html %]" />	160	<input type="hidden" name="report_name" value="[% report_name \| html %]" />
157	<input type="hidden" name="do_it" value="1" />	161	<input type="hidden" name="do_it" value="1" />
158	<input type="hidden" name="output" value="screen" />	162	<input type="hidden" name="output" value="screen" />




<h1>Catalog statistics</h1>
[% IF ( do_it ) %]
	[% FOREACH mainloo IN mainloop %]
		<h2>Catalog statistics</h2>
		[% IF ( mainloo.loopfilter ) %]
            <p>Filtered on:</p>
			[% FOREACH loopfilte IN mainloo.loopfilter %]


	<form method="post" action="/cgi-bin/koha/reports/catalogue_stats.pl">
	<fieldset class="rows">
	<h3>Catalog statistics</h3>
	<table>
		<thead>
			<tr>

	</table><br /></fieldset>

    <fieldset class="rows">
        <h3>Cell value</h3>
        <ol>
            <li>
                <label for="cellvalue_items">Count total items</label>

    </fieldset>
	
	<fieldset class="rows">
	<h3>Output</h3>
	<ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /></li>
		<li><label for="outputfile">To a file: </label><input type="radio" name="output" value="file" id="outputfile" />
			<label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" />

	</fieldset>

	<fieldset class="action">
	<input type="submit" class="principal" value="Submit" />
	<input type="hidden" name="report_name" value="[% report_name | html %]" />
	<input type="hidden" name="do_it" value="1" />
	</fieldset>

Lines 1-4 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt (-17 / +34 lines)
1	[% SET footerjs = 1 %]	1	[% SET footerjs = 1 %]
		2	[% SET footerjs = 1 %][% formulaire = BLOCK %]
		3	[% INCLUDE 'circ-search.inc' %]
		4	[% END %]
2	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
3	<title>Dictionary &rsaquo; Guided reports &rsaquo; Reports &rsaquo; Koha</title>	6	<title>Dictionary &rsaquo; Guided reports &rsaquo; Reports &rsaquo; Koha</title>
4	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]
Lines 6-13 Link Here
6	</head>	9	</head>
7		10
8	<body id="rep_dictionary" class="rep">	11	<body id="rep_dictionary" class="rep">
9	[% INCLUDE 'header.inc' %]	12	[% INCLUDE 'header.inc' form=formulaire %]
10	[% INCLUDE 'circ-search.inc' %]
11		13
12	[%- BLOCK area_name -%]	14	[%- BLOCK area_name -%]
13	[%- SWITCH area -%]	15	[%- SWITCH area -%]
Lines 72-77 Link Here
72	</a>	74	</a>
73	</li>	75	</li>
74		76
		77	<ol>
		78	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		79	</ol>
		80	<ol>
		81	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		82	</ol>
75	[% ELSIF ( step_5 ) %]	83	[% ELSIF ( step_5 ) %]
76	<li>	84	<li>
77	<a href="/cgi-bin/koha/reports/dictionary.pl">Dictionary</a>	85	<a href="/cgi-bin/koha/reports/dictionary.pl">Dictionary</a>
Lines 90-95 Link Here
90	</li>	98	</li>
91	[% END %]	99	[% END %]
92	</ol>	100	</ol>
		101
		102	<ol>
		103	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		104	</ol>
		105
		106	<ol>
		107	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		108	</ol>
93	</nav>	109	</nav>
94		110
95	<div class="main container-fluid">	111	<div class="main container-fluid">
Lines 99-106 Link Here
99		115
100	[% IF ( start_dictionary ) %]	116	[% IF ( start_dictionary ) %]
101	<div id="toolbar">	117	<div id="toolbar">
102	<a id="newdictionary" class="btn btn-default" href="/cgi-bin/koha/reports/dictionary.pl?phase=Add%20New%20Definition"><i class="fa fa-plus"></i> New definition</a>	118	<div>
103	</div>	119	<a id="newdictionary" class="pat" href="/cgi-bin/koha/reports/dictionary.pl?phase=Add%20New%20Definition"><i class="fa fa-plus"></i> New definition</a>
		120	</div></div>
104	[% END %]	121	[% END %]
105	<h1>Dictionary</h1>	122	<h1>Dictionary</h1>
106	[% IF ( start_dictionary ) %]	123	[% IF ( start_dictionary ) %]
Lines 122-128 Link Here
122	[%- END -%]	139	[%- END -%]
123	[% END %]	140	[% END %]
124	</select>	141	</select>
125	<input name="submit" value="Go" type="submit" />	142	<input name="submit" class="principal" value="Go" type="submit" />
126	[% END %]	143	[% END %]
127	</form>	144	</form>
128	<br />	145	<br />
Lines 143-149 Link Here
143	<td class="actions"><form method="post" action="/cgi-bin/koha/reports/dictionary.pl">	160	<td class="actions"><form method="post" action="/cgi-bin/koha/reports/dictionary.pl">
144	<input type="hidden" name="id" value="[% definition.id \| html %]" />	161	<input type="hidden" name="id" value="[% definition.id \| html %]" />
145	<input type="hidden" name="phase" value="Delete Definition" />	162	<input type="hidden" name="phase" value="Delete Definition" />
146	<button type="submit" name="submit" class="btn btn-default btn-xs" id="delete"><i class="fa fa-trash"></i> Delete</button>	163	<button type="submit" name="submit" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-trash"></i> Delete</button>
147	</form></td>	164	</form></td>
148	</tr>	165	</tr>
149	[% END %]	166	[% END %]
Lines 154-162 Link Here
154	[% END %]	171	[% END %]
155		172
156	[% IF ( new_dictionary ) %]	173	[% IF ( new_dictionary ) %]
157	<h3>Add new definition</h3>	174	<h2>Add new definition</h2>
158	<form action="/cgi-bin/koha/reports/dictionary.pl" method="post">	175	<form action="/cgi-bin/koha/reports/dictionary.pl" method="post">
159	<fieldset class="rows"><legend>Step 1 of 5: Name the new definition</legend><ol>	176	<fieldset class="rows"><h3>Step 1 of 5: Name the new definition</h3><ol>
160	<li>	177	<li>
161	<label for="definition_name">Definition name:</label>	178	<label for="definition_name">Definition name:</label>
162	<input type="text" id="definition_name" name="definition_name" />	179	<input type="text" id="definition_name" name="definition_name" />
Lines 168-174 Link Here
168	</ol></fieldset>	185	</ol></fieldset>
169		186
170	<fieldset class="action"><input type="hidden" name="phase" value="New Term step 2" />	187	<fieldset class="action"><input type="hidden" name="phase" value="New Term step 2" />
171	<input name="submit" value="Next" type="submit" /></fieldset>	188	<input name="submit" class="principal" value="Next" type="submit" /></fieldset>
172	</form>	189	</form>
173	[% END %]	190	[% END %]
174		191
Lines 176-182 Link Here
176	<h3>Add new definition</h3>	193	<h3>Add new definition</h3>
177	<form action="/cgi-bin/koha/reports/dictionary.pl" method="post">	194	<form action="/cgi-bin/koha/reports/dictionary.pl" method="post">
178	<fieldset class="rows">	195	<fieldset class="rows">
179	<legend>Step 2 of 5: Choose the area</legend>	196	<h3>Step 2 of 5: Choose the area</h3>
180	<ol>	197	<ol>
181	<li>	198	<li>
182	<input type="hidden" name="phase" value="New Term step 3" />	199	<input type="hidden" name="phase" value="New Term step 3" />
Lines 190-196 Link Here
190	</li>	207	</li>
191	</ol>	208	</ol>
192	</fieldset>	209	</fieldset>
193	<fieldset class="action"><input name="submit" value="Next" type="submit" /></fieldset>	210	<fieldset class="action"><input name="submit" class="principal" value="Next" type="submit" /></fieldset>
194	</form>	211	</form>
195	[%- END -%]	212	[%- END -%]
196		213
Lines 198-204 Link Here
198	<h3>Add new definition</h3>	215	<h3>Add new definition</h3>
199	<form action="/cgi-bin/koha/reports/dictionary.pl" method="post">	216	<form action="/cgi-bin/koha/reports/dictionary.pl" method="post">
200	<fieldset class="rows">	217	<fieldset class="rows">
201	<legend>Step 3 of 5: Choose a column</legend>	218	<h3>Step 3 of 5: Choose a column</h3>
202	<input type="hidden" name="area" value="[% area \| html %]" />	219	<input type="hidden" name="area" value="[% area \| html %]" />
203	<input type="hidden" name="definition_name" value="[% definition_name \| html %]" />	220	<input type="hidden" name="definition_name" value="[% definition_name \| html %]" />
204	<input type="hidden" name="definition_description" value="[% definition_description \| html %]" />	221	<input type="hidden" name="definition_description" value="[% definition_description \| html %]" />
Lines 226-232 Link Here
226		243
227	<input type="hidden" name="phase" value="New Term step 4" />	244	<input type="hidden" name="phase" value="New Term step 4" />
228	</fieldset>	245	</fieldset>
229	<fieldset class="action"><input type="submit" name="submit" value="Next" /></fieldset>	246	<fieldset class="action"><input type="submit" class="principal" name="submit" value="Next" /></fieldset>
230	</form>	247	</form>
231	[% END %]	248	[% END %]
232		249
Lines 234-240 Link Here
234	<h3>Add new definition</h3>	251	<h3>Add new definition</h3>
235	<form action="/cgi-bin/koha/reports/dictionary.pl" method="post">	252	<form action="/cgi-bin/koha/reports/dictionary.pl" method="post">
236	<fieldset class="rows">	253	<fieldset class="rows">
237	<legend>Step 4 of 5: Specify a value</legend>	254	<h3>Step 4 of 5: Specify a value</h3>
238	<input type="hidden" name="area" value="[% area \| html %]" />	255	<input type="hidden" name="area" value="[% area \| html %]" />
239	<input type="hidden" name="definition_name" value="[% definition_name \| html %]" />	256	<input type="hidden" name="definition_name" value="[% definition_name \| html %]" />
240	<input type="hidden" name="definition_description" value="[% definition_description \| html %]" />	257	<input type="hidden" name="definition_description" value="[% definition_description \| html %]" />
Lines 275-281 Link Here
275	<input type="hidden" name="phase" value="New Term step 5" />	292	<input type="hidden" name="phase" value="New Term step 5" />
276	</fieldset>	293	</fieldset>
277	<fieldset class="action">	294	<fieldset class="action">
278	<input type="submit" name="submit" value="Next" />	295	<input type="submit" class="principal" name="submit" value="Next" />
279	</fieldset>	296	</fieldset>
280	</form>	297	</form>
281	[% END %]	298	[% END %]
Lines 290-296 Link Here
290	<h3>Add new definition</h3>	307	<h3>Add new definition</h3>
291		308
292	<fieldset class="rows">	309	<fieldset class="rows">
293	<legend>Step 5 of 5: Confirm details</legend>	310	<h3>Step 5 of 5: Confirm details</h3>
294	<ol>	311	<ol>
295	<li>	312	<li>
296	<span class="label">Name:</span>[%- definition_name \| html -%]	313	<span class="label">Name:</span>[%- definition_name \| html -%]
Lines 321-327 Link Here
321		338
322	<fieldset class="action"><input type="hidden" name="sql" value="[% query \| html %]" />	339	<fieldset class="action"><input type="hidden" name="sql" value="[% query \| html %]" />
323	<input type="hidden" name="phase" value="New Term step 6" />	340	<input type="hidden" name="phase" value="New Term step 6" />
324	<input type="submit" name="submit" value="Save" /> </fieldset>	341	<input type="submit" class="principal" name="submit" value="Save" /> </fieldset>
325		342
326	</form>	343	</form>
327	[% END %]	344	[% END %]

Lines 6-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt (-71 / +84 lines)
6	[% USE TablesSettings %]	6	[% USE TablesSettings %]
7	[% USE JSON.Escape %]	7	[% USE JSON.Escape %]
8	[% SET footerjs = 1 %]	8	[% SET footerjs = 1 %]
		9	[% SET footerjs = 1 %][% formulaire = BLOCK %]
		10	[% INCLUDE 'circ-search.inc' %]
		11	[% END %]
9		12
10	[%- BLOCK area_name -%]	13	[%- BLOCK area_name -%]
11	[%- SWITCH area -%]	14	[%- SWITCH area -%]
Lines 62-69 Link Here
62	</head>	65	</head>
63		66
64	<body id="rep_guided_reports_start" class="rep">	67	<body id="rep_guided_reports_start" class="rep">
65	[% INCLUDE 'header.inc' %]	68	[% INCLUDE 'header.inc' form=formulaire %]
66	[% INCLUDE 'circ-search.inc' %]
67		69
68	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	70	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
69	<ol>	71	<ol>
Lines 144-149 Link Here
144	</a>	146	</a>
145	[% END %]	147	[% END %]
146	</ol>	148	</ol>
		149
		150	<ol>
		151	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		152	</ol>
		153
		154	<ol>
		155	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		156	</ol>
147	</nav> <!-- /#breadcrumbs -->	157	</nav> <!-- /#breadcrumbs -->
148		158
149	<div id="update_sql" class="modal" tabindex="-1" role="dialog" aria-labelledby="update_sql_label" aria-hidden="true">	159	<div id="update_sql" class="modal" tabindex="-1" role="dialog" aria-labelledby="update_sql_label" aria-hidden="true">
Lines 180-200 Link Here
180	[% IF ( CAN_user_reports_create_reports ) %]	190	[% IF ( CAN_user_reports_create_reports ) %]
181	<form action="/cgi-bin/koha/reports/guided_reports.pl">	191	<form action="/cgi-bin/koha/reports/guided_reports.pl">
182	<input type="hidden" name="phase" value="Build new" />	192	<input type="hidden" name="phase" value="Build new" />
183	<input type="submit" name="submit" value="Build new"/>	193	<input type="submit" name="submit" id="lientype" value="Build new"/>
184	</form>	194	</form>
185	[% END %]	195	[% END %]
186		196
187	[% IF ( CAN_user_reports_execute_reports ) %]	197	[% IF ( CAN_user_reports_execute_reports ) %]
188	<form action="/cgi-bin/koha/reports/guided_reports.pl">	198	<form action="/cgi-bin/koha/reports/guided_reports.pl">
189	<input type="hidden" name="phase" value="Use saved"/>	199	<input type="hidden" name="phase" value="Use saved"/>
190	<input type="submit" name="submit" value="Use saved"/>	200	<input type="submit" name="submit" id="lientype" value="Use saved"/>
191	</form>	201	</form>
192	[% END %]	202	[% END %]
193		203
194	[% IF ( CAN_user_reports_create_reports ) %]	204	[% IF ( CAN_user_reports_create_reports ) %]
195	<form action="/cgi-bin/koha/reports/guided_reports.pl">	205	<form action="/cgi-bin/koha/reports/guided_reports.pl">
196	<input type="hidden" name="phase" value="Create report from SQL"/>	206	<input type="hidden" name="phase" value="Create report from SQL"/>
197	<input type="submit" name="submit" value="Create report from SQL"/>	207	<input type="submit" name="submit" id="lientype" value="Create report from SQL"/>
198	</form>	208	</form>
199	[% END %]	209	[% END %]
200		210
Lines 202-208 Link Here
202	<p>Use the reports dictionary to define custom criteria to use in your reports</p>	212	<p>Use the reports dictionary to define custom criteria to use in your reports</p>
203	<form action="/cgi-bin/koha/reports/dictionary.pl">	213	<form action="/cgi-bin/koha/reports/dictionary.pl">
204	<input type="hidden" name="phase" value="View Dictionary"/>	214	<input type="hidden" name="phase" value="View Dictionary"/>
205	<input type="submit" name="submit" value="View dictionary"/>	215	<input type="submit" name="submit" id="lientype" value="View dictionary"/>
206	</form>	216	</form>
207	[% END # /IF (start) %]	217	[% END # /IF (start) %]
208		218
Lines 219-225 Link Here
219	[% END %]	229	[% END %]
220		230
221	[% IF ( saved1 ) %]	231	[% IF ( saved1 ) %]
222	<h1>Saved reports</h1>	232	<h2>Saved reports</h2>
223	[% IF ( savedreports ) %]	233	[% IF ( savedreports ) %]
224		234
225	[% IF ( filters.date \|\| filters.author \|\| filters.keyword ) %]	235	[% IF ( filters.date \|\| filters.author \|\| filters.keyword ) %]
Lines 240-245 Link Here
240	[% END %]	250	[% END %]
241		251
242	<div id="tabs" class="toptabs">	252	<div id="tabs" class="toptabs">
		253	<fieldset id="searchresults">
243	<ul class="nav nav-tabs" role="tablist">	254	<ul class="nav nav-tabs" role="tablist">
244	<li role="presentation" class="active">	255	<li role="presentation" class="active">
245	<a href="#reports" aria-controls="reports" role="tab" data-toggle="tab">All</a>	256	<a href="#reports" aria-controls="reports" role="tab" data-toggle="tab">All</a>
Lines 408-421 Link Here
408	</tbody>	419	</tbody>
409	</table>	420	</table>
410		421
411	[% IF ( CAN_user_reports_delete_reports ) %]	422	[% IF ( CAN_user_reports_delete_reports ) %]
412	<fieldset class="action">	423	<fieldset class="action">
413	<input type="submit" value="Delete selected" />	424	<input id="lientype" type="submit" value="Delete selected" />
414	</fieldset>	425	</fieldset>
415	[% END %]	426	[% END %]
416	</form>	427	</form>
417	</div> <!-- /#reports -->	428	</div>
418	</div> <!-- /.tab-content -->	429	</fieldset>
419	</div>	430	</div>
420	[% ELSE # IF ( savedreports ) %]	431	[% ELSE # IF ( savedreports ) %]
421	<div class="dialog message">	432	<div class="dialog message">
Lines 458-467 Link Here
458	</div>	469	</div>
459	[% END %]	470	[% END %]
460		471
461	<h1>Build a report</h1>	472	<h2>Build a report</h2>
462	<form action="/cgi-bin/koha/reports/guided_reports.pl">	473	<form action="/cgi-bin/koha/reports/guided_reports.pl">
463	<fieldset class="rows">	474	<fieldset class="rows">
464	<legend>Step 1 of 6: Choose a module to report on,[% IF (usecache) %] Set cache expiry, [% END %] and choose report visibility </legend>	475	<h3>Step 1 of 6: Choose a module to report on,[% IF (usecache) %] Set cache expiry, [% END %] and choose report visibility </h3>
465	<ol>	476	<ol>
466	<li>	477	<li>
467	<label for="area">Choose: </label>	478	<label for="area">Choose: </label>
Lines 502-523 Link Here
502	</li>	513	</li>
503	[% END %]	514	[% END %]
504	</ol>	515	</ol>
505	</fieldset> <!-- /.rows -->
506	<fieldset class="action">	516	<fieldset class="action">
507	<input type="hidden" name="phase" value="Report on this Area" />	517	<input type="hidden" name="phase" value="Report on this Area" />
508	<input type="submit" name="submit" value="Next >>" />	518	<input type="submit" class="principal" name="submit" value="Next >>" />
509	</fieldset>	519	</fieldset>
		520	</fieldset> <!-- /.rows -->
510	</form>	521	</form>
511	[% END # /build1 %]	522	[% END # /build1 %]
512		523
513	[% IF ( build2 ) %]	524	[% IF ( build2 ) %]
514	<h1>Build a report</h1>	525	<h2>Build a report</h2>
515	<form action="/cgi-bin/koha/reports/guided_reports.pl" method="post">	526	<form action="/cgi-bin/koha/reports/guided_reports.pl" method="post">
516	<input type="hidden" name="area" value="[% area \| html %]" />	527	<input type="hidden" name="area" value="[% area \| html %]" />
517	<input type="hidden" name="public" value="[% public \| html %]" />	528	<input type="hidden" name="public" value="[% public \| html %]" />
518	<input type="hidden" name="cache_expiry" value="[% cache_expiry \| html %]" />	529	<input type="hidden" name="cache_expiry" value="[% cache_expiry \| html %]" />
519	<fieldset class="rows">	530	<fieldset class="rows">
520	<legend>Step 2 of 6: Pick a report type</legend>	531	<h3>Step 2 of 6: Pick a report type</h3>
521	<ol>	532	<ol>
522	<li>	533	<li>
523	<label for="types">Choose: </label>	534	<label for="types">Choose: </label>
Lines 528-546 Link Here
528	</select>	539	</select>
529	</li>	540	</li>
530	</ol>	541	</ol>
531	</fieldset>
532
533	<fieldset class="action">	542	<fieldset class="action">
534	<input type="hidden" name="phase" value="Choose this type" />	543	<input type="hidden" name="phase" value="Choose this type" />
535	<input type="button" name="back" value="<< Back" class="goback" />	544	<input type="button" name="back" value="<< Back" class="goback principal" />
536	<input type="submit" name="submit" value="Next >>" />	545	<input type="submit" class="principal" name="submit" value="Next >>" />
		546	</fieldset>
537	</fieldset>	547	</fieldset>
		548
538	</form>	549	</form>
539	[% END # /IF (build2 ) %]	550	[% END # /IF (build2 ) %]
540		551
541	[% IF ( build3 ) %]	552	[% IF ( build3 ) %]
542	<h1>Build a report</h1>	553	<h2>Build a report</h2>
543	<h3>Step 3 of 6: Select columns for display</h3>
544	<p>Note: Be careful selecting when selecting columns. If your choice is too broad it could result in a very large report that will either not complete, or slow your system down.</p>	554	<p>Note: Be careful selecting when selecting columns. If your choice is too broad it could result in a very large report that will either not complete, or slow your system down.</p>
545		555
546	<form id="column_submit" action="/cgi-bin/koha/reports/guided_reports.pl" method="post">	556	<form id="column_submit" action="/cgi-bin/koha/reports/guided_reports.pl" method="post">
Lines 549-554 Link Here
549	<input type="hidden" name="public" value="[% public \| html %]" />	559	<input type="hidden" name="public" value="[% public \| html %]" />
550	<input type="hidden" name="cache_expiry" value="[% cache_expiry \| html %]" />	560	<input type="hidden" name="cache_expiry" value="[% cache_expiry \| html %]" />
551	<fieldset>	561	<fieldset>
		562	<h3>Step 3 of 6: Select columns for display</h3>
552	<div class="row">	563	<div class="row">
553	<div class="col-sm-6">	564	<div class="col-sm-6">
554	<div style="float: left;">	565	<div style="float: left;">
Lines 574-580 Link Here
574	</select>	585	</select>
575	</div>	586	</div>
576	<div style="width: 6.3em; float: right; margin-top: 100px">	587	<div style="width: 6.3em; float: right; margin-top: 100px">
577	<input type="button" name="Add" value="Add" class="button" style="width:6em;" id="addColumn" /><br />	588	<input type="button" name="Add" value="Add >>" class="button" style="width:6em;" id="addColumn" /><br />
578	<input type="button" name="delete" value="<< Delete" class="button" style="width: 6em; margin: 1em 0;" id="delColumn" />	589	<input type="button" name="delete" value="<< Delete" class="button" style="width: 6em; margin: 1em 0;" id="delColumn" />
579	</div>	590	</div>
580	</div> <!-- /.col-sm-6 -->	591	</div> <!-- /.col-sm-6 -->
Lines 584-600 Link Here
584	</select>	595	</select>
585	</div>	596	</div>
586	</div> <!-- /.row -->	597	</div> <!-- /.row -->
587	</fieldset>
588	<fieldset class="action">	598	<fieldset class="action">
589	<input type="hidden" name="phase" value="Choose these columns" />	599	<input type="hidden" name="phase" value="Choose these columns" />
590	<input type="button" name="back" value="<< Back" class="goback" />	600	<input type="button" name="back" value="<< Back" class="goback principal" />
591	<input type="submit" name="submit" value="Next >>" />	601	<input type="submit" name="submit" class="principal" value="Next >>" />
		602	</fieldset>
592	</fieldset>	603	</fieldset>
593	</form> <!-- /#column_submit -->	604	</form> <!-- /#column_submit -->
594	[% END # /IF ( build3 ) %]	605	[% END # /IF ( build3 ) %]
595		606
596	[% IF ( build4 ) %]	607	[% IF ( build4 ) %]
597	<h1>Build a report</h1>	608	<h2>Build a report</h2>
598	<form action="/cgi-bin/koha/reports/guided_reports.pl" method="post" >	609	<form action="/cgi-bin/koha/reports/guided_reports.pl" method="post" >
599	<input type="hidden" name="area" value="[% area \| html %]" />	610	<input type="hidden" name="area" value="[% area \| html %]" />
600	<input type="hidden" name="type" value="[% type \| html %]" />	611	<input type="hidden" name="type" value="[% type \| html %]" />
Lines 602-608 Link Here
602	<input type="hidden" name="public" value="[% public \| html %]" />	613	<input type="hidden" name="public" value="[% public \| html %]" />
603	<input type="hidden" name="cache_expiry" value="[% cache_expiry \| html %]" />	614	<input type="hidden" name="cache_expiry" value="[% cache_expiry \| html %]" />
604	<fieldset>	615	<fieldset>
605	<legend>Step 4 of 6: Select criteria to limit on</legend>	616	<h3>Step 4 of 6: Select criteria to limit on</h3>
606	<table>	617	<table>
607	[% FOREACH criteri IN criteria %]	618	[% FOREACH criteri IN criteria %]
608	<tr>	619	<tr>
Lines 654-664 Link Here
654	[% END %]	665	[% END %]
655	[% END %]	666	[% END %]
656	</table>	667	</table>
		668	<fieldset class="action">
		669	<input type="hidden" name="phase" value="Choose these criteria" />
		670	<input type="button" name="back" value="<< Back" class="goback principal" />
		671	<input type="submit" name="submit" class="principal" value="Next >>" />
		672	</fieldset>
657	</fieldset>	673	</fieldset>
658		674
659	[% IF ( definitions ) %]	675	[% IF ( definitions ) %]
660	<fieldset>	676	<fieldset>
661	<legend>Dictionary definitions</legend>	677	<h3>Dictionary definitions</h3>
662	<table>	678	<table>
663	[% FOREACH definition IN definitions %]	679	[% FOREACH definition IN definitions %]
664	<tr>	680	<tr>
Lines 672-688 Link Here
672	</fieldset>	688	</fieldset>
673	[% END %]	689	[% END %]
674		690
675	<fieldset class="action">
676	<input type="hidden" name="phase" value="Choose these criteria" />
677	<input type="button" name="back" value="<< Back" class="goback" />
678	<input type="submit" name="submit" value="Next >>" />
679	</fieldset>
680	</form>	691	</form>
681	[% END # /IF ( build4 ) %]	692	[% END # /IF ( build4 ) %]
682		693
683	[% IF ( build5 ) %]	694	[% IF ( build5 ) %]
684	<h1>Build a report</h1>	695	<h2>Build a report</h2>
685	<h3>Step 5 of 6: Pick which columns to total</h3>
686	<form action="/cgi-bin/koha/reports/guided_reports.pl" method="post">	696	<form action="/cgi-bin/koha/reports/guided_reports.pl" method="post">
687	<input type="hidden" name="area" value="[% area \| html %]" />	697	<input type="hidden" name="area" value="[% area \| html %]" />
688	<input type="hidden" name="type" value="[% type \| html %]" />	698	<input type="hidden" name="type" value="[% type \| html %]" />
Lines 692-697 Link Here
692	<input type="hidden" name="public" value="[% public \| html %]" />	702	<input type="hidden" name="public" value="[% public \| html %]" />
693	<input type="hidden" name="cache_expiry" value="[% cache_expiry \| html %]" />	703	<input type="hidden" name="cache_expiry" value="[% cache_expiry \| html %]" />
694	<fieldset>	704	<fieldset>
		705	<h3>Step 5 of 6: Pick which columns to total</h3>
695	<table>	706	<table>
696	[% FOREACH total_b IN total_by %]	707	[% FOREACH total_b IN total_by %]
697	<tr>	708	<tr>
Lines 709-726 Link Here
709	</tr>	720	</tr>
710	[% END %]	721	[% END %]
711	</table>	722	</table>
712	</fieldset>
713		723
714	<fieldset class="action"><input type="hidden" name="phase" value="Choose these operations" />	724	<fieldset class="action"><input type="hidden" name="phase" value="Choose these operations" />
715	<input type="button" name="back" value="<< Back" class="goback" />	725	<input type="button" name="back" value="<< Back" class="goback principal" />
716	<input type="submit" name="submit" value="Next >>" />	726	<input type="submit" name="submit" class="principal" value="Next >>" />
		727	</fieldset>
717	</fieldset>	728	</fieldset>
718	</form>	729	</form>
719	[% END # /IF ( build5 ) %]	730	[% END # /IF ( build5 ) %]
720		731
721	[% IF ( build6 ) %]	732	[% IF ( build6 ) %]
722	<h1>Build a report</h1>	733	<h2>Build a report</h2>
723	<h3>Step 6 of 6: Choose how you want the report ordered</h3>
724	<form action="/cgi-bin/koha/reports/guided_reports.pl" method="post">	734	<form action="/cgi-bin/koha/reports/guided_reports.pl" method="post">
725	<input type="hidden" name="area" value="[% area \| html %]" />	735	<input type="hidden" name="area" value="[% area \| html %]" />
726	<input type="hidden" name="type" value="[% type \| html %]" />	736	<input type="hidden" name="type" value="[% type \| html %]" />
Lines 731-736 Link Here
731	<input type="hidden" name="public" value="[% public \| html %]" />	741	<input type="hidden" name="public" value="[% public \| html %]" />
732	<input type="hidden" name="cache_expiry" value="[% cache_expiry \| html %]" />	742	<input type="hidden" name="cache_expiry" value="[% cache_expiry \| html %]" />
733	<fieldset>	743	<fieldset>
		744	<h3>Step 6 of 6: Choose how you want the report ordered</h3>
734	<table>	745	<table>
735	[% FOREACH order_b IN order_by %]	746	[% FOREACH order_b IN order_by %]
736	<tr>	747	<tr>
Lines 751-763 Link Here
751	</fieldset>	762	</fieldset>
752	<fieldset class="action">	763	<fieldset class="action">
753	<input type="hidden" name="phase" value="Build report" />	764	<input type="hidden" name="phase" value="Build report" />
754	<input type="submit" name="submit" value="Finish" />	765	<input type="submit" name="submit" class="principal" value="Finish" />
755	</fieldset>	766	</fieldset>
756	</form>	767	</form>
757	[% END #/ IF ( build6 ) %]	768	[% END #/ IF ( build6 ) %]
758		769
759	[% IF ( showreport ) %]	770	[% IF ( showreport ) %]
760	<h1>Confirm custom report</h1>	771	<h2>Confirm custom report</h2>
761	<p>Your report will be generated with the following SQL statement.</p>	772	<p>Your report will be generated with the following SQL statement.</p>
762	<p>	773	<p>
763	[% sql \| html %]	774	[% sql \| html %]
Lines 770-776 Link Here
770	<input type="hidden" name="cache_expiry" value="[% cache_expiry \| html %]" />	781	<input type="hidden" name="cache_expiry" value="[% cache_expiry \| html %]" />
771	<p>You will need to save the report before you can execute it</p>	782	<p>You will need to save the report before you can execute it</p>
772	<fieldset class="action"><input type="hidden" name="phase" value="Save" />	783	<fieldset class="action"><input type="hidden" name="phase" value="Save" />
773	<input type="submit" name="submit" value="Next" />	784	<input type="submit" name="submit" class="principal" value="Next" />
774	</fieldset>	785	</fieldset>
775	</form>	786	</form>
776	[% END #/ IF ( showreport ) %]	787	[% END #/ IF ( showreport ) %]
Lines 783-789 Link Here
783	<input type="hidden" name="public" value="[% public \| html %]" />	794	<input type="hidden" name="public" value="[% public \| html %]" />
784	<input type="hidden" name="cache_expiry" value="[% cache_expiry \| html %]" />	795	<input type="hidden" name="cache_expiry" value="[% cache_expiry \| html %]" />
785	<fieldset class="rows">	796	<fieldset class="rows">
786	<legend><h1>Save your custom report</h1></legend>	797	<h3>Save your custom report</h3>
787	<ol>	798	<ol>
788	<li>	799	<li>
789	<label for="reportname" class="required">Report name: </label>	800	<label for="reportname" class="required">Report name: </label>
Lines 798-804 Link Here
798	</ol>	809	</ol>
799	</fieldset>	810	</fieldset>
800	<fieldset class="action"><input type="hidden" name="phase" value="Save Report" />	811	<fieldset class="action"><input type="hidden" name="phase" value="Save Report" />
801	<input type="submit" name="submit" value="Save report" />	812	<input type="submit" name="submit" class="principal" value="Save report" />
802	</fieldset>	813	</fieldset>
803	</form>	814	</form>
804	[% END # /IF( save ) %]	815	[% END # /IF( save ) %]
Lines 857-863 Link Here
857	<fieldset class="action"><input type="submit" value="Edit SQL" /></fieldset>	868	<fieldset class="action"><input type="submit" value="Edit SQL" /></fieldset>
858	[% ELSE # IF ( auth_val_error ) %]	869	[% ELSE # IF ( auth_val_error ) %]
859	<input type='hidden' name='phase' value='Run this report' />	870	<input type='hidden' name='phase' value='Run this report' />
860	<h1>Enter parameters for report [% name \| html %]:</h1>	871	<h2>Enter parameters for report [% name \| html %]:</h2>
861	[% IF ( notes ) %]	872	[% IF ( notes ) %]
862	<p>[% notes \| html %]</p>	873	<p>[% notes \| html %]</p>
863	[% END %]	874	[% END %]
Lines 903-909 Link Here
903	[% END # /IF ( enter_params ) %]	914	[% END # /IF ( enter_params ) %]
904		915
905	[% IF ( execute ) %]	916	[% IF ( execute ) %]
906	<h1>[% name \| html %] <span class="report_heading_id"><span class="report_label">Report ID:</span> <span class="report_number">[% id \| html %]</span></span></h1>	917	<h2>[% name \| html %] <span class="report_heading_id"><span class="report_label">Report ID:</span> <span class="report_number">[% id \| html %]</span></span></h2>
907	[% IF ( notes ) %]	918	[% IF ( notes ) %]
908	<p><span class="label">Notes:</span> [% notes \| html %]</p>	919	<p><span class="label">Notes:</span> [% notes \| html %]</p>
909	[% END %]	920	[% END %]
Lines 1200-1206 Link Here
1200	<h1>Create from SQL</h1>	1211	<h1>Create from SQL</h1>
1201	<form action="/cgi-bin/koha/reports/guided_reports.pl" method="post" id="sql_report_form">	1212	<form action="/cgi-bin/koha/reports/guided_reports.pl" method="post" id="sql_report_form">
1202	<fieldset class="rows">	1213	<fieldset class="rows">
1203	<legend>Create report from SQL</legend>	1214	<h3>Create report from SQL</h3>
1204	<ol>	1215	<ol>
1205	<li>	1216	<li>
1206	<label for="reportname" class="required">Report name:</label>	1217	<label for="reportname" class="required">Report name:</label>
Lines 1251-1257 Link Here
1251	</fieldset> <!-- /.rows -->	1262	</fieldset> <!-- /.rows -->
1252		1263
1253	<fieldset class="rows">	1264	<fieldset class="rows">
1254	<legend>SQL:</legend>	1265	<h3>SQL:</h3>
1255	<div style="margin:1em;">	1266	<div style="margin:1em;">
1256	[% PROCESS insert_runtime_parameter %]	1267	[% PROCESS insert_runtime_parameter %]
1257	<textarea id="sql" name="sql" class="required" required="required" cols="50" rows="10">[% sql \| html %]</textarea>	1268	<textarea id="sql" name="sql" class="required" required="required" cols="50" rows="10">[% sql \| html %]</textarea>
Lines 1261-1274 Link Here
1261		1272
1262	<fieldset class="action">	1273	<fieldset class="action">
1263	<input type="hidden" name="phase" value="Save Report" />	1274	<input type="hidden" name="phase" value="Save Report" />
1264	<input type="submit" name="submit" value="Save report" />	1275	<input type="submit" name="submit" class="principal" value="Save report" />
1265	<a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved" class="cancel">Cancel</a>	1276	<a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved" class="cancel">Cancel</a>
1266	</fieldset>	1277	</fieldset>
1267	</form>	1278	</form>
1268	[% END #/IF ( create ) %]	1279	[% END #/IF ( create ) %]
1269		1280
1270	[% IF saved_results %]	1281	[% IF saved_results %]
1271	<h1>Saved report results</h1>	1282	<h2>Saved report results</h2>
1272	<h2>[% name \| html %]</h2>	1283	<h2>[% name \| html %]</h2>
1273	<p>[% notes \| html %]</p>	1284	<p>[% notes \| html %]</p>
1274	<table>	1285	<table>
Lines 1285-1291 Link Here
1285	[% IF ( showsql ) %]	1296	[% IF ( showsql ) %]
1286	<h1>Saved reports - SQL</h1>	1297	<h1>Saved reports - SQL</h1>
1287	<fieldset class="rows">	1298	<fieldset class="rows">
1288	<legend>[% reportname \| html %]</legend>	1299	<h3>[% reportname \| html %]</h3>
1289	<ol>	1300	<ol>
1290	[% IF ( notes ) %]	1301	[% IF ( notes ) %]
1291	<li>	1302	<li>
Lines 1317-1323 Link Here
1317	<input type="hidden" name="phase" value="Update SQL" />	1328	<input type="hidden" name="phase" value="Update SQL" />
1318	<input type="hidden" name="id" value="[% id \| html %]"/>	1329	<input type="hidden" name="id" value="[% id \| html %]"/>
1319	<fieldset class="rows">	1330	<fieldset class="rows">
1320	<legend><h1>Edit SQL report</h1></legend>	1331	<h3>Edit SQL report</h3>
1321	<ol>	1332	<ol>
1322	<li>	1333	<li>
1323	<label for="reportname" class="required">Report name: </label>	1334	<label for="reportname" class="required">Report name: </label>
Lines 1363-1376 Link Here
1363	</fieldset> <!-- /.rows -->	1374	</fieldset> <!-- /.rows -->
1364		1375
1365	<fieldset class="rows">	1376	<fieldset class="rows">
1366	<legend>SQL:</legend>	1377	<h3>SQL:</h3>
1367	[% PROCESS insert_runtime_parameter %]	1378	[% PROCESS insert_runtime_parameter %]
1368	<textarea id="sql" name="sql" class="required" required="required" cols="50" rows="10">[% sql \| html %]</textarea>	1379	<textarea id="sql" name="sql" class="required" required="required" cols="50" rows="10">[% sql \| html %]</textarea>
1369	<span class="required" style="margin-left:30px;">Required</span>	1380	<span class="required" style="margin-left:30px;">Required</span>
1370	</fieldset>	1381	</fieldset>
1371		1382
1372	<fieldset class="action">	1383	<fieldset class="action">
1373	<input type="submit" name="submit" value="Update SQL" />	1384	<input type="submit" name="submit" class="principal" value="Update SQL" />
1374	<a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved" class="cancel">Cancel</a>	1385	<a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved" class="cancel">Cancel</a>
1375	</fieldset>	1386	</fieldset>
1376	</form>	1387	</form>
Lines 1399-1405 Link Here
1399	</div>	1410	</div>
1400	<fieldset class="action">	1411	<fieldset class="action">
1401	<input type="hidden" name="phase" value="Use saved" />	1412	<input type="hidden" name="phase" value="Use saved" />
1402	<input type="submit" name="submit" value="Saved reports" />	1413	<input type="submit" name="submit" class="principal" value="Saved reports" />
1403	</fieldset>	1414	</fieldset>
1404	</form>	1415	</form>
1405	[% END # /IF ( errors ) %]	1416	[% END # /IF ( errors ) %]
Lines 1409-1445 Link Here
1409		1420
1410	<div class="col-sm-2 col-sm-pull-10">	1421	<div class="col-sm-2 col-sm-pull-10">
1411	<aside>	1422	<aside>
		1423	<div id="filters">
1412	[% IF ( saved1 ) %]	1424	[% IF ( saved1 ) %]
1413	<div id="saved-reports-filter">	1425	<div id="saved-reports-filter">
1414	<form action="/cgi-bin/koha/reports/guided_reports.pl" method="get">	1426	<form action="/cgi-bin/koha/reports/guided_reports.pl" method="get">
1415	<input type="hidden" name="phase" value="Use saved" />	1427	<input type="hidden" name="phase" value="Use saved" />
1416	<input type="hidden" name="filter_set" value="1" />	1428	<input type="hidden" name="filter_set" value="1" />
1417	<fieldset class="brief">	1429	<fieldset class="brief">
1418	<h3>Filter</h3>	1430	<h4>Filter</h4>
1419	<ol>	1431	<ol>
1420	<li>	1432	<li>
1421	<label for="filter_date">Date:</label>	1433	<p for="filter_date">Date:
1422	<input type="text" id="filter_date" name="filter_date" size="10" value="[% filters.date \| html %]" class="flatpickr" />	1434	<input type="text" id="filter_date" name="filter_date" size="10" value="[% filters.date \| html %]" class="flatpickr" />
1423	<div class="hint">[% INCLUDE 'date-format.inc' %]</div>	1435	<div class="hint">[% INCLUDE 'date-format.inc' %]</div></p>
1424	</li>	1436	</li>
1425	<li>	1437	<li>
1426	<label for="filter_author">Author:</label>	1438	<p for="filter_author">Author:
1427	<input type="text" id="filter_author" name="filter_author" value="[% filters.author \| html %]" size="16" />	1439	<input type="text" id="filter_author" name="filter_author" value="[% filters.author \| html %]" size="16" /></p>
1428	</li>	1440	</li>
1429	<li>	1441	<li>
1430	<label for="filter_keyword">Keyword:</label>	1442	<p for="filter_keyword">Keyword:
1431	<input type="text" id="filter_keyword" name="filter_keyword" value="[% filters.keyword \| html %]" size="16" />	1443	<input type="text" id="filter_keyword" name="filter_keyword" value="[% filters.keyword \| html %]" size="16" /></p>
1432	</li>	1444	</li>
1433	</ol>	1445	</ol>
1434	</fieldset> <!-- /.brief -->
1435	<fieldset class="action">	1446	<fieldset class="action">
1436	<input type="submit" value="Apply filter" />	1447	<input type="submit" class="principal" value="Apply filter" />
1437	<a id="resetReportsFilter" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved&clear_filters=1">Clear</a>	1448	<a id="resetReportsFilter" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved&clear_filters=1">Clear</a>
1438	</fieldset>	1449	</fieldset>
		1450	</fieldset> <!-- /.brief -->
1439	</form>	1451	</form>
1440	</div> <!-- /#saved-reports-filter -->	1452	</div> <!-- /#saved-reports-filter -->
1441	[% END %]	1453	[% END %]
1442	[% INCLUDE 'guided-reports-view.inc' %]	1454	[% INCLUDE 'guided-reports-view.inc' %]
		1455	</div>
1443	</aside>	1456	</aside>
1444	</div> <!-- /.col-sm-2.col-sm-pull-10 -->	1457	</div> <!-- /.col-sm-2.col-sm-pull-10 -->
1445	</div> <!-- /.row -->	1458	</div> <!-- /.row -->

Lines 1-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt (-4 / +8 lines)
1	[% USE Branches %]	1	[% USE Branches %]
2	[% SET footerjs = 1 %]	2	[% SET footerjs = 1 %]
		3	[% SET footerjs = 1 %][% formulaire = BLOCK %]
		4	[% INCLUDE 'cat-search.inc' %]
		5	[% END %]
3	[% INCLUDE 'doc-head-open.inc' %]	6	[% INCLUDE 'doc-head-open.inc' %]
4	<title>Average loan time &rsaquo; Reports &rsaquo; Koha</title>	7	<title>Average loan time &rsaquo; Reports &rsaquo; Koha</title>
5	[% INCLUDE 'doc-head-close.inc' %]	8	[% INCLUDE 'doc-head-close.inc' %]
6	</head>	9	</head>
7		10
8	<body id="rep_issues_avg_stats" class="rep">	11	<body id="rep_issues_avg_stats" class="rep">
9	[% INCLUDE 'header.inc' %]	12	[% INCLUDE 'header.inc' form=formulaire %]
10		13
11	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	14	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
12	<ol>	15	<ol>
Lines 51-56 Link Here
51	<h1>Average checkout period</h1>	54	<h1>Average checkout period</h1>
52	[% IF ( do_it ) %]	55	[% IF ( do_it ) %]
53	[% FOREACH mainloo IN mainloop %]	56	[% FOREACH mainloo IN mainloop %]
		57	<h2>Average checkout period</h2>
54	[% IF ( mainloo.loopfilter ) %]	58	[% IF ( mainloo.loopfilter ) %]
55	<p>Filtered on:</p>	59	<p>Filtered on:</p>
56	[% FOREACH loopfilte IN mainloo.loopfilter %]	60	[% FOREACH loopfilte IN mainloo.loopfilter %]
Lines 95-101 Link Here
95		99
96	<form method="post" action="/cgi-bin/koha/reports/issues_avg_stats.pl">	100	<form method="post" action="/cgi-bin/koha/reports/issues_avg_stats.pl">
97	<fieldset class="rows">	101	<fieldset class="rows">
98	<legend>Average checkout period statistics</legend>	102	<h3>Average checkout period statistics</h3>
99	<table>	103	<table>
100	<thead>	104	<thead>
101	<tr>	105	<tr>
Lines 228-234 Link Here
228		232
229		233
230	<fieldset class="rows">	234	<fieldset class="rows">
231	<legend>Output</legend>	235	<h3>Output</h3>
232	<ol>	236	<ol>
233	<li>	237	<li>
234	<label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" />	238	<label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" />
Lines 257-263 Link Here
257	<input type="hidden" name="Filter" value="" />	261	<input type="hidden" name="Filter" value="" />
258	<input type="hidden" name="report_name" value="[% report_name \| html %]" />	262	<input type="hidden" name="report_name" value="[% report_name \| html %]" />
259	<input type="hidden" name="do_it" value="1" />	263	<input type="hidden" name="do_it" value="1" />
260	<input type="submit" value="Submit" />	264	<input type="submit" class="principal" value="Submit" />
261	</fieldset>	265	</fieldset>
262	</form>	266	</form>
263	[% END %]	267	[% END %]




<h1>Circulation statistics</h1>
[% IF ( do_it ) %]
    [% FOREACH mainloo IN mainloop %]
        <h2>Circulation statistics</h2>
        [% IF ( mainloo.loopfilter ) %]
            <p>Filtered on:</p>
            <ul>


    <form method="post" action="/cgi-bin/koha/reports/issues_stats.pl">
    <fieldset class="rows">
	<h3>Circulation statistics</h3><table>
        <thead>
            <tr>
                <th>Title</th>

    </table><br /></fieldset>

<fieldset class="rows">
    <h3>Cell value</h3>
    <ol>
        <li>
            <label for="cellvalue1">Count total items:</label>

</fieldset>
			
	<fieldset class="rows">
	<h3>Output</h3>
    <ol>
        <li>
            <label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" />

	</fieldset>

	<fieldset class="action">
	<input type="submit" class="principal" value="Submit" />
	<input type="hidden" name="report_name" value="[% report_name | html %]" />
	<input type="hidden" name="do_it" value="1" />
	</fieldset>

Lines 7-19 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt (-3 / +6 lines)
7	[% USE ItemTypes %]	7	[% USE ItemTypes %]
8	[% USE Price %]	8	[% USE Price %]
9	[% SET footerjs = 1 %]	9	[% SET footerjs = 1 %]
		10	[% SET footerjs = 1 %][% formulaire = BLOCK %]
		11	[% INCLUDE 'cat-search.inc' %]
		12	[% END %]
10	[% INCLUDE 'doc-head-open.inc' %]	13	[% INCLUDE 'doc-head-open.inc' %]
11	<title>Lost items &rsaquo; Reports &rsaquo; Koha</title>	14	<title>Lost items &rsaquo; Reports &rsaquo; Koha</title>
12	[% INCLUDE 'doc-head-close.inc' %]	15	[% INCLUDE 'doc-head-close.inc' %]
13	</head>	16	</head>
14		17
15	<body id="rep_itemslost" class="rep">	18	<body id="rep_itemslost" class="rep">
16	[% INCLUDE 'header.inc' %]	19	[% INCLUDE 'header.inc' form=formulaire %]
17		20
18	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	21	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
19	<ol>	22	<ol>
Lines 57-63 Link Here
57	<main>	60	<main>
58		61
59		62
60	<h1>Lost items</h1>	63	<h2>Lost items</h2>
61		64
62	[% IF ( get_items ) %]	65	[% IF ( get_items ) %]
63		66
Lines 195-201 Link Here
195	</li>	198	</li>
196		199
197	</ol></fieldset>	200	</ol></fieldset>
198	<fieldset class="action"> <input type="submit" value="Submit" />	201	<fieldset class="action"> <input type="submit" class="principal" value="Submit" />
199	<input type="hidden" name="get_items" value="1" /></fieldset>	202	<input type="hidden" name="get_items" value="1" /></fieldset>
200	</form>	203	</form>
201		204

Lines 3-8 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt (-4 / +7 lines)
3	[% USE Branches %]	3	[% USE Branches %]
4	[% USE ItemTypes %]	4	[% USE ItemTypes %]
5	[% SET footerjs = 1 %]	5	[% SET footerjs = 1 %]
		6	[% SET footerjs = 1 %][% formulaire = BLOCK %]
		7	[% INCLUDE 'cat-search.inc' %]
		8	[% END %]
6	[% INCLUDE 'doc-head-open.inc' %]	9	[% INCLUDE 'doc-head-open.inc' %]
7	<title>Catalog by item types &rsaquo; Reports &rsaquo; Koha</title>	10	<title>Catalog by item types &rsaquo; Reports &rsaquo; Koha</title>
8	[% INCLUDE 'doc-head-close.inc' %]	11	[% INCLUDE 'doc-head-close.inc' %]
Lines 11-17 Link Here
11	</head>	14	</head>
12		15
13	<body id="rep_itemtypes" class="rep">	16	<body id="rep_itemtypes" class="rep">
14	[% INCLUDE 'header.inc' %]	17	[% INCLUDE 'header.inc' form=formulaire %]
15		18
16	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	19	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
17	<ol>	20	<ol>
Lines 56-62 Link Here
56		59
57	[% IF ( do_it ) %]	60	[% IF ( do_it ) %]
58	[% FOREACH mainloo IN mainloop %]	61	[% FOREACH mainloo IN mainloop %]
59	<h1>Reports on item types [% IF branch %] held at [% Branches.GetName( branch ) \| html %][% END %]</h1>	62	<h2>Reports on item types [% IF branch %] held at [% Branches.GetName( branch ) \| html %][% END %]</h2>
60	<table id="itemtypest">	63	<table id="itemtypest">
61	<thead>	64	<thead>
62	<tr>	65	<tr>
Lines 81-87 Link Here
81	</table>	84	</table>
82	[% END %]	85	[% END %]
83	[% ELSE %]	86	[% ELSE %]
84	<h1>View a count of items held at your library grouped by item type</h1>	87	<h2>View a count of items held at your library grouped by item type</h2>
85	<form method="post" action="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">	88	<form method="post" action="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">
86	<fieldset class="rows">	89	<fieldset class="rows">
87	<ol>	90	<ol>
Lines 95-101 Link Here
95	</li>	98	</li>
96	</ol>	99	</ol>
97	</fieldset>	100	</fieldset>
98	<fieldset class="action"><input type="submit" value="Submit" />	101	<fieldset class="action"><input type="submit" class="principal" value="Submit" />
99	<input type="hidden" name="report_name" value="[% report_name \| html %]" />	102	<input type="hidden" name="report_name" value="[% report_name \| html %]" />
100	<input type="hidden" name="do_it" value="1" />	103	<input type="hidden" name="do_it" value="1" />
101	</fieldset>	104	</fieldset>

Lines 2-14 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt (-7 / +9 lines)
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE Price %]	3	[% USE Price %]
4	[% USE TablesSettings %]	4	[% USE TablesSettings %]
5	[% SET footerjs = 1 %]	5	[% SET footerjs = 1 %][% formulaire = BLOCK %]
		6	[% INCLUDE 'cat-search.inc' %]
		7	[% END %]
6	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
7	<title>Orders by fund &rsaquo; Reports &rsaquo; Koha</title>	9	<title>Orders by fund &rsaquo; Reports &rsaquo; Koha</title>
8	[% INCLUDE 'doc-head-close.inc' %]	10	[% INCLUDE 'doc-head-close.inc' %]
9	</head>	11	</head>
10	<body id="rep_orders_by_budget" class="rep">	12	<body id="rep_orders_by_budget" class="rep">
11	[% INCLUDE 'header.inc' %]	13	[% INCLUDE 'header.inc' form=formulaire %]
12		14
13	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	15	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
14	<ol>	16	<ol>
Lines 51-58 Link Here
51	<main>	53	<main>
52		54
53		55
54	[% IF ( current_budget_name ) %]<h1>Orders for fund '[% current_budget_name \| html %]'</h1>	56	[% IF ( current_budget_name ) %]<h2>Orders for fund '[% current_budget_name \| html %]'</h2>
55	[% ELSE %]<h1>Orders by fund</h1>	57	[% ELSE %]<h2>Orders by fund</h2>
56	[% END %]	58	[% END %]
57		59
58	[% IF ( get_orders ) %]	60	[% IF ( get_orders ) %]
Lines 108-114 Link Here
108	[% ELSE %]	110	[% ELSE %]
109	<form name="f" action="/cgi-bin/koha/reports/orders_by_fund.pl" method="post">	111	<form name="f" action="/cgi-bin/koha/reports/orders_by_fund.pl" method="post">
110	<fieldset class="rows">	112	<fieldset class="rows">
111	<legend>Filters</legend>	113	<h3>Filters</h3>
112	<ol><li><label for="budgetfilter">Fund: </label>	114	<ol><li><label for="budgetfilter">Fund: </label>
113	<select name="budgetfilter" id="budgetfilter">	115	<select name="budgetfilter" id="budgetfilter">
114	<option value="">All funds</option>	116	<option value="">All funds</option>
Lines 130-136 Link Here
130	</fieldset>	132	</fieldset>
131		133
132	<fieldset class="rows">	134	<fieldset class="rows">
133	<legend>Output</legend>	135	<h3>Output</h3>
134	<ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> </li>	136	<ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> </li>
135	<li><label for="outputfile">To a file:</label>	137	<li><label for="outputfile">To a file:</label>
136	<input type="radio" name="output" value="file" id="outputfile" />	138	<input type="radio" name="output" value="file" id="outputfile" />
Lines 158-164 Link Here
158	</fieldset>	160	</fieldset>
159		161
160	<fieldset class="action">	162	<fieldset class="action">
161	<input type="submit" value="Submit" />	163	<input type="submit" class="principal" value="Submit" />
162	<input type="hidden" name="get_orders" value="1" /></fieldset>	164	<input type="hidden" name="get_orders" value="1" /></fieldset>
163	</form>	165	</form>
164		166




[% formulaire = BLOCK %]
    [% INCLUDE 'circ-search.inc' %]
[% END %]
[% USE Koha %]
[% USE raw %]
[% INCLUDE 'doc-head-open.inc' %]

[% INCLUDE 'doc-head-close.inc' %]
</head>
<body id="rep_reports-home" class="rep">
[% INCLUDE 'header.inc' form=formulaire %]

<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
    <ol>

                                <input name="filter_set" value="1" type="hidden">
                                [% IF ( CAN_user_reports_create_reports ) %]
                                    <p>
                                        <a id="lientype" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new"><i class="fa fa-code-fork"></i> Create guided report</a>
                                    </p>
                                    <p>
                                        <a id="lientype" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create%20report%20from%20SQL"><i class="fa fa-plus"></i> Create from SQL</a>
                                    </p>
                                [% END %]
                                <p>
                                    <a id="lientype" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved"><i class="fa fa-list"></i> Use saved</a>
                                </p>
                                <label for="filter_keyword">Search by keyword:</label> <input id="filter_keyword" name="filter_keyword" value="" size="16" type="text" /> <input value="Search" class="principal" type="submit" />
                            </fieldset>
                        </form>
                    [% END %]

        <h2>Reports dictionary</h2>
        <ul>
            <li><a href="/cgi-bin/koha/reports/dictionary.pl?phase=View%20Dictionary">View dictionary</a></li>
        </ul>




<h1>Holds statistics</h1>
[% IF ( do_it ) %]
    [% IF ( mainloop ) %]
        <h2>Holds statistics</h2>
        [% IF ( loopfilter ) %]
            <p>Filtered on:</p>
            <ul>


    <form method="post" action="/cgi-bin/koha/reports/reserves_stats.pl">
    <fieldset class="rows">
	<h3>Holds statistics</h3><table>
        <thead>
            <tr>
                <th>Title</th>

        </tbody>
    </table><br /></fieldset>

<fieldset class="rows"><h3>Cell value </h3><ol><li><label for="cellvalue1">Count holds:</label> <input type="radio" name="Cellvalue" value="1" id="cellvalue1" checked="checked" /> </li>
            <li><label for="cellvalue2">Count unique borrowers:</label> <input type="radio" name="Cellvalue" value="2" id="cellvalue2" /> </li><li><label for="cellvalue3">Count unique items:</label> <input type="radio" name="Cellvalue" id="cellvalue3" value="3" /> </li><li><label for="cellvalue4">Count unique bibliographic records:</label> <input type="radio" name="Cellvalue" id="cellvalue4" value="4" /> </li></ol></fieldset>
			
	<fieldset class="rows">
	<h3>Output</h3>
    <ol>
        <li>
            <label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" />

	</fieldset>

	<fieldset class="action">
	<input type="submit" class="principal" value="Submit" />
	<input type="hidden" name="report_name" value="[% report_name | html %]" />
	<input type="hidden" name="do_it" value="1" />
	</fieldset>




        <div class="col-sm-10 col-sm-push-2">
            <main>

	<h2>Serials subscriptions</h2>
[% IF ( do_it ) %]
	<table id="resulttable">
		<thead>



	<fieldset class="brief">
	<h3>Output</h3>
    <ol>
        <li>
            <label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" />

	</fieldset>

	<fieldset class="action">
	<input type="submit" class="principal" value="Submit" />
	<input type="hidden" name="report_name" value="[% report_name | html %]" />
	<input type="hidden" name="do_it" value="1" />
	</fieldset>

Lines 13-18 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-17 / +56 lines)
13	[% USE TablesSettings %]	13	[% USE TablesSettings %]
14	[% PROCESS 'i18n.inc' %]	14	[% PROCESS 'i18n.inc' %]
15	[% SET footerjs = 1 %]	15	[% SET footerjs = 1 %]
		16	[% formulaire = BLOCK %]
		17	[% INCLUDE 'circ-search.inc' %]
		18	[% END %]
16	[% INCLUDE 'doc-head-open.inc' %]	19	[% INCLUDE 'doc-head-open.inc' %]
17	[% SET libraries = Branches.all %]	20	[% SET libraries = Branches.all %]
18	[% SET categories = Categories.all.unblessed %]	21	[% SET categories = Categories.all.unblessed %]
Lines 29-36 Link Here
29		32
30	<body id="circ_request" class="catalog">	33	<body id="circ_request" class="catalog">
31		34
32	[% INCLUDE 'header.inc' %]	35	[% INCLUDE 'header.inc' form=formulaire %]
33	[% INCLUDE 'circ-search.inc' %]
34		36
35	[% UNLESS ( multi_hold ) %]	37	[% UNLESS ( multi_hold ) %]
36	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	38	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
Lines 50-55 Link Here
50	</a>	52	</a>
51	</li>	53	</li>
52	</ol>	54	</ol>
		55	<ol>
		56	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		57	</ol>
		58	<ol>
		59	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		60	</ol>
53	</nav>	61	</nav>
54	[% ELSE %]	62	[% ELSE %]
55	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	63	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
Lines 78-83 Link Here
78	[% END %]	86	[% END %]
79	</li>	87	</li>
80	</ol>	88	</ol>
		89	<ol>
		90	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		91	</ol>
		92	<ol>
		93	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		94	</ol>
81	</nav>	95	</nav>
82	[% END # UNLESS multi_hold %]	96	[% END # UNLESS multi_hold %]
83		97
Lines 117-123 Link Here
117	<p>Hold placed by : <strong> [% nextreservsurname \| html %] [% nextreservfirstname \| html %]</strong> at : <strong> [% branchname \| html %] </strong>, Please transfer this item.	131	<p>Hold placed by : <strong> [% nextreservsurname \| html %] [% nextreservfirstname \| html %]</strong> at : <strong> [% branchname \| html %] </strong>, Please transfer this item.
118	</p>	132	</p>
119	<form name="cancelReservewithtransfert" action="branchreserves.pl" method="post">	133	<form name="cancelReservewithtransfert" action="branchreserves.pl" method="post">
120	<input type="submit" class="button" />	134	<input type="submit" class="principal" />
121	</form>	135	</form>
122	</div>	136	</div>
123	[% END %]	137	[% END %]
Lines 167-175 Link Here
167	<li role="presentation"><a href="#holds_clubsearch_pane" aria-controls="holds_clubsearch_pane" role="tab" data-toggle="tab">Clubs</a></li>	181	<li role="presentation"><a href="#holds_clubsearch_pane" aria-controls="holds_clubsearch_pane" role="tab" data-toggle="tab">Clubs</a></li>
168	[% END %]	182	[% END %]
169	</ul>	183	</ul>
170	<div class="tab-content">	184	<div id="holds_patronsearch_pane">
171	<div id="holds_patronsearch_pane" role="tabpanel" class="tab-pane active">	185	[% PROCESS patron_search_filters_simple %]
172	[% PROCESS patron_search_filters_simple %]	186	<form id="holds_patronsearch" action="request.pl?biblionumbers=[% biblionumbers \| html %]" method="post">
		187	<div class="hint">Enter patron card number or partial name:</div>
		188	<input type="text" size="40" id="patron" class="focus" name="findborrower" autocomplete="off" />
		189	<input type="submit" class="principal" value="Search" />
		190	[% IF multi_hold %]
		191	<input type="hidden" name="biblionumbers" value="[% biblionumbers \| html %]"/>
		192	[% ELSE %]
		193	<input type="hidden" name="biblionumber" value="[% biblionumber \| html %]" />
		194	[% END %]
		195
		196	</form> <!-- /#holds_patronsearch -->
		197	[% IF borrowers %]
		198	[% INCLUDE 'circ-patron-search-results.inc' destination = "holds" %]
		199	[% END %]
		200	</div>
		201	[% IF clubcount %]
		202	<div id="holds_clubsearch_pane">
		203	<form id="holds_clubsearch" action="request.pl?biblionumbers=[% biblionumbers \| html %]" method="post">
		204	<div class="hint">Enter club ID or partial name:</div>
		205	<input type="text" size="40" id="club" class="focus" name="findclub" autocomplete="off" />
		206	<input type="submit" class="principal" value="Search" />
		207	[% IF multi_hold %]
		208	<input type="hidden" name="biblionumbers" value="[% biblionumbers \| html %]"/>
		209	[% ELSE %]
		210	<input type="hidden" name="biblionumber" value="[% biblionumber \| html %]" />
		211	[% END %]
173		212
174	[% PROCESS patron_search_table table_id => 'table_borrowers', open_on_row_click => 1 %]	213	[% PROCESS patron_search_table table_id => 'table_borrowers', open_on_row_click => 1 %]
175	</div>	214	</div>
Lines 272-278 Link Here
272	[% END %]	311	[% END %]
273	[% UNLESS ( multi_hold ) %]	312	[% UNLESS ( multi_hold ) %]
274	<fieldset class="action">	313	<fieldset class="action">
275	<input type="submit" value="Place hold" />	314	<input type="submit" class="principal" value="Place hold" />
276	</fieldset>	315	</fieldset>
277	[% ELSE %]	316	[% ELSE %]
278	<table id="requesttitles">	317	<table id="requesttitles">
Lines 565-575 Link Here
565	<fieldset class="action">	604	<fieldset class="action">
566	[% IF ( patron.borrowernumber ) %]	605	[% IF ( patron.borrowernumber ) %]
567	[% IF ( override_required ) %]	606	[% IF ( override_required ) %]
568	<button type="submit" class="btn btn-default warning"><i class="fa fa-exclamation-triangle "></i> Place hold</button>	607	<button type="submit" class="btn btn-default warning" id="lientype"><i class="fa fa-exclamation-triangle "></i> Place hold</button>
569	[% ELSIF ( none_available ) %]	608	[% ELSIF ( none_available ) %]
570	<button type="submit" disabled="disabled" class="btn btn-default btn-disabled">Place hold</button>	609	<button type="submit" disabled="disabled" class="btn btn-default btn-disabled" id="lientype">Place hold</button>
571	[% ELSE %]	610	[% ELSE %]
572	<button type="submit" class="btn btn-default">Place hold</button>	611	<button type="submit" class="btn btn-default" id="lientype">Place hold</button>
573	[% END %]	612	[% END %]
574	[% END %]	613	[% END %]
575	</fieldset>	614	</fieldset>
Lines 895-915 Link Here
895	[% IF ( patron AND patron.borrowernumber ) %]	934	[% IF ( patron AND patron.borrowernumber ) %]
896	[% IF ( multi_hold ) %]	935	[% IF ( multi_hold ) %]
897	[% IF ( override_required ) %]	936	[% IF ( override_required ) %]
898	<button type="submit" class="btn btn-default warning"><i class="fa fa-exclamation-triangle "></i> Place holds</button>	937	<button type="submit" class="btn btn-default warning" id="lientype"><i class="fa fa-exclamation-triangle "></i> Place holds</button>
899	[% ELSIF ( no_bibs_available ) %]	938	[% ELSIF ( no_bibs_available ) %]
900	<button type="submit" class="btn btn-default btn-disabled" disabled="disabled">Place holds</button>	939	<button type="submit" class="btn btn-default btn-disabled" disabled="disabled" id="lientype">Place holds</button>
901	[% ELSIF ( none_available ) %]	940	[% ELSIF ( none_available ) %]
902	<button type="submit" class="btn btn-default">Place holds</button>	941	<button type="submit" class="btn btn-default" id="lientype">Place holds</button>
903	[% ELSE %]	942	[% ELSE %]
904	<button type="submit" class="btn btn-default" id="multi_hold_submit">Place holds</button>	943	<button type="submit" class="btn btn-default" id="multi_hold_submit">Place holds</button>
905	[% END %]	944	[% END %]
906	[% ELSE %]	945	[% ELSE %]
907	[% IF ( override_required ) %]	946	[% IF ( override_required ) %]
908	<button type="submit" class="btn btn-default warning"><i class="fa fa-exclamation-triangle "></i> Place hold</button>	947	<button type="submit" class="btn btn-default warning" id="lientype"><i class="fa fa-exclamation-triangle "></i> Place hold</button>
909	[% ELSIF ( none_available ) %]	948	[% ELSIF ( none_available ) %]
910	<button type="submit" class="btn btn-default btn-disabled" disabled="disabled">Place hold</button>	949	<button type="submit" class="btn btn-default btn-disabled" disabled="disabled" id="lientype">Place hold</button>
911	[% ELSE %]	950	[% ELSE %]
912	<button type="submit" class="btn btn-default">Place hold</button>	951	<button type="submit" class="btn btn-default" id="lientype" id="lientype">Place hold</button>
913	[% END %]	952	[% END %]
914	[% END %]	953	[% END %]
915	[% END # /IF patron %]	954	[% END # /IF patron %]
Lines 950-956 Link Here
950		989
951	<h2>Existing holds</h2>	990	<h2>Existing holds</h2>
952	<div id="toolbar" class="btn-toolbar">	991	<div id="toolbar" class="btn-toolbar">
953	<input type="submit" name="submit" value="Update hold(s)" /> <button class="cancel_selected_holds" data-bulk="true"></button>	992	<input type="submit" name="submit" class="principal" value="Update hold(s)" /> <button class="cancel_selected_holds" data-bulk="true"></button>
954	<fieldset id="cancellation-reason-fieldset" class="action">	993	<fieldset id="cancellation-reason-fieldset" class="action">
955	[% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %]	994	[% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %]
956	[% IF hold_cancellation.count %]	995	[% IF hold_cancellation.count %]

Lines 1-13 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt (-2 / +10 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'cat-search.inc' %]
		6	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
5	<title>[% IF ( status ) %]Approved comments[% ELSE %]Comments awaiting moderation[% END %] &rsaquo; Comments &rsaquo; Tools &rsaquo; Koha</title>	8	<title>[% IF ( status ) %]Approved comments[% ELSE %]Comments awaiting moderation[% END %] &rsaquo; Comments &rsaquo; Tools &rsaquo; Koha</title>
6	[% INCLUDE 'doc-head-close.inc' %]	9	[% INCLUDE 'doc-head-close.inc' %]
7	</head>	10	</head>
8	<body id="tools_reviewswaiting" class="tools">	11	<body id="tools_reviewswaiting" class="tools">
9	[% INCLUDE 'header.inc' %]	12	[% INCLUDE 'header.inc' form=formulaire %]
10	[% INCLUDE 'cat-search.inc' %]
11		13
12	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	14	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
13	<ol>	15	<ol>
Lines 30-35 Link Here
30	</a>	32	</a>
31	</li>	33	</li>
32	</ol>	34	</ol>
		35	<ol>
		36	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		37	</ol>
		38	<ol>
		39	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		40	</ol>
33	</nav>	41	</nav>
34		42
35	<div class="main container-fluid">	43	<div class="main container-fluid">

Lines 1-14 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt (-2 / +10 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'cat-search.inc' %]
		6	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
5	<title>Add or remove items &rsaquo; Collection [% colTitle \| html %] &rsaquo; Rotating collections &rsaquo; Tools &rsaquo; Koha</title>	8	<title>Add or remove items &rsaquo; Collection [% colTitle \| html %] &rsaquo; Rotating collections &rsaquo; Tools &rsaquo; Koha</title>
6	[% INCLUDE 'doc-head-close.inc' %]	9	[% INCLUDE 'doc-head-close.inc' %]
7	</head>	10	</head>
8		11
9	<body id="rcoll_addItems" class="tools rcoll">	12	<body id="rcoll_addItems" class="tools rcoll">
10	[% INCLUDE 'header.inc' %]	13	[% INCLUDE 'header.inc' form=formulaire %]
11	[% INCLUDE 'cat-search.inc' %]
12		14
13	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	15	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
14	<ol>	16	<ol>
Lines 30-35 Link Here
30	</a>	32	</a>
31	</li>	33	</li>
32	</ol>	34	</ol>
		35	<ol>
		36	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		37	</ol>
		38	<ol>
		39	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		40	</ol>
33	</nav>	41	</nav>
34		42
35	<div class="main container-fluid">	43	<div class="main container-fluid">

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt (-2 / +10 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'cat-search.inc' %]
		6	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
5	<title>	8	<title>
6	[%- IF ( action == "new" ) %]	9	[%- IF ( action == "new" ) %]
Lines 12-19 Link Here
12	[% INCLUDE 'doc-head-close.inc' %]	15	[% INCLUDE 'doc-head-close.inc' %]
13	</head>	16	</head>
14	<body id="rcoll_editCollections" class="tools rcoll">	17	<body id="rcoll_editCollections" class="tools rcoll">
15	[% INCLUDE 'header.inc' %]	18	[% INCLUDE 'header.inc' form=formulaire %]
16	[% INCLUDE 'cat-search.inc' %]
17		19
18	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	20	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
19	<ol>	21	<ol>
Lines 44-49 Link Here
44	</li>	46	</li>
45	[% END -%]	47	[% END -%]
46	</ol>	48	</ol>
		49	<ol>
		50	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		51	</ol>
		52	<ol>
		53	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		54	</ol>
47	</nav>	55	</nav>
48		56
49	<div class="main container-fluid">	57	<div class="main container-fluid">

Lines 2-15 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt (-2 / +10 lines)
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE Branches %]	3	[% USE Branches %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE 'cat-search.inc' %]
		7	[% END %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	<title>Rotating collections &rsaquo; Tools &rsaquo; Koha</title>	9	<title>Rotating collections &rsaquo; Tools &rsaquo; Koha</title>
7	[% INCLUDE 'doc-head-close.inc' %]	10	[% INCLUDE 'doc-head-close.inc' %]
8	</head>	11	</head>
9		12
10	<body id="rcoll_rotatingCollections" class="tools rcoll">	13	<body id="rcoll_rotatingCollections" class="tools rcoll">
11	[% INCLUDE 'header.inc' %]	14	[% INCLUDE 'header.inc' form=formulaire %]
12	[% INCLUDE 'cat-search.inc' %]
13		15
14	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	16	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
15	<ol>	17	<ol>
Lines 25-30 Link Here
25	</a>	27	</a>
26	</li>	28	</li>
27	</ol>	29	</ol>
		30	<ol>
		31	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		32	</ol>
		33	<ol>
		34	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		35	</ol>
28	</nav>	36	</nav>
29		37
30	<div class="main container-fluid">	38	<div class="main container-fluid">

Lines 2-14 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt (-2 / +10 lines)
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE Branches %]	3	[% USE Branches %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE 'cat-search.inc' %]
		7	[% END %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	<title>Transfer collection &rsaquo; Rotating collections &rsaquo; Tools &rsaquo; Koha</title>	9	<title>Transfer collection &rsaquo; Rotating collections &rsaquo; Tools &rsaquo; Koha</title>
7	[% INCLUDE 'doc-head-close.inc' %]	10	[% INCLUDE 'doc-head-close.inc' %]
8	</head>	11	</head>
9	<body id="rcoll_transferCollection" class="tools rcoll">	12	<body id="rcoll_transferCollection" class="tools rcoll">
10	[% INCLUDE 'header.inc' %]	13	[% INCLUDE 'header.inc' form=formulaire %]
11	[% INCLUDE 'cat-search.inc' %]
12		14
13	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	15	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
14	<ol>	16	<ol>
Lines 30-35 Link Here
30	</a>	32	</a>
31	</li>	33	</li>
32	</ol>	34	</ol>
		35	<ol>
		36	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		37	</ol>
		38	<ol>
		39	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		40	</ol>
33	</nav>	41	</nav>
34		42
35	<div class="main container-fluid">	43	<div class="main container-fluid">




[% USE Branches %]
[% USE KohaDates %]
[% SET footerjs = 1 %]
[% formulaire = BLOCK %]
    [% INCLUDE 'serials-search.inc' %]
[% END %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Check expiration &rsaquo; Serials &rsaquo; Koha</title>
[% INCLUDE 'doc-head-close.inc' %]
</head>

<body id="ser_checkexpiration" class="ser">
[% INCLUDE 'header.inc' form=formulaire %]

<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
    <ol>

        <div class="col-sm-10 col-sm-push-2">
            <main>

<h2>Check expiration</h2>

    <form name="f" action="/cgi-bin/koha/serials/checkexpiration.pl" method="get" class="validated">
<fieldset class="rows">
    <h3>Filter results:</h3>
    
         <ol>
        <ol>

            [% END %]
        </li>
        </ol>
<fieldset class="action"><input type="submit" class="principal" value="Search" /></fieldset>
</fieldset>
<fieldset class="action"><input type="submit" value="Search" /></fieldset>
</form>

[% IF ( subscriptions_loop ) %]

Lines 3-15 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt (-4 / +7 lines)
3	[% USE AuthorisedValues %]	3	[% USE AuthorisedValues %]
4	[% USE Branches %]	4	[% USE Branches %]
5	[% SET footerjs = 1 %]	5	[% SET footerjs = 1 %]
		6	[% formulaire = BLOCK %]
		7	[% INCLUDE 'serials-search.inc' %]
		8	[% END %]
6	[% INCLUDE 'doc-head-open.inc' %]	9	[% INCLUDE 'doc-head-open.inc' %]
7	<title>[% IF ( supplierid ) -%] Claims for [% suppliername \| html %] [% END %] &rsaquo; Claims &rsaquo; Serials &rsaquo; Koha</title>	10	<title>[% IF ( supplierid ) -%] Claims for [% suppliername \| html %] [% END %] &rsaquo; Claims &rsaquo; Serials &rsaquo; Koha</title>
8	[% INCLUDE 'doc-head-close.inc' %]	11	[% INCLUDE 'doc-head-close.inc' %]
9	</head>	12	</head>
10		13
11	<body id="ser_claims" class="ser">	14	<body id="ser_claims" class="ser">
12	[% INCLUDE 'header.inc' %]	15	[% INCLUDE 'header.inc' form=formulaire %]
13	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	16	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
14	<ol>	17	<ol>
15	<li>	18	<li>
Lines 50-56 Link Here
50	<div class="col-sm-10 col-sm-push-2">	53	<div class="col-sm-10 col-sm-push-2">
51	<main>	54	<main>
52		55
53	<h1>Claims [% IF ( suppliername ) %] for [% suppliername \| html %] [% END %]</h1>	56	<h2>Claims [% IF ( suppliername ) %] for [% suppliername \| html %] [% END %]</h2>
54		57
55	[% IF error_claim %]	58	[% IF error_claim %]
56	[% IF error_claim == 'no_vendor_email' %]	59	[% IF error_claim == 'no_vendor_email' %]
Lines 86-92 Link Here
86	</option>	89	</option>
87	[% END %]	90	[% END %]
88	</select>	91	</select>
89	<input type="submit" value="OK" />	92	<input type="submit" class="principal" value="OK" />
90	</fieldset>	93	</fieldset>
91	</form>	94	</form>
92		95
Lines 94-100 Link Here
94	<h3>Missing issues</h3>	97	<h3>Missing issues</h3>
95	<form action="claims.pl" id="filter_claims_form">	98	<form action="claims.pl" id="filter_claims_form">
96	<fieldset class="rows">	99	<fieldset class="rows">
97	<legend>Filters :</legend>	100	<h3>Filters :</h3>
98		101
99	<ol>	102	<ol>
100	<li>	103	<li>

Lines 1-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt (-2 / +10 lines)
1	[% SET footerjs = 1 %]	1	[% SET footerjs = 1 %]
		2	[% formulaire = BLOCK %]
		3	[% INCLUDE 'serials-search.inc' %]
		4	[% END %]
2	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
3	<title>Preview routing list &rsaquo; Serials &rsaquo; Koha</title>	6	<title>Preview routing list &rsaquo; Serials &rsaquo; Koha</title>
4	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]
5	</head>	8	</head>
6		9
7	<body id="ser_routing-preview" class="ser">	10	<body id="ser_routing-preview" class="ser">
8	[% INCLUDE 'header.inc' %]	11	[% INCLUDE 'header.inc' form=formulaire %]
9	[% INCLUDE 'serials-search.inc' %]
10		12
11	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	13	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
12	<ol>	14	<ol>
Lines 25-30 Link Here
25	</a>	27	</a>
26	</li>	28	</li>
27	</ol>	29	</ol>
		30	<ol>
		31	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		32	</ol>
		33	<ol>
		34	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		35	</ol>
28	</nav>	36	</nav>
29		37
30	<div class="main container-fluid">	38	<div class="main container-fluid">

Lines 1-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt (-2 / +10 lines)
1	[% USE KohaDates %]	1	[% USE KohaDates %]
2	[% SET footerjs = 1 %]	2	[% SET footerjs = 1 %]
		3	[% formulaire = BLOCK %]
		4	[% INCLUDE 'serials-search.inc' %]
		5	[% END %]
3	[% INCLUDE 'doc-head-open.inc' %]	6	[% INCLUDE 'doc-head-open.inc' %]
4	<title>[% IF ( op ) %]Create routing list[% ELSE %]Edit routing list[% END %] &rsaquo; [% title \| html %] &rsaquo; Serials &rsaquo; Koha</title>	7	<title>[% IF ( op ) %]Create routing list[% ELSE %]Edit routing list[% END %] &rsaquo; [% title \| html %] &rsaquo; Serials &rsaquo; Koha</title>
5	[% INCLUDE 'doc-head-close.inc' %]	8	[% INCLUDE 'doc-head-close.inc' %]
6	</head>	9	</head>
7	<body id="ser_routing" class="ser">	10	<body id="ser_routing" class="ser">
8	[% INCLUDE 'header.inc' %]	11	[% INCLUDE 'header.inc' form=formulaire %]
9	[% INCLUDE 'serials-search.inc' %]
10		12
11	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	13	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
12	<ol>	14	<ol>
Lines 39-44 Link Here
39	</li>	41	</li>
40	[% END %]	42	[% END %]
41	</ol>	43	</ol>
		44	<ol>
		45	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		46	</ol>
		47	<ol>
		48	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		49	</ol>
42	</nav>	50	</nav>
43		51
44	<div class="main container-fluid">	52	<div class="main container-fluid">

Lines 4-17 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt (-2 / +10 lines)
4	[% USE Branches %]	4	[% USE Branches %]
5	[% USE KohaDates %]	5	[% USE KohaDates %]
6	[% SET footerjs = 1 %]	6	[% SET footerjs = 1 %]
		7	[% formulaire = BLOCK %]
		8	[% INCLUDE 'serials-search.inc' %]
		9	[% END %]
7	[% INCLUDE 'doc-head-open.inc' %]	10	[% INCLUDE 'doc-head-open.inc' %]
8	<title>Serial collection information for [% bibliotitle \| html %] &rsaquo; Serials &rsaquo; Koha</title>	11	<title>Serial collection information for [% bibliotitle \| html %] &rsaquo; Serials &rsaquo; Koha</title>
9	[% INCLUDE 'doc-head-close.inc' %]	12	[% INCLUDE 'doc-head-close.inc' %]
10	</head>	13	</head>
11		14
12	<body id="ser_serials-collection" class="ser">	15	<body id="ser_serials-collection" class="ser">
13	[% INCLUDE 'header.inc' %]	16	[% INCLUDE 'header.inc' form=formulaire %]
14	[% INCLUDE 'serials-search.inc' %]
15		17
16	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	18	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
17	<ol>	19	<ol>
Lines 27-32 Link Here
27	</a>	29	</a>
28	</li>	30	</li>
29	</ol>	31	</ol>
		32	<ol>
		33	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		34	</ol>
		35	<ol>
		36	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		37	</ol>
30	</nav>	38	</nav>
31		39
32	<div class="main container-fluid">	40	<div class="main container-fluid">

Lines 1-3 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt (-2 / +11 lines)
		1
		2	[% formulaire = BLOCK %]
		3	[% INCLUDE 'serials-search.inc' %]
		4	[% END %]
1	[% USE raw %]	5	[% USE raw %]
2	[% USE Asset %]	6	[% USE Asset %]
3	[% USE AuthorisedValues %]	7	[% USE AuthorisedValues %]
Lines 78-85 $(document).ready(function() { Link Here
78	}</style>	82	}</style>
79	</head>	83	</head>
80	<body id="ser_serials-edit" class="ser">	84	<body id="ser_serials-edit" class="ser">
81	[% INCLUDE 'header.inc' %]	85	[% INCLUDE 'header.inc' form=formulaire %]
82	[% INCLUDE 'serials-search.inc' %]
83		86
84	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	87	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
85	<ol>	88	<ol>
Lines 95-100 $(document).ready(function() { Link Here
95	</a>	98	</a>
96	</li>	99	</li>
97	</ol>	100	</ol>
		101	<ol>
		102	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		103	</ol>
		104	<ol>
		105	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		106	</ol>
98	</nav>	107	</nav>
99		108
100	<div class="main container-fluid">	109	<div class="main container-fluid">

Lines 3-14 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt (-1 / +4 lines)
3	[% USE KohaDates %]	3	[% USE KohaDates %]
4	[% USE Koha %]	4	[% USE Koha %]
5	[% SET footerjs = 1 %]	5	[% SET footerjs = 1 %]
		6	[% formulaire = BLOCK %]
		7	[% INCLUDE 'serials-search.inc' %]
		8	[% END %]
6	[% INCLUDE 'doc-head-open.inc' %]	9	[% INCLUDE 'doc-head-open.inc' %]
7	<title>Serials [% biblionumber \| html %] &rsaquo; Koha</title>	10	<title>Serials [% biblionumber \| html %] &rsaquo; Koha</title>
8	[% INCLUDE 'doc-head-close.inc' %]	11	[% INCLUDE 'doc-head-close.inc' %]
9	</head>	12	</head>
10	<body id="ser_serials-home" class="ser">	13	<body id="ser_serials-home" class="ser">
11	[% INCLUDE 'header.inc' %]	14	[% INCLUDE 'header.inc' form=formulaire %]
12		15
13	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	16	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
14	<ol>	17	<ol>

Lines 6-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt (-24 / +28 lines)
6	[% USE KohaDates %]	6	[% USE KohaDates %]
7	[% USE Koha %]	7	[% USE Koha %]
8	[% SET footerjs = 1 %]	8	[% SET footerjs = 1 %]
		9	[% formulaire = BLOCK %]
		10	[% INCLUDE 'serials-search.inc' %]
		11	[% END %]
9	[% INCLUDE 'doc-head-open.inc' %]	12	[% INCLUDE 'doc-head-open.inc' %]
10	<title>Serials [% biblionumber \| html %] &rsaquo; Koha</title>	13	<title>Serials [% biblionumber \| html %] &rsaquo; Koha</title>
11	[% INCLUDE 'doc-head-close.inc' %]	14	[% INCLUDE 'doc-head-close.inc' %]
Lines 13-19 Link Here
13	</head>	16	</head>
14		17
15	<body id="ser_serials-home" class="ser">	18	<body id="ser_serials-home" class="ser">
16	[% INCLUDE 'header.inc' %]	19	[% INCLUDE 'header.inc' form=formulaire %]
17		20
18	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	21	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
19	<ol>	22	<ol>
Lines 362-369 Link Here
362		365
363	<div class="col-sm-2 col-sm-pull-10">	366	<div class="col-sm-2 col-sm-pull-10">
364	<aside>	367	<aside>
365		368	<div id="filters">
366	[% INCLUDE 'serials-menu.inc' %]
367	[% IF ( done_searched ) %]	369	[% IF ( done_searched ) %]
368	[% UNLESS ( mana ) %]	370	[% UNLESS ( mana ) %]
369	<div id="advsearch">	371	<div id="advsearch">
Lines 372-422 Link Here
372	<h4>Search subscriptions</h4>	374	<h4>Search subscriptions</h4>
373	<ol>	375	<ol>
374	<li>	376	<li>
375	<label for="issn">ISSN:</label>	377	<p for="issn">ISSN:
376	<input type="text" id="issn" name="ISSN_filter" value="[% ISSN_filter \| html %]" />	378	<input type="text" id="issn" name="ISSN_filter" value="[% ISSN_filter \| html %]" /></p>
377	</li>	379	</li>
378	<li>	380	<li>
379	<label for="title">Title:</label>	381	<p for="title">Title:
380	<input type="text" id="title" name="title_filter" value="[% title_filter \| html %]" />	382	<input type="text" id="title" name="title_filter" value="[% title_filter \| html %]" /></p>
381	</li>	383	</li>
382	[% IF ( marcflavour == "UNIMARC" ) %]	384	[% IF ( marcflavour == "UNIMARC" ) %]
383	<li>	385	<li>
384	<label for="ean">EAN:</label>	386	<p for="ean">EAN:
385	<input type="text" id="ean" name="EAN_filter" value="[% EAN_filter \| html %]" />	387	<input type="text" id="ean" name="EAN_filter" value="[% EAN_filter \| html %]" /></p>
386	</li>	388	</li>
387	[% END %]	389	[% END %]
388	<li>	390	<li>
389	<label for="callnumber">Call number:</label>	391	<p for="callnumber">Call number:
390	<input type="text" id="callnumber" name="callnumber_filter" value="[% callnumber_filter \| html %]" />	392	<input type="text" id="callnumber" name="callnumber_filter" value="[% callnumber_filter \| html %]" /></p>
391	</li>	393	</li>
392	<li>	394	<li>
393	<label for="publisher">Publisher:</label>	395	<p for="publisher">Publisher:
394	<input type="text" id="publisher" name="publisher_filter" value="[% publisher_filter \| html %]" />	396	<input type="text" id="publisher" name="publisher_filter" value="[% publisher_filter \| html %]" /></p>
395	</li>	397	</li>
396	<li>	398	<li>
397	<label for="bookseller">Vendor:</label>	399	<p for="bookseller">Vendor:
398	<input type="text" id="bookseller" name="bookseller_filter" value="[% bookseller_filter \| html %]" />	400	<input type="text" id="bookseller" name="bookseller_filter" value="[% bookseller_filter \| html %]" /></p>
399	</li>	401	</li>
400	<li>	402	<li>
401	<label for="branch">Library:</label>	403	<p for="branch">Library:
402	<select id="branch" name="branch_filter">	404	<select id="branch" name="branch_filter">
403	<option value="">All</option>	405	<option value="">All</option>
404	[%# FIXME Should not we filter the libraries? %]	406	[%# FIXME Should not we filter the libraries? %]
405	[% PROCESS options_for_libraries libraries => Branches.all( selected => branch_filter, unfiltered => 1 ) %]	407	[% PROCESS options_for_libraries libraries => Branches.all( selected => branch_filter, unfiltered => 1 ) %]
406	</select>	408	</select></p>
407	</li>	409	</li>
408	<li>	410	<li>
409	<label for="location">Location:</label>	411	<p for="location">Location:
410	[% PROCESS 'av-build-dropbox.inc' name="location_filter", category="LOC", default=location_filter, all=1 %]	412	[% PROCESS 'av-build-dropbox.inc' name="location_filter", category="LOC", default=location_filter, all=1 %]</p>
411	</li>	413	</li>
412	<li>	414	<li>
413	<label for="to">Expires before:</label>	415	<p for="to">Expires before:
414	<input type="text" id="to" name="expiration_date_filter" value="[% expiration_date_filter \| $KohaDates %]" size="10" maxlength="10" class="flatpickr" />	416	<input type="text" id="to" name="expiration_date_filter" value="[% expiration_date_filter \| $KohaDates %]" size="10" maxlength="10" class="flatpickr" />
415	</li>	417	</p></li>
416		418
417	[% FOR field IN additional_fields_for_subscription %]	419	[% FOR field IN additional_fields_for_subscription %]
418	<li>	420	<li>
419	<label for="additional_field_[% field.id \| html %]ID"> [% field.name \| html %]: </label>	421	<p for="additional_field_[% field.id \| html %]ID"> [% field.name \| html %]:
420	[% IF field.authorised_value_category %]	422	[% IF field.authorised_value_category %]
421	<select id="additional_field_[% field.id \| html %]" name="additional_field_[% field.id \| html %]">	423	<select id="additional_field_[% field.id \| html %]" name="additional_field_[% field.id \| html %]">
422	<option value="">All</option>	424	<option value="">All</option>
Lines 430-442 Link Here
430	</select>	432	</select>
431	[% ELSE %]	433	[% ELSE %]
432	<input id="additional_field_[% field.id \| html %]" type="text" value="[% additional_field_filters.${field.id} \| html %]" name="additional_field_[% field.id \| html %]" />	434	<input id="additional_field_[% field.id \| html %]" type="text" value="[% additional_field_filters.${field.id} \| html %]" name="additional_field_[% field.id \| html %]" />
433	[% END %]	435	[% END %]</p>
434	</li>	436	</li>
435	[% END %]	437	[% END %]
436	</ol>	438	</ol>
437	<input type="hidden" name="searched" value="1" />	439	<input type="hidden" name="searched" value="1" />
438	<fieldset class="action">	440	<fieldset class="action">
439	<input type="submit" value="Search" />	441	<input type="submit" class="principal" value="Search" />
440	</fieldset>	442	</fieldset>
441		443
442	</fieldset> <!-- /.brief -->	444	</fieldset> <!-- /.brief -->
Lines 444-449 Link Here
444	</div> <!-- /#advsearch -->	446	</div> <!-- /#advsearch -->
445	[% END # / UNLESS ( mana ) %]	447	[% END # / UNLESS ( mana ) %]
446	[% END # / IF ( done_searched ) %]	448	[% END # / IF ( done_searched ) %]
		449	[% INCLUDE 'serials-menu.inc' %]
		450	</div>
447	</aside>	451	</aside>
448	</div> <!-- /.col-sm-2.col-sm-pull-10 -->	452	</div> <!-- /.col-sm-2.col-sm-pull-10 -->
449	</div> <!-- /.row -->	453	</div> <!-- /.row -->

Lines 5-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt (-2 / +10 lines)
5	[% USE Branches %]	5	[% USE Branches %]
6	[% USE Koha %]	6	[% USE Koha %]
7	[% SET footerjs = 1 %]	7	[% SET footerjs = 1 %]
		8	[% formulaire = BLOCK %]
		9	[% INCLUDE 'serials-search.inc' %]
		10	[% END %]
8	[% INCLUDE 'doc-head-open.inc' %]	11	[% INCLUDE 'doc-head-open.inc' %]
9	<title>[% IF ( modify ) %][% bibliotitle \| html %] &rsaquo; Modify subscription[% ELSE %]New subscription[% END %] &rsaquo; Serials &rsaquo; Koha</title>	12	<title>[% IF ( modify ) %][% bibliotitle \| html %] &rsaquo; Modify subscription[% ELSE %]New subscription[% END %] &rsaquo; Serials &rsaquo; Koha</title>
10	[% INCLUDE 'doc-head-close.inc' %]	13	[% INCLUDE 'doc-head-close.inc' %]
Lines 19-26 fieldset.rows table { clear: none; margin: 0; } Link Here
19	</head>	22	</head>
20		23
21	<body id="ser_subscription-add" class="ser">	24	<body id="ser_subscription-add" class="ser">
22	[% INCLUDE 'header.inc' %]	25	[% INCLUDE 'header.inc' form=formulaire %]
23	[% INCLUDE 'serials-search.inc' %]
24		26
25	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	27	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
26	<ol>	28	<ol>
Lines 56-61 fieldset.rows table { clear: none; margin: 0; } Link Here
56	[% END %]	58	[% END %]
57	[% END %]	59	[% END %]
58	</ol>	60	</ol>
		61	<ol>
		62	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		63	</ol>
		64	<ol>
		65	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		66	</ol>
59	</nav>	67	</nav>
60		68
61	[% INCLUDE 'blocking_errors.inc' %]	69	[% INCLUDE 'blocking_errors.inc' %]

Lines 1-3 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt (-2 / +11 lines)
		1
		2	[% formulaire = BLOCK %]
		3	[% INCLUDE 'serials-search.inc' %]
		4	[% END %]
1	[% USE AuthorisedValues %]	5	[% USE AuthorisedValues %]
2	[% USE Branches %]	6	[% USE Branches %]
3	[% USE ItemTypes %]	7	[% USE ItemTypes %]
Lines 8-15 Link Here
8	[% INCLUDE 'calendar.inc' %]	12	[% INCLUDE 'calendar.inc' %]
9	</head>	13	</head>
10	<body id="ser_subscription-batchedit" class="ser">	14	<body id="ser_subscription-batchedit" class="ser">
11	[% INCLUDE 'header.inc' %]	15	[% INCLUDE 'header.inc' form=formulaire %]
12	[% INCLUDE 'serials-search.inc' %]
13		16
14	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	17	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
15	<ol>	18	<ol>
Lines 25-30 Link Here
25	</a>	28	</a>
26	</li>	29	</li>
27	</ol>	30	</ol>
		31	<ol>
		32	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		33	</ol>
		34	<ol>
		35	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		36	</ol>
28	</nav>	37	</nav>
29		38
30	<div class="main container-fluid">	39	<div class="main container-fluid">

Lines 7-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt (-2 / +10 lines)
7	[% USE Price %]	7	[% USE Price %]
8	[% USE TablesSettings %]	8	[% USE TablesSettings %]
9	[% SET footerjs = 1 %]	9	[% SET footerjs = 1 %]
		10	[% formulaire = BLOCK %]
		11	[% INCLUDE 'serials-search.inc' %]
		12	[% END %]
10	[% INCLUDE 'doc-head-open.inc' %]	13	[% INCLUDE 'doc-head-open.inc' %]
11	<title>Details for subscription #[% subscriptionid \| html %] &rsaquo; Serials &rsaquo; Koha</title>	14	<title>Details for subscription #[% subscriptionid \| html %] &rsaquo; Serials &rsaquo; Koha</title>
12	[% INCLUDE 'doc-head-close.inc' %]	15	[% INCLUDE 'doc-head-close.inc' %]
Lines 14-21 Link Here
14	</head>	17	</head>
15		18
16	<body id="ser_subscription-detail" class="ser">	19	<body id="ser_subscription-detail" class="ser">
17	[% INCLUDE 'header.inc' %]	20	[% INCLUDE 'header.inc' form=formulaire %]
18	[% INCLUDE 'serials-search.inc' %]
19		21
20	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	22	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
21	<ol>	23	<ol>
Lines 40-45 Link Here
40	</li>	42	</li>
41	[% END %]	43	[% END %]
42	</ol>	44	</ol>
		45	<ol>
		46	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		47	</ol>
		48	<ol>
		49	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		50	</ol>
43	</nav>	51	</nav>
44		52
45	<div class="main container-fluid">	53	<div class="main container-fluid">

Lines 1-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt (-6 / +9 lines)
1	[% SET footerjs = 1 %]	1	[% SET footerjs = 1 %]
		2	[% formulaire = BLOCK %]
		3	[% INCLUDE 'serials-search.inc' %]
		4	[% END %]
2	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
3	<title>Frequencies &rsaquo; Serials &rsaquo; Koha</title>	6	<title>Frequencies &rsaquo; Serials &rsaquo; Koha</title>
4	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]
5	</head>	8	</head>
6		9
7	<body id="ser_subscription_frequencies" class="ser">	10	<body id="ser_subscription_frequencies" class="ser">
8	[% INCLUDE 'header.inc' %]	11	[% INCLUDE 'header.inc' form=formulaire %]
9		12
10	[% BLOCK translate_frequnit %]	13	[% BLOCK translate_frequnit %]
11	[% SWITCH frequnit %]	14	[% SWITCH frequnit %]
Lines 45-53 Link Here
45		48
46	[% IF (new or modify) %]	49	[% IF (new or modify) %]
47	[% IF (new) %]	50	[% IF (new) %]
48	<h1>New frequency</h1>	51	<h2>New frequency</h2>
49	[% ELSE %]	52	[% ELSE %]
50	<h1>Edit frequency: [% description \| html %]</h1>	53	<h2>Edit frequency: [% description \| html %]</h2>
51	[% END %]	54	[% END %]
52	<form action="/cgi-bin/koha/serials/subscription-frequencies.pl" id="add_frequency_form" method="post">	55	<form action="/cgi-bin/koha/serials/subscription-frequencies.pl" id="add_frequency_form" method="post">
53	[% IF (modify) %]	56	[% IF (modify) %]
Lines 113-119 Link Here
113	</div>	116	</div>
114	</div>	117	</div>
115		118
116	<h1>Frequencies</h1>	119	<h2>Frequencies</h2>
117	[% IF still_used %]	120	[% IF still_used %]
118	<div class="dialog alert">	121	<div class="dialog alert">
119	<p>	122	<p>
Lines 162-169 Link Here
162	<td>[% frequency.unitsperissue \| html %]</td>	165	<td>[% frequency.unitsperissue \| html %]</td>
163	<td>[% frequency.displayorder \| html %]</td>	166	<td>[% frequency.displayorder \| html %]</td>
164	<td class="actions">	167	<td class="actions">
165	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/serials/subscription-frequencies.pl?op=modify&frequencyid=[% frequency.id \| html %]"><i class="fa fa-pencil"></i> Edit</a>	168	<a class="btn btn-default btn-xs" id="lientype" href="/cgi-bin/koha/serials/subscription-frequencies.pl?op=modify&frequencyid=[% frequency.id \| html %]"><i class="fa fa-pencil"></i> Edit</a>
166	<a class="delete_frequency btn btn-default btn-xs" href="/cgi-bin/koha/serials/subscription-frequencies.pl?op=del&frequencyid=[% frequency.id \| html %]"><i class="fa fa-trash"></i> Delete</a>	169	<a class="delete_frequency btn btn-default btn-xs" id="lientype" href="/cgi-bin/koha/serials/subscription-frequencies.pl?op=del&frequencyid=[% frequency.id \| html %]"><i class="fa fa-trash"></i> Delete</a>
167	</td>	170	</td>
168	</tr>	171	</tr>
169	[% END %]	172	[% END %]

Lines 1-13 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt (-2 / +10 lines)
1	[% USE KohaDates %]	1	[% USE KohaDates %]
2	[% SET footerjs = 1 %]	2	[% SET footerjs = 1 %]
		3	[% formulaire = BLOCK %]
		4	[% INCLUDE 'serials-search.inc' %]
		5	[% END %]
3	[% INCLUDE 'doc-head-open.inc' %]	6	[% INCLUDE 'doc-head-open.inc' %]
4	<title>Subscription history &rsaquo; Serials &rsaquo; Koha</title>	7	<title>Subscription history &rsaquo; Serials &rsaquo; Koha</title>
5	[% INCLUDE 'doc-head-close.inc' %]	8	[% INCLUDE 'doc-head-close.inc' %]
6	</head>	9	</head>
7		10
8	<body id="ser_subscription_history" class="ser">	11	<body id="ser_subscription_history" class="ser">
9	[% INCLUDE 'header.inc' %]	12	[% INCLUDE 'header.inc' form=formulaire %]
10	[% INCLUDE 'serials-search.inc' %]
11		13
12	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	14	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
13	<ol>	15	<ol>
Lines 23-28 Link Here
23	</a>	25	</a>
24	</li>	26	</li>
25	</ol>	27	</ol>
		28	<ol>
		29	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		30	</ol>
		31	<ol>
		32	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		33	</ol>
26	</nav>	34	</nav>
27		35
28	<div class="main container-fluid">	36	<div class="main container-fluid">

Lines 1-13 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt (-12 / +16 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'serials-search.inc' %]
		6	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
5	<title>Numbering patterns &rsaquo; Serials &rsaquo; Koha</title>	8	<title>Numbering patterns &rsaquo; Serials &rsaquo; Koha</title>
6	[% INCLUDE 'doc-head-close.inc' %]	9	[% INCLUDE 'doc-head-close.inc' %]
7	</head>	10	</head>
8		11
9	<body id="ser_subscription_numberpatterns" class="ser">	12	<body id="ser_subscription_numberpatterns" class="ser">
10	[% INCLUDE 'header.inc' %]	13	[% INCLUDE 'header.inc' form=formulaire %]
11		14
12	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	15	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
13	<ol>	16	<ol>
Lines 59-74 Link Here
59	<div class="col-sm-10 col-sm-push-2">	62	<div class="col-sm-10 col-sm-push-2">
60	<main>	63	<main>
61		64
		65
		66	<div id="toolbar" class="btn-toolbar">
		67	<div>
		68	<a class="pat" id="newnumberpattern" href="/cgi-bin/koha/serials/subscription-numberpatterns.pl?op=new"><i class="fa fa-plus"></i> New numbering pattern</a>
		69	</div>
		70	</div>
		71
62	[% IF (new or modify) %]	72	[% IF (new or modify) %]
63	[% IF (new) %]	73	[% IF (new) %]
64	<h1>New numbering pattern</h1>	74	<h2>New numbering pattern</h2>
65	[% IF (error_existing_numberpattern) %]	75	[% IF (error_existing_numberpattern) %]
66	<div class="dialog alert">	76	<div class="dialog alert">
67	<p>A pattern with this name already exists.</p>	77	<p>A pattern with this name already exists.</p>
68	</div>	78	</div>
69	[% END %]	79	[% END %]
70	[% ELSE %]	80	[% ELSE %]
71	<h1>Modify pattern: [% label \| html %]</h1>	81	<h2>Modify pattern: [% label \| html %]</h2>
72	[% IF (error_existing_numberpattern) %]	82	[% IF (error_existing_numberpattern) %]
73	<div class="dialog alert">	83	<div class="dialog alert">
74	<p>Another pattern with this name already exists.</p>	84	<p>Another pattern with this name already exists.</p>
Lines 261-267 Link Here
261	</form>	271	</form>
262		272
263	[% ELSE %]	273	[% ELSE %]
264	<h1>Numbering patterns</h1>	274	<h2>Numbering patterns</h2>
265	[% IF still_used %]	275	[% IF still_used %]
266	<div class="dialog alert">	276	<div class="dialog alert">
267	<p>	277	<p>
Lines 289-300 Link Here
289	</div>	299	</div>
290	[% END %]	300	[% END %]
291		301
292	<div id="toolbar" class="btn-toolbar">
293	<div>
294	<a class="pat" id="newnumberpattern" href="/cgi-bin/koha/serials/subscription-numberpatterns.pl?op=new"><i class="fa fa-plus"></i> New numbering pattern</a>
295	</div>
296	</div>
297
298	[% IF (numberpatterns_loop.size) %]	302	[% IF (numberpatterns_loop.size) %]
299	<table id="numberpatternst">	303	<table id="numberpatternst">
300	<thead>	304	<thead>
Lines 314-321 Link Here
314	<td>[% numberpattern.numberingmethod \| html %]</td>	318	<td>[% numberpattern.numberingmethod \| html %]</td>
315	<td>[% numberpattern.displayorder \| html %]</td>	319	<td>[% numberpattern.displayorder \| html %]</td>
316	<td class="actions">	320	<td class="actions">
317	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/serials/subscription-numberpatterns.pl?op=modify&id=[% numberpattern.id \| html %]"><i class="fa fa-pencil"></i> Edit</a>	321	<a class="btn btn-default btn-xs" id="lientype" href="/cgi-bin/koha/serials/subscription-numberpatterns.pl?op=modify&id=[% numberpattern.id \| html %]"><i class="fa fa-pencil"></i> Edit</a>
318	<a class="delete_pattern btn btn-default btn-xs" href="/cgi-bin/koha/serials/subscription-numberpatterns.pl?op=del&id=[% numberpattern.id \| html %]"><i class="fa fa-trash"></i> Delete</a>	322	<a class="delete_pattern btn btn-default btn-xs" id="lientype" href="/cgi-bin/koha/serials/subscription-numberpatterns.pl?op=del&id=[% numberpattern.id \| html %]"><i class="fa fa-trash"></i> Delete</a>
319	</td>	323	</td>
320	</tr>	324	</tr>
321	[% END %]	325	[% END %]

Lines 1-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt (-2 / +11 lines)
		1
		2	[% formulaire = BLOCK %]
		3	[% INCLUDE 'serials-search.inc' %]
		4	[% END %]
1	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
2	<title>Alert subscribers for [% bibliotitle \| html %] &rsaquo; Serials &rsaquo; Koha</title>	6	<title>Alert subscribers for [% bibliotitle \| html %] &rsaquo; Serials &rsaquo; Koha</title>
3	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]
4	</head>	8	</head>
5	<body id="ser_viewalerts" class="ser">	9	<body id="ser_viewalerts" class="ser">
6	[% INCLUDE 'header.inc' %]	10	[% INCLUDE 'header.inc' form=formulaire %]
7	[% INCLUDE 'serials-search.inc' %]
8		11
9	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	12	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
10	<ol>	13	<ol>
Lines 20-25 Link Here
20	</a>	23	</a>
21	</li>	24	</li>
22	</ol>	25	</ol>
		26	<ol>
		27	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		28	</ol>
		29	<ol>
		30	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		31	</ol>
23	</nav>	32	</nav>
24		33
25	<div class="main container-fluid">	34	<div class="main container-fluid">

Lines 104-109 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt (-223 / +238 lines)
104	</li>	104	</li>
105	[% END %]	105	[% END %]
106	</ol>	106	</ol>
		107	<ol>
		108	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		109	</ol>
		110	<ol>
		111	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		112	</ol>
107	</nav> <!-- /.breadcrumbs -->	113	</nav> <!-- /.breadcrumbs -->
108		114
109	[% IF ( op == 'show' ) %]	115	[% IF ( op == 'show' ) %]
Lines 117-123 Link Here
117	</div>	123	</div>
118		124
119	<fieldset class="rows">	125	<fieldset class="rows">
120	<legend>Bibliographic information</legend>	126	<h3>Bibliographic information</h3>
121	<ol>	127	<ol>
122	[% IF ( title ) %]	128	[% IF ( title ) %]
123	<li>	129	<li>
Lines 191-197 Link Here
191	</fieldset>	197	</fieldset>
192		198
193	<fieldset class="rows">	199	<fieldset class="rows">
194	<legend>Suggestion management</legend>	200	<h3>Suggestion management</h3>
195	<ol>	201	<ol>
196	<li>	202	<li>
197	<span class="label">Status:</span>	203	<span class="label">Status:</span>
Lines 285-291 Link Here
285	</fieldset>	291	</fieldset>
286		292
287	<fieldset class="rows">	293	<fieldset class="rows">
288	<legend>Acquisition information</legend>	294	<h3>Acquisition information</h3>
289	<ol>	295	<ol>
290	<li>	296	<li>
291	<span class="label">Library:</span>	297	<span class="label">Library:</span>
Lines 350-363 Link Here
350	<input type="hidden" name="redirect" id="redirect" value="[% redirect \| html %]" />	356	<input type="hidden" name="redirect" id="redirect" value="[% redirect \| html %]" />
351	<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber \| html %]" />	357	<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber \| html %]" />
352	[% IF ( suggestionid ) %]	358	[% IF ( suggestionid ) %]
353	<h1>Edit purchase suggestion #[% suggestionid \| html %]</h1>	359	<h2>Edit purchase suggestion #[% suggestionid \| html %]</h2>
354	<input type="hidden" name="suggestionid" value="[% suggestionid \| html %]"/>	360	<input type="hidden" name="suggestionid" value="[% suggestionid \| html %]"/>
355	[% ELSE %]	361	[% ELSE %]
356	<h1>Enter a new purchase suggestion</h1>	362	<h2>Enter a new purchase suggestion</h2>
357	[% END %]	363	[% END %]
358		364
359	<fieldset class="rows">	365	<fieldset class="rows">
360	<legend>Bibliographic information</legend>	366	<h3>Bibliographic information</h3>
361	<ol>	367	<ol>
362	<li>	368	<li>
363	<label for="title" class="required">Title:</label>	369	<label for="title" class="required">Title:</label>
Lines 415-421 Link Here
415	</fieldset>	421	</fieldset>
416		422
417	<fieldset class="rows">	423	<fieldset class="rows">
418	<legend>Suggestion management</legend>	424	<h3>Suggestion management</h3>
419	<ol>	425	<ol>
420	[% IF ( suggestionid ) %]	426	[% IF ( suggestionid ) %]
421	<li>	427	<li>
Lines 576-582 Link Here
576	</fieldset>	582	</fieldset>
577		583
578	<fieldset class="rows">	584	<fieldset class="rows">
579	<legend>Acquisition information</legend>	585	<h3>Acquisition information</h3>
580	<ol>	586	<ol>
581	<li>	587	<li>
582	<label for="branchcode">Library:</label>	588	<label for="branchcode">Library:</label>
Lines 642-648 Link Here
642	<input type="hidden" name="save_confirmed" value="1" />	648	<input type="hidden" name="save_confirmed" value="1" />
643	<input onclick="this.form.op.value = 'save'; this.form.submit();" type="submit" value="Confirm your suggestion" />	649	<input onclick="this.form.op.value = 'save'; this.form.submit();" type="submit" value="Confirm your suggestion" />
644	[% ELSE %]	650	[% ELSE %]
645	<input type="submit" value="Save" />	651	<input type="submit" class="principal" value="Save" />
646	[% END %]	652	[% END %]
647	<a class="cancel" href="[% IF ( returnsuggestedby ) %]/cgi-bin/koha/members/moremember.pl?borrowernumber=[% returnsuggestedby \| uri %]#suggestions[% ELSE %]suggestion.pl[% END %]">Cancel</a>	653	<a class="cancel" href="[% IF ( returnsuggestedby ) %]/cgi-bin/koha/members/moremember.pl?borrowernumber=[% returnsuggestedby \| uri %]#suggestions[% ELSE %]suggestion.pl[% END %]">Cancel</a>
648	[% ELSE %]	654	[% ELSE %]
Lines 650-656 Link Here
650	<input type="hidden" name="save_confirmed" value="1" />	656	<input type="hidden" name="save_confirmed" value="1" />
651	<input onclick="this.form.op.value = 'save'; this.form.submit();" type="submit" value="Confirm your suggestion" />	657	<input onclick="this.form.op.value = 'save'; this.form.submit();" type="submit" value="Confirm your suggestion" />
652	[% ELSE %]	658	[% ELSE %]
653	<input type="submit" value="Submit your suggestion" />	659	<input type="submit" class="principal" value="Submit your suggestion" />
654	[% END %]	660	[% END %]
655	<a class="cancel" href="suggestion.pl">Cancel</a>	661	<a class="cancel" href="suggestion.pl">Cancel</a>
656	[% END %]	662	[% END %]
Lines 665-671 Link Here
665	</div>	671	</div>
666	</div>	672	</div>
667		673
668	<h1>Suggestions management</h1>	674	<h2>Suggestions management</h2>
669		675
670	[% IF ( displayby != "branchcode" ) %]	676	[% IF ( displayby != "branchcode" ) %]
671	<label for="branchcode">Viewing suggestions for library:</label>	677	<label for="branchcode">Viewing suggestions for library:</label>
Lines 690-696 Link Here
690		696
691	[% UNLESS ( notabs ) %]	697	[% UNLESS ( notabs ) %]
692	<div id="suggestiontabs" class="toptabs">	698	<div id="suggestiontabs" class="toptabs">
693	<ul class="nav nav-tabs" role="tablist">	699	<fieldset id="searchresults">
		700	<ul class="ui-tabs-nav" role="tablist">
694	[% FOREACH suggestion IN suggestions %]	701	[% FOREACH suggestion IN suggestions %]
695	<li role="presentation">	702	<li role="presentation">
696	<a href="#[% suggestion.suggestiontype \| uri %]" aria-controls="[% suggestion.suggestiontype \| uri %]" role="tab" data-toggle="tab">	703	<a href="#[% suggestion.suggestiontype \| uri %]" aria-controls="[% suggestion.suggestiontype \| uri %]" role="tab" data-toggle="tab">
Lines 723-841 Link Here
723	<div id="[% suggestion.suggestiontype \| html %]" role="tabpanel" class="tab-pane">	730	<div id="[% suggestion.suggestiontype \| html %]" role="tabpanel" class="tab-pane">
724	<form class="update_suggestions" name="f" method="post" action="/cgi-bin/koha/suggestion/suggestion.pl#[% suggestion.suggestiontype\| uri %]">	731	<form class="update_suggestions" name="f" method="post" action="/cgi-bin/koha/suggestion/suggestion.pl#[% suggestion.suggestiontype\| uri %]">
725		732
726	[% IF ( suggestion.suggestions_loop ) %]	733	[% IF ( suggestion.suggestions_loop ) %]
727	<p>	734	<p>
728	<a class="checkall" href="#">Check all</a> \| <a class="uncheckall" href="#">Uncheck all</a>	735	<a class="checkall" id="lientype" href="#">Check all</a> \| <a class="uncheckall" id="lientype" href="#">Uncheck all</a>
729	</p>	736	</p>
730		737
731	<table id="table_[% loop.count \| html %]" class="sorted">	738	<table id="table_[% loop.count \| html %]" class="sorted">
732	<thead>	739	<thead>
733	<tr>	740	<tr>
734	<th class="NoSort noExport"> </th>	741	<td>
735	<th class="anti-the">Suggestion</th>	742	<input type="checkbox" name="suggestionid" value="[% suggestions_loo.suggestionid \| html %]" />
736	<th>Suggested by</th>	743	</td>
737	<th>Suggested on</th>	744	<td>
738	<th>Patron reason</th>	745	<a href="suggestion.pl?suggestionid=[% suggestions_loo.suggestionid \| uri %]&op=show" title="suggestion" >
739	<th>Managed by</th>	746	[% suggestions_loo.title \| html %][% IF ( suggestions_loo.author ) %], by [% suggestions_loo.author \| html %][% END %]
740	<th>Managed on</th>	747	</a>
741	<th>Last modification by</th>	748	<br />
742	<th>Last modification on</th>	749	[% IF ( suggestions_loo.copyrightdate ) %]
743	<th>Last updated</th>	750	© <span class="suggestion_copyrightdate">[% suggestions_loo.copyrightdate \| html %]</span>
744	<th>Library</th>	751	[% END %]
745	<th>Fund</th>	752	[% IF ( suggestions_loo.volumedesc ) %]
746	<th>Status</th>	753	; <span class="suggestion_volume">Volume:<em>[% suggestions_loo.volumedesc \| html %]</em></span>
747	<th class="NoSort noExport"> </th>	754	[% END %]
		755	[% IF ( suggestions_loo.isbn ) %]
		756	; <span class="suggestion_isbn">ISBN: <em>[% suggestions_loo.isbn \| html %]</em></span>
		757	[% END %]
		758	[% IF ( suggestions_loo.publishercode ) %]
		759	; <span class="suggestion_publishercode">Published by [% suggestions_loo.publishercode \| html %]</span>
		760	[% END %]
		761	[% IF ( suggestions_loo.publicationyear ) %]
		762	in <span class="suggestion_publicationyear"><em>[% suggestions_loo.publicationyear \| html %]</em></span>
		763	[% END %]
		764	[% IF ( suggestions_loo.place ) %]
		765	in <span class="suggestion_place"><em>[% suggestions_loo.place \| html %]</em></span>
		766	[% END %]
		767	[% IF ( suggestions_loo.collectiontitle ) %]
		768	; <span class="suggestion_collectiontitle">[% suggestions_loo.collectiontitle \| html %]</span>
		769	[% END %]
		770	[% IF ( suggestions_loo.itemtype ) %]
		771	; <span class="suggestion_itype">[% AuthorisedValues.GetByCode( 'SUGGEST_FORMAT', suggestions_loo.itemtype, 0 ) \| html %]</span>
		772	[% END %]
		773	<br />
		774	[% IF ( suggestions_loo.note ) %]
		775	<div class="suggestion_note"><i class="fa fa-comment"></i> [% suggestions_loo.note \| html %]</div>
		776	[% END %]
		777	[% IF suggestions_loo.archived %]
		778	<br /><i class="fa fa-archive"></i> Archived
		779	[% END %]
		780	</td>
		781	<td>
		782	<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestions_loo.suggestedby \| uri %]">[% suggestions_loo.surnamesuggestedby \| html %][% IF ( suggestions_loo.firstnamesuggestedby ) %], [% suggestions_loo.firstnamesuggestedby \| html %][% END %] [% IF (suggestions_loo.cardnumbersuggestedby ) %]([% suggestions_loo.cardnumbersuggestedby \| html %])[% END %]</a>
		783	</td>
		784	<td data-order="[% suggestions_loo.suggesteddate \| html %]">
		785	[% IF ( suggestions_loo.suggesteddate ) %][% suggestions_loo.suggesteddate \| $KohaDates %][% END %]
		786	</td>
		787	<td>
		788	<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestions_loo.managedby \| uri %]">[% suggestions_loo.surnamemanagedby \| html %][% IF ( suggestions_loo.firstnamemanagedby ) %], [% suggestions_loo.firstnamemanagedby \| html %][% END %]</a>
		789	</td>
		790	<td data-order="[% suggestions_loo.manageddate \| html %]">
		791	[% IF ( suggestions_loo.manageddate ) %][% suggestions_loo.manageddate \| $KohaDates %][% END %]
		792	</td>
		793	<td>
		794	<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestions_loo.lastmodificationby \| uri %]">[% suggestions_loo.surnamelastmodificationby \| html %][% IF ( suggestions_loo.firstnamelastmodificationby ) %], [% suggestions_loo.firstnamelastmodificationby \| html %][% END %]</a>
		795	</td>
		796	<td data-order="[% suggestions_loo.lastmodificationdate \| html %]">
		797	[% IF ( suggestions_loo.lastmodificationdate ) %][% suggestions_loo.lastmodificationdate \| $KohaDates %][% END %]
		798	</td>
		799	<td>
		800	[% suggestions_loo.date \| $KohaDates %]
		801	</td>
		802	<td>
		803	[% Branches.GetName( suggestions_loo.branchcode ) \| html %]
		804	</td>
		805	<td>
		806	[% suggestions_loo.budget_name \| html %]
		807	</td>
		808	<td>
		809	[% IF ( suggestions_loo.ASKED ) %]
		810	Pending
		811	[% ELSIF ( suggestions_loo.ACCEPTED ) %]
		812	Accepted
		813	[% ELSIF ( suggestions_loo.ORDERED ) %]
		814	Ordered
		815	[% ELSIF ( suggestions_loo.REJECTED ) %]
		816	Rejected
		817	[% ELSIF ( suggestions_loo.CHECKED ) %]
		818	Checked
819	[% ELSIF ( suggestions_loo.AVAILABLE ) %]
820	Available
821	[% ELSIF AuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestions_loo.STATUS ) %]
822	[% AuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestions_loo.STATUS ) \| html %]
823	[% ELSE %]
824	Status unknown
825	[% END %]
826
827	[% IF ( suggestions_loo.reason ) %]
828	<br />([% suggestions_loo.reason \| html %])
829	[% END %]
830	</td>
831	<td class="actions">
832	<div class="btn-group dropup">
833	<a class="btn btn-default btn-xs" role="button" id="lientype" href="suggestion.pl?suggestionid=[% suggestions_loo.suggestionid \| html %]&op=edit"><i class="fa fa-pencil"></i> Edit</a><a class="btn btn-default btn-xs dropdown-toggle" id="lientype" sid="more_actions_[% suggestions_loo.suggestionid \| html %]" role="button" data-toggle="dropdown" href="#"><b class="caret"></b></a>
834	<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="more_actions_[% suggestions_loo.suggestionid \| html %]">
835	<li><a class="deletesuggestion" href="suggestion.pl?op=delete&suggestionid=[% suggestions_loo.suggestionid \| html %]"><i class="fa fa-trash"></i> Delete</a></li>
836	[% UNLESS suggestions_loo.archived %]
837	<li><a class="archivesuggestion" href="suggestion.pl?op=archive&suggestionid=[% suggestions_loo.suggestionid \| html %]"><i class="fa fa-archive"></i> Archive</a></li>
838	[% ELSE %]
839	<li><a class="unarchivesuggestion" href="suggestion.pl?op=unarchive&suggestionid=[% suggestions_loo.suggestionid \| html %]"><i class="fa fa-archive"></i> Unarchive</a></li>
840	[% END %]
841	</ul>
842	</div>
843	</td>
748	</tr>	844	</tr>
749	</thead>	845	[% END # /FOREACH suggestions_loo %]
750	<tbody>	846	</tbody>
751	[% FOREACH suggestions_loo IN suggestion.suggestions_loop %]	847	</table> <!-- /#table_[% loop.count \| html %] -->
752	<tr>	848
753	<td>	849	<div class="row">
754	<input type="checkbox" name="suggestionid" value="[% suggestions_loo.suggestionid \| html %]" />	850	<h3 style="padding-left:1em;">Change selected suggestions</h3>
755	</td>	851	<div class="col-sm-4">
756	<td>	852	<fieldset>
757	<a href="suggestion.pl?suggestionid=[% suggestions_loo.suggestionid \| uri %]&op=show" title="suggestion" >	853	<div id="select-reason[% loop.index \| html %]">
758	[% suggestions_loo.title \| html %][% IF ( suggestions_loo.author ) %], by [% suggestions_loo.author \| html %][% END %]	854	<label for="STATUSreason[% loop.index \| html %]">Mark selected as: </label>
759	</a>	855	<select name="STATUS" id="STATUSreason[% loop.index \| html %]">
760	<br />	856	<option value=""> -- Choose a status --</option>
761	[% IF ( suggestions_loo.copyrightdate ) %]	857
762	© <span class="suggestion_copyrightdate">[% suggestions_loo.copyrightdate \| html %]</span>	858	[% IF (statusselected_ASKED ) %]
763	[% END %]	859	<option value="ASKED" selected="selected">Pending</option>
764	[% IF ( suggestions_loo.volumedesc ) %]	860	[% ELSE %]
765	; <span class="suggestion_volume">Volume:<em>[% suggestions_loo.volumedesc \| html %]</em></span>	861	<option value="ASKED">Pending</option>
766	[% END %]	862	[% END %]
767	[% IF ( suggestions_loo.isbn ) %]	863
768	; <span class="suggestion_isbn">ISBN: <em>[% suggestions_loo.isbn \| html %]</em></span>	864	[% IF (statusselected_ACCEPTED ) %]
769	[% END %]	865	<option value="ACCEPTED" selected="selected">Accepted</option>
770	[% IF ( suggestions_loo.publishercode ) %]	866	[% ELSE %]
771	; <span class="suggestion_publishercode">Published by [% suggestions_loo.publishercode \| html %]</span>	867	<option value="ACCEPTED">Accepted</option>
772	[% END %]	868	[% END %]
773	[% IF ( suggestions_loo.publicationyear ) %]
774	in <span class="suggestion_publicationyear"><em>[% suggestions_loo.publicationyear \| html %]</em></span>
775	[% END %]
776	[% IF ( suggestions_loo.place ) %]
777	in <span class="suggestion_place"><em>[% suggestions_loo.place \| html %]</em></span>
778	[% END %]
779	[% IF ( suggestions_loo.collectiontitle ) %]
780	; <span class="suggestion_collectiontitle">[% suggestions_loo.collectiontitle \| html %]</span>
781	[% END %]
782	[% IF ( suggestions_loo.itemtype ) %]
783	; <span class="suggestion_itype">[% AuthorisedValues.GetByCode( 'SUGGEST_FORMAT', suggestions_loo.itemtype, 0 ) \| html %]</span>
784	[% END %]
785	<br />
786	[% IF ( suggestions_loo.note ) %]
787	<div class="suggestion_note"><i class="fa fa-comment"></i> [% suggestions_loo.note \| html %]</div>
788	[% END %]
789	[% IF suggestions_loo.archived %]
790	<br /><i class="fa fa-archive"></i> Archived
791	[% END %]
792	</td>
793	<td>
794	<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestions_loo.suggestedby \| uri %]">[% suggestions_loo.surnamesuggestedby \| html %][% IF ( suggestions_loo.firstnamesuggestedby ) %], [% suggestions_loo.firstnamesuggestedby \| html %][% END %] [% IF (suggestions_loo.cardnumbersuggestedby ) %]([% suggestions_loo.cardnumbersuggestedby \| html %])[% END %]</a>
795	</td>
796	<td data-order="[% suggestions_loo.suggesteddate \| html %]">
797	[% IF ( suggestions_loo.suggesteddate ) %][% suggestions_loo.suggesteddate \| $KohaDates %][% END %]
798	</td>
799	<td>[% AuthorisedValues.GetByCode( 'OPAC_SUG', suggestions_loo.patronreason ) \| html %]</td>
800	<td>
801	<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestions_loo.managedby \| uri %]">[% suggestions_loo.surnamemanagedby \| html %][% IF ( suggestions_loo.firstnamemanagedby ) %], [% suggestions_loo.firstnamemanagedby \| html %][% END %]</a>
802	</td>
803	<td data-order="[% suggestions_loo.manageddate \| html %]">
804	[% IF ( suggestions_loo.manageddate ) %][% suggestions_loo.manageddate \| $KohaDates %][% END %]
805	</td>
806	<td>
807	<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestions_loo.lastmodificationby \| uri %]">[% suggestions_loo.surnamelastmodificationby \| html %][% IF ( suggestions_loo.firstnamelastmodificationby ) %], [% suggestions_loo.firstnamelastmodificationby \| html %][% END %]</a>
808	</td>
809	<td data-order="[% suggestions_loo.lastmodificationdate \| html %]">
810	[% IF ( suggestions_loo.lastmodificationdate ) %][% suggestions_loo.lastmodificationdate \| $KohaDates %][% END %]
811	</td>
812	<td>
813	[% suggestions_loo.date \| $KohaDates %]
814	</td>
815	<td>
816	[% Branches.GetName( suggestions_loo.branchcode ) \| html %]
817	</td>
818	<td>
819	[% suggestions_loo.budget_name \| html %]
820	</td>
821	<td>
822	[% IF ( suggestions_loo.ASKED ) %]
823	Pending
824	[% ELSIF ( suggestions_loo.ACCEPTED ) %]
825	Accepted
826	[% ELSIF ( suggestions_loo.ORDERED ) %]
827	Ordered
828	[% ELSIF ( suggestions_loo.REJECTED ) %]
829	Rejected
830	[% ELSIF ( suggestions_loo.CHECKED ) %]
831	Checked
832	[% ELSIF ( suggestions_loo.AVAILABLE ) %]
833	Available
834	[% ELSIF AuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestions_loo.STATUS ) %]
835	[% AuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestions_loo.STATUS ) \| html %]
836	[% ELSE %]
837	Status unknown
838	[% END %]
839		869
840	[% IF ( suggestions_loo.reason ) %]	870	[% IF ( suggestions_loo.reason ) %]
841	<br />([% suggestions_loo.reason \| html %])	871	<br />([% suggestions_loo.reason \| html %])
Lines 903-967 Link Here
903	[% END %]	933	[% END %]
904	</select>	934	</select>
905		935
906	<label for="choosereason[% loop.index \| html %]">with this reason:</label>	936	<input type="hidden" name="branchcode" value="[% branchfilter \| html %]" />
907	<select name="reason" id="choosereason[% loop.index \| html %]">	937	<input type="hidden" name="filter_archived" value="[% filter_archived \| html %]" />
908	<option value=""> -- Choose a reason -- </option>	938	<fieldset class="action">
909	[% FOREACH reasonsloo IN suggestion.reasonsloop %]	939	<button type="submit" class="btn btn-default btn-xs" id="lientype" value="update_status">Submit</button>
910	<option value="[% reasonsloo.lib \| html %]">[% reasonsloo.lib \| html %]</option>
911	[% END %]
912	<option value="other">Others...</option>
913	</select>
914
915	<span class="other_reason">
916	<input type="text" size="31" name="other_reason" placeholder="please note your reason here..." />
917	<a href="#" class="cancel_note">Cancel</a>
918	</span>
919	</div>
920
921	<input type="hidden" name="branchcode" value="[% branchfilter \| html %]" />
922	<input type="hidden" name="filter_archived" value="[% filter_archived \| html %]" />
923	<fieldset class="action">
924	<button type="submit" class="btn btn-default btn-xs" value="update_status">Submit</button>
925	</fieldset>
926	</fieldset>	940	</fieldset>
927	</div> <!-- /.col-sm-4 -->	941	</fieldset>
928		942	</div> <!-- /.col-sm-4 -->
929	<div class="col-sm-4">	943
930	<fieldset>	944	<div class="col-sm-4">
931	<label>	945	<fieldset>
932	Update item types with:	946	<label>
933	[% PROCESS 'av-build-dropbox.inc' name="suggestion_itemtype", category="SUGGEST_FORMAT", size = 20 %]	947	Update item types with:
934	</label>	948	[% PROCESS 'av-build-dropbox.inc' name="suggestion_itemtype", category="SUGGEST_FORMAT", size = 20 %]
935	<input type="hidden" name="branchcode" value="[% branchfilter \| html %]" />	949	</label>
936	<input type="hidden" name="filter_archived" value="[% filter_archived \| html %]" />	950	<input type="hidden" name="branchcode" value="[% branchfilter \| html %]" />
937	<fieldset class="action">	951	<input type="hidden" name="filter_archived" value="[% filter_archived \| html %]" />
938	<button type="submit" class="btn btn-default btn-xs" value="update_itemtype">Submit</button>	952	<fieldset class="action">
939	</fieldset>	953	<button type="submit" class="btn btn-default btn-xs" id="lientype" value="update_itemtype">Submit</button>
940	</fieldset>	954	</fieldset>
941	</div> <!-- /.col-sm-4 -->	955	</fieldset>
942		956	</div> <!-- /.col-sm-4 -->
943	<div class="col-sm-2">	957
944	<fieldset>	958	<div class="col-sm-2">
945	<span class="label">Update manager</span><br/>	959	<fieldset>
946	<a id="set_manager_[% loop.count \| html %]" data-tab="[% loop.count \| html %]" class="set_manager" href="#"><i class="fa fa-search"></i> Select manager</a>	960	<span class="label">Update manager</span><br/>
947	<span id="managedby_name[% loop.count \| html %]"></span>	961	<a id="set_manager_[% loop.count \| html %]" data-tab="[% loop.count \| html %]" class="set_manager" href="#"><i class="fa fa-search"></i> Select manager</a>
948	<input type="hidden" name="suggestion_managedby" id="managedby[% loop.count \| html %]" value="[% logged_in_user.borrowernumber \| html %]" />	962	<span id="managedby_name[% loop.count \| html %]"></span>
949	<input type="hidden" name="branchcode" value="[% branchfilter \| html %]" />	963	<input type="hidden" name="suggestion_managedby" id="managedby[% loop.count \| html %]" value="[% logged_in_user.borrowernumber \| html %]" />
950	<input type="hidden" name="filter_archived" value="[% filter_archived \| html %]" />	964	<input type="hidden" name="branchcode" value="[% branchfilter \| html %]" />
951	<fieldset class="action">	965	<input type="hidden" name="filter_archived" value="[% filter_archived \| html %]" />
952	<button type="submit" class="btn btn-default btn-xs" value="update_manager">Submit</button>	966	<fieldset class="action">
953	</fieldset>	967	<button type="submit" class="btn btn-default btn-xs" id="lientype" value="update_manager">Submit</button>
954	</fieldset>	968	</fieldset>
955	</div> <!-- /.col-sm-2 -->	969	</fieldset>
956		970	</div> <!-- /.col-sm-2 -->
957	<div class="col-sm-2">	971
958	<fieldset>	972	<div class="col-sm-2">
959	<span class="label">Delete selected</span>	973	<fieldset>
960	<input type="hidden" name="branchcode" value="[% branchfilter \| html %]" />	974	<span class="label">Delete selected</span>
961	<input type="hidden" name="filter_archived" value="[% filter_archived \| html %]" />	975	<input type="hidden" name="branchcode" value="[% branchfilter \| html %]" />
962	<fieldset class="action">	976	<input type="hidden" name="filter_archived" value="[% filter_archived \| html %]" />
963	<button type="submit" class="btn btn-default btn-xs" value="delete">Delete</button>	977	<fieldset class="action">
964	</fieldset>	978	<button type="submit" class="btn btn-default btn-xs" id="lientype" value="delete">Delete</button>
965	</fieldset>	979	</fieldset>
966	</div> <!-- /.col-sm-2 -->	980	</div> <!-- /.col-sm-2 -->
967	<div class="col-sm-2">	981	<div class="col-sm-2">
Lines 983-989 Link Here
983	</div> <!-- /#[% suggestion.suggestiontype \| html %] -->	997	</div> <!-- /#[% suggestion.suggestiontype \| html %] -->
984	[% END # /FOREACH suggestion %]	998	[% END # /FOREACH suggestion %]
985	[% UNLESS ( notabs ) %]	999	[% UNLESS ( notabs ) %]
986	</div> <!-- /.tab-content -->	1000	</fieldset>
987	</div> <!-- /.notabs -->	1001	</div> <!-- /.notabs -->
988	[% END # /UNLESS notabs %]	1002	[% END # /UNLESS notabs %]
989	[% END # /IF op == 'else' %]	1003	[% END # /IF op == 'else' %]
Lines 994-1005 Link Here
994		1008
995	<div class="col-sm-2 col-sm-pull-10">	1009	<div class="col-sm-2 col-sm-pull-10">
996	<aside>	1010	<aside>
		1011	<div id="filters">
997	<form name="suggestionfilter" action="suggestion.pl" method="get">	1012	<form name="suggestionfilter" action="suggestion.pl" method="get">
998	<input type="hidden" name="branchcode" value="[% branchfilter \| html %]" />	1013	<input type="hidden" name="branchcode" value="[% branchfilter \| html %]" />
999	<fieldset class="brief">	1014	<fieldset class="brief">
1000	<ol style="display:block;">	1015	<ol style="display:block;">
1001	<li>	1016	<li>
1002	<label for="displayby">Organize by: </label>	1017	<p for="displayby">Organize by:
1003	<select name="displayby" id="displayby" style="width:auto;">	1018	<select name="displayby" id="displayby" style="width:auto;">
1004	[% IF ( displayby == "STATUS" ) %]	1019	[% IF ( displayby == "STATUS" ) %]
1005	<option value="STATUS" selected="selected">Status</option>	1020	<option value="STATUS" selected="selected">Status</option>
Lines 1027-1083 Link Here
1027	<option value="acceptedby">Accepted by</option>	1042	<option value="acceptedby">Accepted by</option>
1028	[% END %]	1043	[% END %]
1029	</select>	1044	</select>
1030	<input type="submit" value="Go" />	1045	<input class="principal" type="submit" value="Go" /></p>
1031	</li>	1046	</li>
1032	</ol>	1047	</ol>
1033	</fieldset> <!-- /.brief -->	1048	</fieldset> <!-- /.brief -->
1034		1049
1035	<h4>Filter by: <a style="font-size:80%;font-weight:normal;" href="/cgi-bin/koha/suggestion/suggestion.pl">[clear]</a></h4>	1050	<h4>Filter by: <a id="lientype" style="font-size:80%;font-weight:normal;" href="/cgi-bin/koha/suggestion/suggestion.pl">[clear]</a></h4>
1036		1051
1037	<div id="limits">	1052	<div id="limits">
1038	<fieldset class="brief">	1053	<fieldset class="brief">
1039	<h4 class="local_collapse"><a href="#">Bibliographic information</a></h4>	1054	<h4 class="local_collapse"><a href="#">Bibliographic information <span class="caret"></span></a></h4>
1040	<ol>	1055	<ol>
1041	<li>	1056	<li>
1042	<label for="title"> Title:</label>	1057	<p for="title"> Title:
1043	<input type="text" id="title" name="title" value="[% title \| html %]" />	1058	<input type="text" id="title" name="title" value="[% title \| html %]" /></p>
1044	</li>	1059	</li>
1045	<li>	1060	<li>
1046	<label for="author"> Author:</label>	1061	<p for="author"> Author:
1047	<input type="text" id="author" name="author" value="[% author \| html %]" />	1062	<input type="text" id="author" name="author" value="[% author \| html %]" /></p>
1048	</li>	1063	</li>
1049	<li>	1064	<li>
1050	<label for="isbn"> ISBN:</label>	1065	<p for="isbn"> ISBN:
1051	<input type="text" id="isbn" name="isbn" value="[% isbn \| html %]" />	1066	<input type="text" id="isbn" name="isbn" value="[% isbn \| html %]" /></p>
1052	</li>	1067	</li>
1053	<li>	1068	<li>
1054	<label for="publishercode"> Publisher:</label>	1069	<p for="publishercode"> Publisher:
1055	<input type="text" id="publishercode" name="publishercode" value="[% publishercode \| html %]" />	1070	<input type="text" id="publishercode" name="publishercode" value="[% publishercode \| html %]" /></p>
1056	</li>	1071	</li>
1057	<li>	1072	<li>
1058	<label for="copyrightdate_filter"> Copyright date:</label>	1073	<p for="copyrightdate_filter"> Copyright date:
1059	<input type="text" id="copyrightdate_filter" name="copyrightdate" value="[% copyrightdate \| html %]" />	1074	<input type="text" id="copyrightdate_filter" name="copyrightdate" value="[% copyrightdate \| html %]" /></p>
1060	</li>	1075	</li>
1061	<li>	1076	<li>
1062	<label for="collectiontitle"> Collection title:</label>	1077	<p for="collectiontitle"> Collection title:
1063	<input type="text" id="collectiontitle" name="collectiontitle" value="[% collectiontitle \| html %]" /></li><li><input type="submit" value="Go" />	1078	<input type="text" id="collectiontitle" name="collectiontitle" value="[% collectiontitle \| html %]" /></li><li><input class="principal" type="submit" value="Go" />
1064	</li>	1079	</p></li>
1065	</ol>	1080	</ol>
1066	</fieldset> <!-- /.brief -->	1081	</fieldset> <!-- /.brief -->
1067		1082
1068	<fieldset class="brief">	1083	<fieldset class="brief">
1069	<h4 class="local_collapse"><a href="#">Suggestion information</a></h4>	1084	<h4 class="local_collapse"><a href="#">Suggestion information <span class="caret"></span></a></h4>
1070	<ol>	1085	<ol>
1071	<li>	1086	<li>
1072	<label for="archived" style="display: inline;">Include archived:</label>	1087	<p for="archived" style="display: inline;">Include archived:
1073	[% IF filter_archived %]	1088	[% IF filter_archived %]
1074	<input type="checkbox" id="archived" name="filter_archived" checked="checked" title="Include archived suggestions in the search" />	1089	<input type="checkbox" id="archived" name="filter_archived" checked="checked" title="Include archived suggestions in the search" />
1075	[% ELSE %]	1090	[% ELSE %]
1076	<input type="checkbox" id="archived" name="filter_archived" title="Include archived suggestions in the search" />	1091	<input type="checkbox" id="archived" name="filter_archived" title="Include archived suggestions in the search" />
1077	[% END %]	1092	[% END %]</p>
1078	</li>	1093	</li>
1079	<li>	1094	<li>
1080	<label for="STATUS[% loop.index \| html %]"> Status:</label>	1095	<p for="STATUS[% loop.index \| html %]"> Status:
1081	<select name="STATUS" id="STATUS[% loop.index \| html %]">	1096	<select name="STATUS" id="STATUS[% loop.index \| html %]">
1082	<option value="">Any</option>	1097	<option value="">Any</option>
1083	[% IF (statusselected_ASKED ) %]	1098	[% IF (statusselected_ASKED ) %]
Lines 1117-1127 Link Here
1117	<option value="[% s.authorised_value \| html %]">[% s.lib \| html %]</option>	1132	<option value="[% s.authorised_value \| html %]">[% s.lib \| html %]</option>
1118	[% END %]	1133	[% END %]
1119	[% END %]	1134	[% END %]
1120	</select>	1135	</select></p>
1121	</li>	1136	</li>
1122		1137
1123	<li>	1138	<li>
1124	<label for="suggestedby"> Suggested by:</label>	1139	<p for="suggestedby"> Suggested by:
1125	<select id="suggestedby" name="suggestedby">	1140	<select id="suggestedby" name="suggestedby">
1126	<option value="">Any</option>	1141	<option value="">Any</option>
1127	[% FOREACH suggestedby_loo IN suggestedby_loop %]	1142	[% FOREACH suggestedby_loo IN suggestedby_loop %]
Lines 1131-1148 Link Here
1131	<option value="[% suggestedby_loo.code \| html %]">[% suggestedby_loo.desc \| html %]</option>	1146	<option value="[% suggestedby_loo.code \| html %]">[% suggestedby_loo.desc \| html %]</option>
1132	[% END %]	1147	[% END %]
1133	[% END %]	1148	[% END %]
1134	</select>	1149	</select></p>
1135	</li>	1150	</li>
1136	<li>	1151	<li>
1137	<label for="suggesteddate_from">Suggested date from:</label>	1152	<p for="suggesteddate_from">Suggested date from:
1138	<input type="text" id="suggesteddate_from" size="10" name="suggesteddate_from" value="[% suggesteddate_from \| html %]" data-date_to="suggesteddate_to" class="flatpickr" />	1153	<input type="text" id="suggesteddate_from" size="10" name="suggesteddate_from" value="[% suggesteddate_from \| html %]" data-date_to="suggesteddate_to" class="flatpickr" />
1139	</li>	1154	</p></li>
1140	<li>	1155	<li>
1141	<label for="suggesteddate_to">To:</label>	1156	<p for="suggesteddate_to">To:
1142	<input type="text" id="suggesteddate_to" size="10" name="suggesteddate_to" value="[% suggesteddate_to \| html %]" class="flatpickr" />	1157	<input type="text" id="suggesteddate_to" size="10" name="suggesteddate_to" value="[% suggesteddate_to \| html %]" class="flatpickr" />
1143	</li>	1158	</p></li>
1144	<li>	1159	<li>
1145	<label for="managedby"> Managed by:</label>	1160	<p for="managedby"> Managed by:
1146	<select id="managedby" name="managedby">	1161	<select id="managedby" name="managedby">
1147	<option value="">Any</option>	1162	<option value="">Any</option>
1148	[% FOREACH managedby_loo IN managedby_loop %]	1163	[% FOREACH managedby_loo IN managedby_loop %]
Lines 1152-1169 Link Here
1152	<option value="[% managedby_loo.code \| html %]">[% managedby_loo.desc \| html %]</option>	1167	<option value="[% managedby_loo.code \| html %]">[% managedby_loo.desc \| html %]</option>
1153	[% END %]	1168	[% END %]
1154	[% END %]	1169	[% END %]
1155	</select>	1170	</select></p>
1156	</li>	1171	</li>
1157	<li>	1172	<li>
1158	<label for="manageddate_from">Management date from:</label>	1173	<p for="manageddate_from">Management date from:
1159	<input type="text" id="manageddate_from" size="10" name="manageddate_from" value="[% manageddate_from \| html %]" data-date_to="manageddate_to" class="flatpickr" />	1174	<input type="text" id="manageddate_from" size="10" name="manageddate_from" value="[% manageddate_from \| html %]" data-date_to="manageddate_to" class="flatpickr" />
1160	</li>	1175	</p></li>
1161	<li>	1176	<li>
1162	<label for="manageddate_to">To:</label>	1177	<p for="manageddate_to">To:
1163	<input type="text" id="manageddate_to" size="10" name="manageddate_to" value="[% manageddate_to \| html %]" class="flatpickr" />	1178	<input type="text" id="manageddate_to" size="10" name="manageddate_to" value="[% manageddate_to \| html %]" class="flatpickr" />
1164	</li>	1179	</p></li>
1165	<li>	1180	<li>
1166	<label for="acceptedby"> Accepted by:</label>	1181	<p for="acceptedby"> Accepted by:
1167	<select id="acceptedby" name="acceptedby">	1182	<select id="acceptedby" name="acceptedby">
1168	<option value="">Any</option>	1183	<option value="">Any</option>
1169	[% FOREACH acceptedby_loo IN acceptedby_loop %]	1184	[% FOREACH acceptedby_loo IN acceptedby_loop %]
Lines 1174-1201 Link Here
1174	[% END %]	1189	[% END %]
1175	[% END %]	1190	[% END %]
1176	</select>	1191	</select>
1177	</li>	1192	</p></li>
1178	<li>	1193	<li>
1179	<label for="accepteddate_from">Accepted date from:</label>	1194	<p for="accepteddate_from">Accepted date from:
1180	<input type="text" id="accepteddate_from" size="10" name="accepteddate_from" value="[% accepteddate_from \| html %]" data-date_to="accepteddate_to" class="flatpickr" />	1195	<input type="text" id="accepteddate_from" size="10" name="accepteddate_from" value="[% accepteddate_from \| html %]" data-date_to="accepteddate_to" class="flatpickr" />
1181	</li>	1196	</p></li>
1182	<li>	1197	<li>
1183	<label for="accepteddate_to">To:</label>	1198	<p for="accepteddate_to">To:
1184	<input type="text" id="accepteddate_to" size="10" name="accepteddate_to" value="[% accepteddate_to \| html %]" class="flatpickr" />	1199	<input type="text" id="accepteddate_to" size="10" name="accepteddate_to" value="[% accepteddate_to \| html %]" class="flatpickr" />
1185	</li>	1200	</p></li>
1186	<li>	1201	<li>
1187	<input type="submit" value="Go" />	1202	<input class="principal" type="submit" value="Go" />
1188	</li>	1203	</li>
1189	</ol>	1204	</ol>
1190	</fieldset>	1205	</fieldset>
1191		1206
1192	<fieldset class="brief">	1207	<fieldset class="brief">
1193	<h4 class="local_collapse">	1208	<h4 class="local_collapse">
1194	<a href="#">Acquisition information</a>	1209	<a href="#">Acquisition information <span class="caret"></span></a>
1195	</h4>	1210	</h4>
1196	<ol>	1211	<ol>
1197	<li>	1212	<li>
1198	<label for="budgetid"> Book fund:</label>	1213	<p for="budgetid"> Book fund:
1199	<select name="budgetid" id="budgetid">	1214	<select name="budgetid" id="budgetid">
1200	<option value="__ANY__">Any</option>	1215	<option value="__ANY__">Any</option>
1201	[% IF budgetid == '__NONE__' %]	1216	[% IF budgetid == '__NONE__' %]
Lines 1210-1219 Link Here
1210	<option value="[% budgetsloo.budget_id \| html %]">[% budgetsloo.budget_name \| html %]</option>	1225	<option value="[% budgetsloo.budget_id \| html %]">[% budgetsloo.budget_name \| html %]</option>
1211	[% END %]	1226	[% END %]
1212	[% END %]	1227	[% END %]
1213	</select>	1228	</select></p>
1214	</li>	1229	</li>
1215	<li>	1230	<li>
1216	<input type="submit" value="Go" />	1231	<input class="principal" type="submit" value="Go" />
1217	</li>	1232	</li>
1218	</ol>	1233	</ol>
1219	</fieldset>	1234	</fieldset>
Lines 1221-1227 Link Here
1221	</form> <!-- /suggestionsfilter -->	1236	</form> <!-- /suggestionsfilter -->
1222		1237
1223	[% INCLUDE 'acquisitions-menu.inc' %]	1238	[% INCLUDE 'acquisitions-menu.inc' %]
1224		1239	</div>
1225	</aside>	1240	</aside>
1226	</div> <!-- /.col-sm-2.col-sm-pull-10 -->	1241	</div> <!-- /.col-sm-2.col-sm-pull-10 -->
1227	[% END # /UNLESS ( op == 'show' ) %]	1242	[% END # /UNLESS ( op == 'show' ) %]

Lines 2-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt (-3 / +11 lines)
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE AuthorisedValues %]	3	[% USE AuthorisedValues %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE 'cat-search.inc' %]
		7	[% END %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	<title>[% IF ( do_it ) %]Review[% ELSE %]Review tags[% END %] &rsaquo; Tags &rsaquo; Tools &rsaquo; Koha</title>	9	<title>[% IF ( do_it ) %]Review[% ELSE %]Review tags[% END %] &rsaquo; Tags &rsaquo; Tools &rsaquo; Koha</title>
7	[% INCLUDE 'doc-head-close.inc' %]	10	[% INCLUDE 'doc-head-close.inc' %]
Lines 10-17 tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : Link Here
10	</head>	13	</head>
11		14
12	<body id="tags_list" class="tools">	15	<body id="tags_list" class="tools">
13	[% INCLUDE 'header.inc' %]	16	[% INCLUDE 'header.inc' form=formulaire %]
14	[% INCLUDE 'cat-search.inc' %]
15		17
16	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	18	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
17	<ol>	19	<ol>
Lines 28-34 tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : Link Here
28	<a href="#" aria-current="page">	30	<a href="#" aria-current="page">
29	Results for tag <em>[% tag \| html %]</em>	31	Results for tag <em>[% tag \| html %]</em>
30	</a>	32	</a>
31	</li>	33	</li
		34	<ol>
		35	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		36	</ol>
		37	<ol>
		38	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		39	</ol>>
32	</ol>	40	</ol>
33	</nav>	41	</nav>
34		42

Lines 2-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt (-2 / +10 lines)
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE KohaDates %]	3	[% USE KohaDates %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE 'cat-search.inc' %]
		7	[% END %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	<title>[% IF ( do_it ) %]Review[% ELSE %]Review tags[% END %] &rsaquo; Tags &rsaquo; Tools &rsaquo; Koha</title>	9	<title>[% IF ( do_it ) %]Review[% ELSE %]Review tags[% END %] &rsaquo; Tags &rsaquo; Tools &rsaquo; Koha</title>
7	[% INCLUDE 'doc-head-close.inc' %]	10	[% INCLUDE 'doc-head-close.inc' %]
Lines 15-22 tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } Link Here
15	</head>	18	</head>
16		19
17	<body id="tags_review" class="tools">	20	<body id="tags_review" class="tools">
18	[% INCLUDE 'header.inc' %]	21	[% INCLUDE 'header.inc' form=formulaire %]
19	[% INCLUDE 'cat-search.inc' %]
20		22
21	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	23	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
22	<ol>	24	<ol>
Lines 32-37 tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } Link Here
32	</a>	34	</a>
33	</li>	35	</li>
34	</ol>	36	</ol>
		37	<ol>
		38	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		39	</ol>
		40	<ol>
		41	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		42	</ol>
35	</nav>	43	</nav>
36		44
37	<div class="main container-fluid">	45	<div class="main container-fluid">

Lines 2-13 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt (-2 / +11 lines)
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE KohaDates %]	3	[% USE KohaDates %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE 'cat-search.inc' %]
		7	[% END %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	<title>Access files</title>	9	<title>Access files</title>
7	[% INCLUDE 'doc-head-close.inc' %]	10	[% INCLUDE 'doc-head-close.inc' %]
8	</head>	11	</head>
9	<body id="tools_access_files" class="tools">	12	<body id="tools_access_files" class="tools">
10	[% INCLUDE 'header.inc' %]	13	[% INCLUDE 'header.inc' form=formulaire %]
11		14
12	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	15	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
13	<ol>	16	<ol>
Lines 23-28 Link Here
23	</a>	26	</a>
24	</li>	27	</li>
25	</ol>	28	</ol>
		29	<ol>
		30	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		31	</ol>
		32	<ol>
		33	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		34	</ol>
26	</nav>	35	</nav>
27		36
28	<div class="main container-fluid">	37	<div class="main container-fluid">
Lines 30-36 Link Here
30	<div class="col-sm-10 col-sm-push-2">	39	<div class="col-sm-10 col-sm-push-2">
31	<main>	40	<main>
32		41
33	<h1>Access files</h1>	42	<h2>Access files</h2>
34		43
35	[% IF ( error_no_dir ) %]	44	[% IF ( error_no_dir ) %]
36	<div class="dialog alert"><strong>Error: </strong>Files could not be found because the "access_dir" option was not set in "koha-conf.xml". Contact your system administrator to add this option.</div>	45	<div class="dialog alert"><strong>Error: </strong>Files could not be found because the "access_dir" option was not set in "koha-conf.xml". Contact your system administrator to add this option.</div>

Lines 4-9 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt (-44 / +60 lines)
4	[% USE KohaDates %]	4	[% USE KohaDates %]
5	[% USE Branches %]	5	[% USE Branches %]
6	[% SET footerjs = 1 %]	6	[% SET footerjs = 1 %]
		7	[% formulaire = BLOCK %]
		8	[% INCLUDE 'cat-search.inc' %]
		9	[% END %]
7	[% INCLUDE 'doc-head-open.inc' %]	10	[% INCLUDE 'doc-head-open.inc' %]
8	<title>Additional contents &rsaquo; Tools &rsaquo; Koha</title>	11	<title>Additional contents &rsaquo; Tools &rsaquo; Koha</title>
9	[% INCLUDE 'doc-head-close.inc' %]	12	[% INCLUDE 'doc-head-close.inc' %]
Lines 28-34 Link Here
28	</head>	31	</head>
29		32
30	<body id="tools_additional-contents" class="tools">	33	<body id="tools_additional-contents" class="tools">
31	[% INCLUDE 'header.inc' %]	34	[% INCLUDE 'header.inc' form=formulaire %]
32		35
33	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	36	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
34	<ol>	37	<ol>
Lines 70-75 Link Here
70	[% END %]	73	[% END %]
71		74
72	</ol>	75	</ol>
		76	<ol>
		77	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		78	</ol>
		79	<ol>
		80	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		81	</ol>
73	</nav>	82	</nav>
74		83
75	[% IF op == 'add_form' %]	84	[% IF op == 'add_form' %]
Lines 118-159 Link Here
118		127
119	<div class="col-sm-2 col-sm-pull-10">	128	<div class="col-sm-2 col-sm-pull-10">
120	<aside>	129	<aside>
121		130	<div id="filters">
122	<div id="news-filter">
123	<form action="/cgi-bin/koha/tools/additional-contents.pl" method="get">	131	<form action="/cgi-bin/koha/tools/additional-contents.pl" method="get">
124	<h4>Filter</h4>
125	<fieldset class="brief">	132	<fieldset class="brief">
126	<ol>	133	<h4>Filter</h4>
127	<li>	134
128	<label for="news_keyword">Keyword:</label>	135	<fieldset>
129	<input type="text" name="news_keyword" id="news_keyword" />	136	<ol>
130	</li>	137	<li>
131	<li>	138	<p for="news_keyword">Keyword:
132	<label for="news_display_location">Display location:</label>	139	<input type="text" name="news_keyword" id="news_keyword" /></p>
133	<select name="news_display_location" id="news_display_location">	140	</li>
134	<option value="">All</option>	141	<li>
135	[% PROCESS locations_options category => category %]	142	<p for="news_display_location">Display location:
136	</select>	143	<select name="news_display_location" id="news_display_location">
137	</li>	144	<option value="">All</option>
138	<li>	145	[% PROCESS locations_options category => category %]
139	<label for="news_library">Library: </label>	146	</select></p>
140	<select id="news_library" name="news_library">	147	</li>
141	<option value=""></option>	148	<li>
142	<option value="">All libraries</option>	149	<p for="news_library">Library:
143	[% PROCESS options_for_libraries libraries => Branches.all( selected => branchcode, unfiltered => 1, ) %]	150	<select id="news_library" name="news_library">
144	</select>	151	<option value=""></option>
145	</li>	152	<option value="">All libraries</option>
146	<li>	153	[% PROCESS options_for_libraries libraries => Branches.all( selected => branchcode, unfiltered => 1, ) %]
147	<label>	154	</select></p>
148	<input type="checkbox" name="show_expired" id="show_expired" /> Show expired	155	</li>
149	</label>	156	<li>
150	</li>	157	<p>
151	</ol>	158	<input type="checkbox" name="show_expired" id="show_expired" /> Show expired
		159	</p>
		160	</li>
		161	</ol>
		162	</fieldset>
152	</fieldset>	163	</fieldset>
153	</form>	164	</form>
154	</div>
155		165
156	[% INCLUDE 'tools-menu.inc' %]	166	[% INCLUDE 'tools-menu.inc' %]
		167	</div>
157	</aside>	168	</aside>
158	</div> <!-- /.col-sm-2.col-sm-pull-10 -->	169	</div> <!-- /.col-sm-2.col-sm-pull-10 -->
159	[% END %]	170	[% END %]
Lines 162-181 Link Here
162		173
163	[% BLOCK add_form %]	174	[% BLOCK add_form %]
164	[% IF additional_content %]	175	[% IF additional_content %]
165	<h1>Modify an additional content</h1>	176	<h2>Modify an additional content</h2>
166	[% ELSE %]	177	[% ELSE %]
167	<h1>New additional content ([% IF category == 'news' %]News[% ELSE %]HTML customizations[% END %])</h1>	178	<h2>New additional content ([% IF category == 'news' %]News[% ELSE %]HTML customizations[% END %])</h2>
168	[% END %]	179	[% END %]
169		180
170	<div id="toolbar" class="btn-toolbar">	181	<div id="toolbar" class="btn-toolbar">
171	<div class="btn-group">	182	<div class="btn-group">
172	<button class="btn btn-default" id="submit_form"><i class="fa fa-save"></i> Save</button>	183	<button class="principal" id="submit_form"><i class="fa fa-save"></i> Save</button>
173	</div>
174	[% IF category == 'news' %]	184	[% IF category == 'news' %]
175	<a class="btn btn-default cancel" href="/cgi-bin/koha/tools/additional-contents.pl"><i class="fa fa-remove"></i> Cancel</a>	185	<a class="cancel" href="/cgi-bin/koha/tools/additional-contents.pl"><i class="fa fa-remove"></i> Cancel</a>
176	[% ELSE %]	186	[% ELSE %]
177	<a class="btn btn-default cancel" href="/cgi-bin/koha/tools/additional-contents.pl?category=html_customizations"><i class="fa fa-remove"></i> Cancel</a>	187	<a class="cancel" href="/cgi-bin/koha/tools/additional-contents.pl?category=html_customizations"><i class="fa fa-remove"></i> Cancel</a>
178	[% END %]	188	[% END %]
		189	</div>
179	</div>	190	</div>
180		191
181	<form id="add_additional_content" method="post" action="/cgi-bin/koha/tools/additional-contents.pl" class="validate">	192	<form id="add_additional_content" method="post" action="/cgi-bin/koha/tools/additional-contents.pl" class="validate">
Lines 275-280 Link Here
275	<textarea name="content" id="content_default" data-lang="[% language.lang \| html %]" cols="75" rows="10">[% additional_content.content \| html %]</textarea>	286	<textarea name="content" id="content_default" data-lang="[% language.lang \| html %]" cols="75" rows="10">[% additional_content.content \| html %]</textarea>
276	</div>	287	</div>
277	</div>	288	</div>
		289	</div>
278	[% END %]	290	[% END %]
279	</form>	291	</form>
280	[% END %]	292	[% END %]
Lines 283-289 Link Here
283		295
284	<div id="toolbar" class="btn-toolbar">	296	<div id="toolbar" class="btn-toolbar">
285	<div class="btn-group">	297	<div class="btn-group">
286	<a href="/cgi-bin/koha/tools/additional-contents.pl?op=add_form&category=[% category \| uri %]&editmode=[% editmode \| uri %]" class="btn btn-default" id="newentry"> <i class="fa fa-plus"></i> New entry</a><button class="btn btn-default dropdown-toggle" data-toggle="dropdown">	298	<a href="/cgi-bin/koha/tools/additional-contents.pl?op=add_form&category=[% category \| uri %]&editmode=[% editmode \| uri %]" class="pat" id="newentry"> <i class="fa fa-plus"></i> New entry</a>
		299	<button class="pat fleche dropdown-toggle" data-toggle="dropdown">
287	<span class="caret"></span>	300	<span class="caret"></span>
288	</button>	301	</button>
289	<ul class="dropdown-menu pull-right">	302	<ul class="dropdown-menu pull-right">
Lines 300-306 Link Here
300		313
301	<h2>Additional contents ([% IF category == 'news' %]News[% ELSE %]HTML customizations[% END %])</h2>	314	<h2>Additional contents ([% IF category == 'news' %]News[% ELSE %]HTML customizations[% END %])</h2>
302	[% IF category == 'news' %]	315	[% IF category == 'news' %]
303	See <a href="/cgi-bin/koha/tools/additional-contents.pl?category=html_customizations">HTML customizations</a>	316	See <a href="/cgi-bin/koha/tools/additional-contents.pl?category=html_customizations" id="lientype">HTML customizations</a>
304	[% ELSE %]	317	[% ELSE %]
305	See <a href="/cgi-bin/koha/tools/additional-contents.pl?category=news">News</a>	318	See <a href="/cgi-bin/koha/tools/additional-contents.pl?category=news">News</a>
306	[% END %]	319	[% END %]
Lines 310-315 Link Here
310	[% END %]	323	[% END %]
311		324
312	[% IF additional_contents.count %]	325	[% IF additional_contents.count %]
		326	<div id="searchresults">
313	<form id="del_form" method="post" action="/cgi-bin/koha/tools/additional-contents.pl">	327	<form id="del_form" method="post" action="/cgi-bin/koha/tools/additional-contents.pl">
314	<table id="table_additional_contents">	328	<table id="table_additional_contents">
315	<thead>	329	<thead>
Lines 357-363 Link Here
357	<td>[% IF ( c.author) %][% INCLUDE 'patron-title.inc' patron=c.author %][% END %]</td>	371	<td>[% IF ( c.author) %][% INCLUDE 'patron-title.inc' patron=c.author %][% END %]</td>
358	<td>	372	<td>
359	<div class="btn-group">	373	<div class="btn-group">
360	<a class="preview_news btn btn-default btn-xs" data-number="[% loop.count \| html %]"><i class="fa fa-eye" aria-hidden="true"></i> Preview content</a>	374	<a class="preview_news btn btn-default btn-xs" data-number="[% loop.count \| html %]" id="lientype"><i class="fa fa-eye" aria-hidden="true"></i> Preview content</a>
361	</div>	375	</div>
362	<div id="contentModal[% loop.count \| html %]" class="modal" tabindex="-1" role="dialog" data-number="[% loop.count \| html %]">	376	<div id="contentModal[% loop.count \| html %]" class="modal" tabindex="-1" role="dialog" data-number="[% loop.count \| html %]">
363	<div class="modal-dialog" role="document">	377	<div class="modal-dialog" role="document">
Lines 376-382 Link Here
376	</td>	390	</td>
377	<td class="actions">	391	<td class="actions">
378	<div class="btn-group dropup">	392	<div class="btn-group dropup">
379	<a href="/cgi-bin/koha/tools/additional-contents.pl?op=add_form&id=[% c.idnew \| uri %]&editmode=[% editmode \| uri %]" class="btn btn-default btn-xs"> <i class="fa fa-pencil"></i> Edit</a><button class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">	393	<a href="/cgi-bin/koha/tools/additional-contents.pl?op=add_form&id=[% c.idnew \| uri %]&editmode=[% editmode \| uri %]" class="btn btn-default btn-xs" id="lientype"> <i class="fa fa-pencil"></i> Edit</a>
		394	<button class="btn btn-default btn-xs dropdown-toggle" id="lientype" data-toggle="dropdown">
380	<span class="caret"></span>	395	<span class="caret"></span>
381	</button>	396	</button>
382	<ul class="dropdown-menu pull-right">	397	<ul class="dropdown-menu pull-right">
Lines 390-396 Link Here
390	</ul>	405	</ul>
391	</div>	406	</div>
392	<div class="btn-group">	407	<div class="btn-group">
393	<a href="#" class="delete_news btn btn-default btn-xs" data-idnew="[% c.idnew \| html %]"><i class="fa fa-trash"></i> Delete</a>	408	<a href="#" class="delete_news btn btn-default btn-xs" data-idnew="[% c.idnew \| html %]" id="lientype"><i class="fa fa-trash"></i> Delete</a>
394	</div>	409	</div>
395	</td>	410	</td>
396	</tr>	411	</tr>
Lines 399-405 Link Here
399	</table>	414	</table>
400	<input type="hidden" name="op" value="delete_confirmed" />	415	<input type="hidden" name="op" value="delete_confirmed" />
401	<input type="hidden" name="category" value="[% category \| html %]" />	416	<input type="hidden" name="category" value="[% category \| html %]" />
402	<fieldset class="action"><input type="submit" class="button" value="Delete selected" /></fieldset>	417	<fieldset class="action"><input type="submit" class="button principal" value="Delete selected" /></fieldset>
403	</form>	418	</form>
404	<form action="/cgi-bin/koha/tools/additional-contents.pl" method="post" id="delete_single">	419	<form action="/cgi-bin/koha/tools/additional-contents.pl" method="post" id="delete_single">
405	<input type="hidden" id="del_op" name="op" value="delete_confirmed" />	420	<input type="hidden" id="del_op" name="op" value="delete_confirmed" />
Lines 409-414 Link Here
409	[% ELSE %]	424	[% ELSE %]
410	<div class="dialog message">There are no additional contents.</div>	425	<div class="dialog message">There are no additional contents.</div>
411	[% END %]	426	[% END %]
		427	</div>
412	[% END %]	428	[% END %]
413		429
414	[% BLOCK locations_options %]	430	[% BLOCK locations_options %]

Lines 1-13 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt (-12 / +25 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'cat-search.inc' %]
		6	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
5	<title>Automatic item modifications by age &rsaquo; Tools &rsaquo; Koha</title>	8	<title>Automatic item modifications by age &rsaquo; Tools &rsaquo; Koha</title>
6	[% INCLUDE 'doc-head-close.inc' %]	9	[% INCLUDE 'doc-head-close.inc' %]
7	</head>	10	</head>
8		11
9	<body id="tools_automatic_item_modification_by_age" class="tools">	12	<body id="tools_automatic_item_modification_by_age" class="tools">
10	[% INCLUDE 'header.inc' %]	13	[% INCLUDE 'header.inc' form=formulaire %]
11		14
12	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	15	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
13	<ol>	16	<ol>
Lines 35-40 Link Here
35	</li>	38	</li>
36	[% END %]	39	[% END %]
37	</ol>	40	</ol>
		41	<ol>
		42	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		43	</ol>
		44	<ol>
		45	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		46	</ol>
38	</nav>	47	</nav>
39		48
40	<div class="main container-fluid">	49	<div class="main container-fluid">
Lines 44-72 Link Here
44		53
45	[% IF ( op == 'edit_form' ) %]	54	[% IF ( op == 'edit_form' ) %]
46	<form method="post" id="rules_form" action="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl">	55	<form method="post" id="rules_form" action="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl">
47	<h1>Rules for automatic item modifications by age</h1>	56	<h2>Rules for automatic item modifications by age</h2>
48	<div id="toolbar" class="btn-toolbar">	57	<div id="toolbar" class="btn-toolbar">
49	<div class="btn-group">	58	<div class="btn-group">
50	<button class="btn btn-default add_rule"><i class="fa fa-plus"></i> Add rule</button>	59	<button class="pat add_rule"><i class="fa fa-plus"></i> Add rule</button>
51	</div>	60	</div>
52	<div class="btn-group">	61	<div class="btn-group">
53	<button type="submit" id="save_rules" class="btn btn-default"><i class="fa fa-save"></i> Save</button>	62	<button type="submit" id="save_rules" class="pat"><i class="fa fa-save"></i> Save</button>
54	</div>	63	</div>
55	<div class="btn-group">	64	<div class="btn-group">
56	<a class="btn btn-default" href="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl"><i class="fa fa-remove"></i> Cancel</a>	65	<a class="pat" href="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl"><i class="fa fa-remove"></i> Cancel</a>
57	</div>	66	</div>
58	</div>	67	</div>
		68	<h2>Rules for automatic item modifications by age</h2>
59	[% ELSE %]	69	[% ELSE %]
60	<h1>Automatic item modifications by age</h1>	70	<h2>Automatic item modifications by age</h2>
61	[% IF ( rules ) %]	71	[% IF ( rules ) %]
62	<div id="toolbar" class="btn-toolbar">	72	<div id="toolbar" class="btn-toolbar">
63	<a class="btn btn-default" id="newentry" href="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl?op=edit_form"><i class="fa fa-pencil"></i> Edit rules</a>	73	<div class="btn-group">
64	</div>	74	<a class="pat" id="newentry" href="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl?op=edit_form"><i class="fa fa-pencil"></i> Edit rules</a>
		75	</div></div>
65	[% ELSE %]	76	[% ELSE %]
66	<div id="toolbar" class="btn-toolbar">	77	<div id="toolbar" class="btn-toolbar">
67	<a class="btn btn-default" id="newentry" href="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl?op=edit_form"><i class="fa fa-plus"></i> Add rules</a>	78	<div class="btn-group">
68	</div>	79	<a class="pat" id="newentry" href="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl?op=edit_form"><i class="fa fa-plus"></i> Add rules</a>
		80	</div></div>
69	[% END %]	81	[% END %]
		82	<h2>Automatic item modifications by age</h2>
70	[% END %]	83	[% END %]
71		84
72	[% FOR message IN messages %]	85	[% FOR message IN messages %]
Lines 85-91 Link Here
85	[% FOR rule IN rules %]	98	[% FOR rule IN rules %]
86	[% SET id = loop.count %]	99	[% SET id = loop.count %]
87	<fieldset class="rule">	100	<fieldset class="rule">
88	<legend>Rule <span class="rulecount">[% loop.count \| html %]</span> <a href="#" class="remove_rule"><i class="fa fa-trash"></i> Remove this rule</a></legend>	101	<h3>Rule <span class="rulecount">[% loop.count \| html %]</span> <a href="#" class="remove_rule"><i class="fa fa-trash"></i> Remove this rule</a></h3>
89	<input type="hidden" name="unique_id" value="[% loop.count \| html %]" /> <!-- FIXME on update, the unique_id should be filled -->	102	<input type="hidden" name="unique_id" value="[% loop.count \| html %]" /> <!-- FIXME on update, the unique_id should be filled -->
90	<div class="age">	103	<div class="age">
91	<h5>Age in days</h5>	104	<h5>Age in days</h5>
Lines 160-166 Link Here
160	</div>	173	</div>
161		174
162	<fieldset id="new_rule">	175	<fieldset id="new_rule">
163	<legend>Rule <span class="rulecount"></span> <a href="#" class="remove_rule"><i class="fa fa-trash"></i> Remove this rule</a></legend>	176	<h3>Rule <span class="rulecount"></span> <a href="#" class="remove_rule"><i class="fa fa-trash"></i> Remove this rule</a></h3>
164	<input type="hidden" name="unique_id" />	177	<input type="hidden" name="unique_id" />
165	<div class="age">	178	<div class="age">
166	<h5>Age in days</h5>	179	<h5>Age in days</h5>

Lines 4-9 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt (-2 / +11 lines)
4	[% USE Asset %]	4	[% USE Asset %]
5	[% USE Branches %]	5	[% USE Branches %]
6	[% SET footerjs = 1 %]	6	[% SET footerjs = 1 %]
		7	[% formulaire = BLOCK %]
		8	[% INCLUDE 'cat-search.inc' %]
		9	[% END %]
7	[% PROCESS 'i18n.inc' %]	10	[% PROCESS 'i18n.inc' %]
8	[% INCLUDE 'doc-head-open.inc' %]	11	[% INCLUDE 'doc-head-open.inc' %]
9	<title>Batch item deletion &rsaquo; Tools &rsaquo; Koha</title>	12	<title>Batch item deletion &rsaquo; Tools &rsaquo; Koha</title>
Lines 13-19 Link Here
13	<![endif]-->	16	<![endif]-->
14	</head>	17	</head>
15	<body id="tools_batchMod-del" class="tools">	18	<body id="tools_batchMod-del" class="tools">
16	[% INCLUDE 'header.inc' %]	19	[% INCLUDE 'header.inc' form=formulaire %]
17		20
18	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	21	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
19	<ol>	22	<ol>
Lines 27-32 Link Here
27	<a href="#" aria-current="page">Batch item deletion</a>	30	<a href="#" aria-current="page">Batch item deletion</a>
28	</li>	31	</li>
29	</ol>	32	</ol>
		33	<ol>
		34	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		35	</ol>
		36	<ol>
		37	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		38	</ol>
30	</nav>	39	</nav>
31		40
32	<div class="main container-fluid">	41	<div class="main container-fluid">
Lines 155-161 Link Here
155	</fieldset>	164	</fieldset>
156	</div>	165	</div>
157	[% ELSE %]	166	[% ELSE %]
158	<p><a href="/cgi-bin/koha/tools/batchMod.pl?del=1">Return to batch item deletion</a></p>	167	<p><a href="/cgi-bin/koha/tools/batchMod.pl?del=1" id="lientype">Return to batch item deletion</a></p>
159	[% END %]	168	[% END %]
160	[% END %]	169	[% END %]
161	</form>	170	</form>

Lines 4-9 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt (-1 / +10 lines)
4	[% USE KohaDates %]	4	[% USE KohaDates %]
5	[% USE Branches %]	5	[% USE Branches %]
6	[% SET footerjs = 1 %]	6	[% SET footerjs = 1 %]
		7	[% formulaire = BLOCK %]
		8	[% INCLUDE 'cat-search.inc' %]
		9	[% END %]
7	[% INCLUDE 'doc-head-open.inc' %]	10	[% INCLUDE 'doc-head-open.inc' %]
8	<title>Batch item modification &rsaquo; Tools &rsaquo; Koha</title>	11	<title>Batch item modification &rsaquo; Tools &rsaquo; Koha</title>
9	[% INCLUDE 'doc-head-close.inc' %]	12	[% INCLUDE 'doc-head-close.inc' %]
Lines 13-19 Link Here
13	</head>	16	</head>
14		17
15	<body id="tools_batchMod-edit" class="tools">	18	<body id="tools_batchMod-edit" class="tools">
16	[% INCLUDE 'header.inc' %]	19	[% INCLUDE 'header.inc' form=formulaire %]
17		20
18	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	21	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
19	<ol>	22	<ol>
Lines 27-32 Link Here
27	<a href="#" aria-current="page">Batch item modification</a>	30	<a href="#" aria-current="page">Batch item modification</a>
28	</li>	31	</li>
29	</ol>	32	</ol>
		33	<ol>
		34	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		35	</ol>
		36	<ol>
		37	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		38	</ol>
30	</nav>	39	</nav>
31		40
32	<div class="main container-fluid">	41	<div class="main container-fluid">

Lines 1-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt (-6 / +15 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'cat-search.inc' %]
		6	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
5	<title>[% IF ( del ) %]Batch item deletion[% ELSE %]Batch item modification[% END %] &rsaquo; Tools &rsaquo; Koha</title>	8	<title>[% IF ( del ) %]Batch item deletion[% ELSE %]Batch item modification[% END %] &rsaquo; Tools &rsaquo; Koha</title>
6	[% INCLUDE 'doc-head-close.inc' %]	9	[% INCLUDE 'doc-head-close.inc' %]
7	</head>	10	</head>
8	<body id="tools_batchMod" class="tools">	11	<body id="tools_batchMod" class="tools">
9	[% INCLUDE 'header.inc' %]	12	[% INCLUDE 'header.inc' form=formulaire %]
10		13
11	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	14	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
12	<ol>	15	<ol>
Lines 31-36 Link Here
31	</li>	34	</li>
32	[% END %]	35	[% END %]
33	</ol>	36	</ol>
		37	<ol>
		38	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		39	</ol>
		40	<ol>
		41	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		42	</ol>
34	</nav>	43	</nav>
35		44
36	<div class="main container-fluid">	45	<div class="main container-fluid">
Lines 38-47 Link Here
38	<div class="col-sm-10 col-sm-push-2">	47	<div class="col-sm-10 col-sm-push-2">
39	<main>	48	<main>
40		49
41	<h1>Batch item [% IF ( del ) %]deletion[% ELSE %]modification[% END %]</h1>	50	<h2>Batch item [% IF ( del ) %]deletion[% ELSE %]modification[% END %]</h2>
42	<form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/tools/batchMod.pl">	51	<form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/tools/batchMod.pl">
43	<fieldset class="rows">	52	<fieldset class="rows">
44	<legend>Use a file</legend>	53	<h3>Use a file</h3>
45	<ol>	54	<ol>
46	<li>	55	<li>
47	<label for="barcode_file">Barcode file: </label><input type="radio" name="filecontent" value="barcode_file" id="barcode_file" checked="checked" /></li>	56	<label for="barcode_file">Barcode file: </label><input type="radio" name="filecontent" value="barcode_file" id="barcode_file" checked="checked" /></li>
Lines 52-58 Link Here
52	</ol>	61	</ol>
53	</fieldset>	62	</fieldset>
54	<fieldset class="rows">	63	<fieldset class="rows">
55	<legend>Or scan items one by one</legend>	64	<h3>Or scan items one by one</h3>
56	<ol>	65	<ol>
57	<li>	66	<li>
58	<label for="barcodelist">Barcode list (one barcode per line): </label>	67	<label for="barcodelist">Barcode list (one barcode per line): </label>
Lines 64-70 Link Here
64		73
65	[% UNLESS del %]	74	[% UNLESS del %]
66	<fieldset class="rows">	75	<fieldset class="rows">
67	<legend>Use default values</legend>	76	<h3>Use default values</h3>
68	<ol class="radio">	77	<ol class="radio">
69	<li>	78	<li>
70	<label>	79	<label>
Lines 78-84 Link Here
78		87
79	[% IF ( del ) %]<input type="hidden" name="del" value="1" />[% END %]	88	[% IF ( del ) %]<input type="hidden" name="del" value="1" />[% END %]
80	<fieldset class="action">	89	<fieldset class="action">
81	<input type="submit" value="Continue" class="button" />	90	<input class="principal" type="submit" value="Continue" class="button" />
82	<a class="cancel" href="/cgi-bin/koha/tools/tools-home.pl">Cancel</a>	91	<a class="cancel" href="/cgi-bin/koha/tools/tools-home.pl">Cancel</a>
83	</fieldset>	92	</fieldset>
84		93

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt (-7 / +19 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'cat-search.inc' %]
		6	[% END %]
4	[% PROCESS 'authorities-search-results.inc' %]	7	[% PROCESS 'authorities-search-results.inc' %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	<title>Batch record deletion &rsaquo; Tools &rsaquo; Koha</title>	9	<title>Batch record deletion &rsaquo; Tools &rsaquo; Koha</title>
Lines 8-14 Link Here
8	</head>	11	</head>
9		12
10	<body id="tools_batch_delete_records" class="tools">	13	<body id="tools_batch_delete_records" class="tools">
11	[% INCLUDE 'header.inc' %]	14	[% INCLUDE 'header.inc' form=formulaire %]
12		15
13	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	16	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
14	<ol>	17	<ol>
Lines 22-27 Link Here
22	<a href="#" aria-current="page">Batch record deletion</a>	25	<a href="#" aria-current="page">Batch record deletion</a>
23	</li>	26	</li>
24	</ol>	27	</ol>
		28	<ol>
		29	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		30	</ol>
		31	<ol>
		32	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		33	</ol>
25	</nav>	34	</nav>
26		35
27	<div class="main container-fluid">	36	<div class="main container-fluid">
Lines 29-35 Link Here
29	<div class="col-sm-10 col-sm-push-2">	38	<div class="col-sm-10 col-sm-push-2">
30	<main>	39	<main>
31		40
32	<h1>Batch record deletion</h1>	41	<h2>Batch record deletion</h2>
33	[% FOREACH message IN messages %]	42	[% FOREACH message IN messages %]
34	[% IF message.type == 'success' %]	43	[% IF message.type == 'success' %]
35	<div class="dialog message">	44	<div class="dialog message">
Lines 58-64 Link Here
58	[% IF op == 'form' %]	67	[% IF op == 'form' %]
59	<form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/tools/batch_delete_records.pl" id="record_ids_selection">	68	<form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/tools/batch_delete_records.pl" id="record_ids_selection">
60	<fieldset class="rows">	69	<fieldset class="rows">
61	<legend>Record type</legend>	70	<h3>Record type</h3>
62	<ol>	71	<ol>
63	<li><label for="biblio_type">Bibliographic: </label><input type="radio" name="recordtype" value="biblio" id="biblio_type" checked="checked" /></li>	72	<li><label for="biblio_type">Bibliographic: </label><input type="radio" name="recordtype" value="biblio" id="biblio_type" checked="checked" /></li>
64	<li><label for="authority_type">Authorities: </label><input type="radio" name="recordtype" value="authority" id="authority_type" /></li>	73	<li><label for="authority_type">Authorities: </label><input type="radio" name="recordtype" value="authority" id="authority_type" /></li>
Lines 66-71 Link Here
66	</fieldset>	75	</fieldset>
67		76
68	<div id="batch_del_form" class="toptabs">	77	<div id="batch_del_form" class="toptabs">
		78	<fieldset id="searchresults">
69	<ul class="nav nav-tabs" role="tablist">	79	<ul class="nav nav-tabs" role="tablist">
70	<li role="presentation" class="active">	80	<li role="presentation" class="active">
71	<a href="#uploadfile_tab" aria-controls="uploadfile_tab" role="tab" data-toggle="tab">Upload a file</a>	81	<a href="#uploadfile_tab" aria-controls="uploadfile_tab" role="tab" data-toggle="tab">Upload a file</a>
Lines 83-88 Link Here
83	<div class="tab-content">	93	<div class="tab-content">
84	<div id="uploadfile_tab" role="tabpanel" class="tab-pane active">	94	<div id="uploadfile_tab" role="tabpanel" class="tab-pane active">
85	<fieldset class="rows">	95	<fieldset class="rows">
		96	<h3>Use a file</h3>
86	<ol>	97	<ol>
87	<li><label for="uploadfile">File: </label> <input type="file" id="uploadfile" name="uploadfile" /></li>	98	<li><label for="uploadfile">File: </label> <input type="file" id="uploadfile" name="uploadfile" /></li>
88	</ol>	99	</ol>
Lines 93-98 Link Here
93	[% IF lists.count %]	104	[% IF lists.count %]
94	<div id="shelves_tab" role="tabpanel" class="tab-pane">	105	<div id="shelves_tab" role="tabpanel" class="tab-pane">
95	<fieldset class="rows">	106	<fieldset class="rows">
		107	<h3>Or select a list of records</h3>
96	<ol>	108	<ol>
97	<li>	109	<li>
98	<label for="shelf_number">List: </label>	110	<label for="shelf_number">List: </label>
Lines 111-116 Link Here
111		123
112	<div id="enterlist_tab" role="tabpanel" class="tab-pane">	124	<div id="enterlist_tab" role="tabpanel" class="tab-pane">
113	<fieldset class="rows">	125	<fieldset class="rows">
		126	<h3>Or enter a list of record numbers</h3>
114	<ol>	127	<ol>
115	<li>	128	<li>
116	<label for="recordnumber_list">IDs: </label>	129	<label for="recordnumber_list">IDs: </label>
Lines 121-133 Link Here
121	</fieldset>	134	</fieldset>
122		135
123	</div>	136	</div>
124		137	</fieldset>
125	</div> <!-- /.tab-content -->	138	</div>
126	</div>
127		139
128	<fieldset class="action">	140	<fieldset class="action">
129	<input type="hidden" name="op" value="list" />	141	<input type="hidden" name="op" value="list" />
130	<input type="submit" value="Continue" class="button" />	142	<input class="principal" type="submit" value="Continue" class="button" />
131	<a class="cancel" href="/cgi-bin/koha/tools/tools-home.pl">Cancel</a>	143	<a class="cancel" href="/cgi-bin/koha/tools/tools-home.pl">Cancel</a>
132	</fieldset>	144	</fieldset>
133	</form>	145	</form>

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt (-6 / +15 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'cat-search.inc' %]
		6	[% END %]
4	[% USE Branches %]	7	[% USE Branches %]
5	[% USE Categories %]	8	[% USE Categories %]
6	[% USE KohaDates %]	9	[% USE KohaDates %]
Lines 14-20 Link Here
14	</head>	17	</head>
15		18
16	<body id="tools_batch_extend_due_dates" class="tools">	19	<body id="tools_batch_extend_due_dates" class="tools">
17	[% INCLUDE 'header.inc' %]	20	[% INCLUDE 'header.inc' form=formulaire %]
18		21
19	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	22	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
20	<ol>	23	<ol>
Lines 28-33 Link Here
28	<a href="#" aria-current="page">Batch extend due dates</a>	31	<a href="#" aria-current="page">Batch extend due dates</a>
29	</li>	32	</li>
30	</ol>	33	</ol>
		34	<ol>
		35	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		36	</ol>
		37	<ol>
		38	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		39	</ol>
31	</nav>	40	</nav>
32		41
33	<div class="main container-fluid">	42	<div class="main container-fluid">
Lines 35-41 Link Here
35	<div class="col-sm-10 col-sm-push-2">	44	<div class="col-sm-10 col-sm-push-2">
36	<main>	45	<main>
37		46
38	<h1>Batch extend due dates</h1>	47	<h2>Batch extend due dates</h2>
39		48
40	[% IF ( messages ) %]	49	[% IF ( messages ) %]
41	<div class="dialog message">	50	<div class="dialog message">
Lines 60-66 Link Here
60	[% IF view == 'form' %]	69	[% IF view == 'form' %]
61	<form method="post" action="/cgi-bin/koha/tools/batch_extend_due_dates.pl" id="extend_due_dates_form">	70	<form method="post" action="/cgi-bin/koha/tools/batch_extend_due_dates.pl" id="extend_due_dates_form">
62	<fieldset class="rows">	71	<fieldset class="rows">
63	<legend>Checkout criteria:</legend>	72	<h3>Checkout criteria:</h3>
64	<ol>	73	<ol>
65	<li>	74	<li>
66	<label for="categorycodes">Patrons' categories: </label>	75	<label for="categorycodes">Patrons' categories: </label>
Lines 91-97 Link Here
91	</ol>	100	</ol>
92	</fieldset>	101	</fieldset>
93	<fieldset class="rows">	102	<fieldset class="rows">
94	<legend>New due date:</legend>	103	<h3>New due date:</h3>
95	<ol>	104	<ol>
96	<li>	105	<li>
97	<label for="new_hard_due_date">Hard due date: </label>	106	<label for="new_hard_due_date">Hard due date: </label>
Lines 105-111 Link Here
105	</ol>	114	</ol>
106	</fieldset>	115	</fieldset>
107	<fieldset class="rows">	116	<fieldset class="rows">
108	<legend>Options:</legend>	117	<h3>Options:</h3>
109	<ol>	118	<ol>
110	<li>	119	<li>
111	<label for="preview_results">Preview results:</label>	120	<label for="preview_results">Preview results:</label>
Lines 116-122 Link Here
116	</fieldset>	125	</fieldset>
117	<fieldset class="action">	126	<fieldset class="action">
118	<input type="hidden" name="op" value="list" />	127	<input type="hidden" name="op" value="list" />
119	<input type="submit" value="Continue" class="button" />	128	<input type="submit" value="Continue" class="button principal" />
120	<a class="cancel" href="/cgi-bin/koha/tools/tools-home.pl">Cancel</a>	129	<a class="cancel" href="/cgi-bin/koha/tools/tools-home.pl">Cancel</a>
121	</fieldset>	130	</fieldset>
122	</form> <!-- /#extend_due_dates_form -->	131	</form> <!-- /#extend_due_dates_form -->

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt (-9 / +34 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'cat-search.inc' %]
		6	[% END %]
4	[% PROCESS 'authorities-search-results.inc' %]	7	[% PROCESS 'authorities-search-results.inc' %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	<title>Batch record modification &rsaquo; Tools &rsaquo; Koha</title>	9	<title>Batch record modification &rsaquo; Tools &rsaquo; Koha</title>
Lines 9-15 Link Here
9	</head>	12	</head>
10		13
11	<body id="tools_batch_record_modification" class="tools">	14	<body id="tools_batch_record_modification" class="tools">
12	[% INCLUDE 'header.inc' %]	15	[% INCLUDE 'header.inc' form=formulaire %]
13		16
14	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	17	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
15	<ol>	18	<ol>
Lines 23-28 Link Here
23	<a href="#" aria-current="page">Batch record modification</a>	26	<a href="#" aria-current="page">Batch record modification</a>
24	</li>	27	</li>
25	</ol>	28	</ol>
		29	<ol>
		30	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		31	</ol>
		32	<ol>
		33	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		34	</ol>
26	</nav>	35	</nav>
27		36
28	<div class="main container-fluid">	37	<div class="main container-fluid">
Lines 30-36 Link Here
30	<div class="col-sm-10 col-sm-push-2">	39	<div class="col-sm-10 col-sm-push-2">
31	<main>	40	<main>
32		41
33	<h1>Batch record modification</h1>	42	<h2>Batch record modification</h2>
34		43
35	[% IF ( messages ) %]	44	[% IF ( messages ) %]
36	<div class="dialog message">	45	<div class="dialog message">
Lines 64-70 Link Here
64	[% IF view == 'form' %]	73	[% IF view == 'form' %]
65	<form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/tools/batch_record_modification.pl" id="record_ids_selection">	74	<form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/tools/batch_record_modification.pl" id="record_ids_selection">
66	<fieldset class="rows">	75	<fieldset class="rows">
67	<legend>Record type</legend>	76	<h3>Record type</h3>
68	<ol>	77	<ol>
69	<li><label for="biblio_type">Biblios: </label><input type="radio" name="recordtype" value="biblio" id="biblio_type" checked="checked" /></li>	78	<li><label for="biblio_type">Biblios: </label><input type="radio" name="recordtype" value="biblio" id="biblio_type" checked="checked" /></li>
70	<li><label for="authority_type">Authorities: </label><input type="radio" name="recordtype" value="authority" id="authority_type" /></li>	79	<li><label for="authority_type">Authorities: </label><input type="radio" name="recordtype" value="authority" id="authority_type" /></li>
Lines 74-79 Link Here
74	<br><br>	83	<br><br>
75		84
76	<div id="batch_mod_form" class="toptabs" style="clear:both">	85	<div id="batch_mod_form" class="toptabs" style="clear:both">
		86	<fieldset id="searchresults">
77	<ul class="nav nav-tabs" role="tablist">	87	<ul class="nav nav-tabs" role="tablist">
78	<li role="presentation" class="active">	88	<li role="presentation" class="active">
79	<a href="#uploadfile_tab" aria-controls="uploadfile_tab" role="tab" data-toggle="tab">Upload a file</a>	89	<a href="#uploadfile_tab" aria-controls="uploadfile_tab" role="tab" data-toggle="tab">Upload a file</a>
Lines 120-125 Link Here
120		130
121	<div id="enterlist_tab" role="tabpanel" class="tab-pane">	131	<div id="enterlist_tab" role="tabpanel" class="tab-pane">
122	<fieldset class="rows">	132	<fieldset class="rows">
		133	<h3>Or select a list of records</h3>
123	<ol>	134	<ol>
124	<li>	135	<li>
125	<label for="recordnumber_list">Record numbers: </label>	136	<label for="recordnumber_list">Record numbers: </label>
Lines 130-140 Link Here
130	</fieldset>	141	</fieldset>
131		142
132	</div>	143	</div>
133	</div> <!-- /.tab-content -->	144	[% END %]
		145
		146	<div id="enterlist_tab">
		147	<fieldset class="rows">
		148	<h3>Or enter a list of record numbers</h3>
		149	<ol>
		150	<li>
		151	<label for="recordnumber_list">List of biblionumbers or authority ids (one per line): </label>
		152	<textarea rows="10" cols="30" id="recordnumber_list" name="recordnumber_list"></textarea>
		153	</li>
		154	</ol>
		155	</fieldset>
		156
		157	</div>
		158	</fieldset>
134	</div> <!-- /#batch_mod_form -->	159	</div> <!-- /#batch_mod_form -->
135		160
136	<fieldset class="rows">	161	<fieldset class="rows">
137	<legend>MARC modification template</legend>	162	<h3>Use MARC modification template:</h3>
138	<ol>	163	<ol>
139	<li>	164	<li>
140	<label for="marc_modification_template_id" class="required">Template: </label>	165	<label for="marc_modification_template_id" class="required">Template: </label>
Lines 149-155 Link Here
149	</fieldset>	174	</fieldset>
150	<fieldset class="action">	175	<fieldset class="action">
151	<input type="hidden" name="op" value="list" />	176	<input type="hidden" name="op" value="list" />
152	<input type="submit" value="Continue" class="button" />	177	<input class="principal" type="submit" value="Continue" class="button" />
153	<a class="cancel" href="/cgi-bin/koha/tools/tools-home.pl">Cancel</a>	178	<a class="cancel" href="/cgi-bin/koha/tools/tools-home.pl">Cancel</a>
154	</fieldset>	179	</fieldset>
155	</form> <!-- /#record_ids_selection -->	180	</form> <!-- /#record_ids_selection -->
Lines 178-184 Link Here
178	<div id="loading"> <img src="[% interface \| html %]/[% theme \| html %]/img/spinner-small.gif" alt="" /> Loading </div>	203	<div id="loading"> <img src="[% interface \| html %]/[% theme \| html %]/img/spinner-small.gif" alt="" /> Loading </div>
179	</div>	204	</div>
180	<div class="modal-footer">	205	<div class="modal-footer">
181	<button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button>	206	<button class="btn btn-default cancel" data-dismiss="modal" aria-hidden="true">Close</button>
182	</div>	207	</div>
183	</div>	208	</div>
184	</div>	209	</div>
Lines 204-210 Link Here
204	<td>[% biblio.biblionumber \| html %]</td>	229	<td>[% biblio.biblionumber \| html %]</td>
205	<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber \| uri %]">[% biblio.title \| html %]</a></td>	230	<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber \| uri %]">[% biblio.title \| html %]</a></td>
206	<td class="actions">	231	<td class="actions">
207	<a href="/cgi-bin/koha/svc/records/preview?record_type=biblio&record_id=[% biblio.biblionumber \| uri %]&mmtid=[% mmtid \| uri %]&overlay_context=batchmod" class="previewMARC btn btn-default btn-xs" data-record_type="biblio" data-record_id="[% biblio.biblionumber \| html %]" data-mmtid="[% mmtid \| html %]" title="Preview MARC"><i class="fa fa-eye"></i> Show MARC</a>	232	<a href="/cgi-bin/koha/svc/records/preview?record_type=biblio&record_id=[% biblio.biblionumber \| uri %]&mmtid=[% mmtid \| uri %]&overlay_context=batchmod" class="previewMARC btn btn-default btn-xs" data-record_type="biblio" data-record_id="[% biblio.biblionumber \| html %]" data-mmtid="[% mmtid \| html %]" id="lientype" title="Preview MARC"><i class="fa fa-eye"></i> Show MARC</a>
208	</td>	233	</td>
209	</tr>	234	</tr>
210	[% END %]	235	[% END %]
Lines 241-247 Link Here
241	<fieldset class="action">	266	<fieldset class="action">
242	<input type="hidden" name="op" value="modify" />	267	<input type="hidden" name="op" value="modify" />
243	<input type="hidden" name="recordtype" value="[% recordtype \| html %]" />	268	<input type="hidden" name="recordtype" value="[% recordtype \| html %]" />
244	<input type="submit" id="mainformsubmit" value="Modify selected records" class="button" />	269	<input type="submit" class="principal" id="mainformsubmit" value="Modify selected records" class="button" />
245	</fieldset>	270	</fieldset>
246	</form> <!-- /#process -->	271	</form> <!-- /#process -->
247	[% ELSE %]	272	[% ELSE %]

Lines 4-9 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt (-9 / +18 lines)
4	[% USE KohaDates %]	4	[% USE KohaDates %]
5	[% USE Branches %]	5	[% USE Branches %]
6	[% SET footerjs = 1 %]	6	[% SET footerjs = 1 %]
		7	[% formulaire = BLOCK %]
		8	[% INCLUDE 'cat-search.inc' %]
		9	[% END %]
7	[% INCLUDE 'doc-head-open.inc' %]	10	[% INCLUDE 'doc-head-open.inc' %]
8	<title>	11	<title>
9	[% IF step == 2 %]	12	[% IF step == 2 %]
Lines 16-22 Link Here
16	</head>	19	</head>
17		20
18	<body id="tools_cleanborrowers" class="tools">	21	<body id="tools_cleanborrowers" class="tools">
19	[% INCLUDE 'header.inc' %]	22	[% INCLUDE 'header.inc' form=formulaire %]
20		23
21	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	24	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
22	<ol>	25	<ol>
Lines 55-60 Link Here
55	</li>	58	</li>
56	[% END %]	59	[% END %]
57	</ol>	60	</ol>
		61	<ol>
		62	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		63	</ol>
		64	<ol>
		65	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		66	</ol>
58	</nav>	67	</nav>
59		68
60	<div class="main container-fluid">	69	<div class="main container-fluid">
Lines 64-72 Link Here
64		73
65	[% IF !OnlyMine %]	74	[% IF !OnlyMine %]
66	[% IF current_branch == '*' %]	75	[% IF current_branch == '*' %]
67	<h1>Batch patron deletion and anonymization</h1>	76	<h2>Batch patron deletion and anonymization</h2>
68	[% ELSE %]	77	[% ELSE %]
69	<h1>Batch patron deletion and anonymization for [% Branches.GetName( current_branch ) \| html %]</h1>	78	<h2>Batch patron deletion and anonymization for [% Branches.GetName( current_branch ) \| html %]</h2>
70	[% END %]	79	[% END %]
71	[% IF step == 1 %]	80	[% IF step == 1 %]
72	<form method="get" action="/cgi-bin/koha/tools/cleanborrowers.pl" id="selectlibrary">	81	<form method="get" action="/cgi-bin/koha/tools/cleanborrowers.pl" id="selectlibrary">
Lines 84-90 Link Here
84	</form>	93	</form>
85	[% END %]	94	[% END %]
86	[% ELSE %]	95	[% ELSE %]
87	<h1>Batch patron deletion and anonymization for [% Branches.GetLoggedInBranchname \| html %]</h1>	96	<h2>Batch patron deletion and anonymization for [% Branches.GetLoggedInBranchname \| html %]</h2>
88	[% END %]	97	[% END %]
89		98
90	[% IF step == 1 %]	99	[% IF step == 1 %]
Lines 103-109 Link Here
103	<div id="step1">	112	<div id="step1">
104	<form name="f1" id="delete_patrons_form" action="/cgi-bin/koha/tools/cleanborrowers.pl" method="post">	113	<form name="f1" id="delete_patrons_form" action="/cgi-bin/koha/tools/cleanborrowers.pl" method="post">
105	<fieldset>	114	<fieldset>
106	<legend>Delete patrons</legend>	115	<h3>Delete patrons</h3>
107	<h3><input id="checkborrower" type="checkbox" name="checkbox" value="borrower" /><label for="checkborrower"> Verify you want to delete patrons</label></h3>	116	<h3><input id="checkborrower" type="checkbox" name="checkbox" value="borrower" /><label for="checkborrower"> Verify you want to delete patrons</label></h3>
108	<br />	117	<br />
109	<h5>Delete patrons who meet the following criteria:</h5>	118	<h5>Delete patrons who meet the following criteria:</h5>
Lines 151-157 Link Here
151	</fieldset>	160	</fieldset>
152		161
153	<fieldset>	162	<fieldset>
154	<legend>Anonymize checkout history</legend>	163	<h3>Anonymize checkout history</h3>
155	[% UNLESS Koha.Preference('AnonymousPatron') %]	164	[% UNLESS Koha.Preference('AnonymousPatron') %]
156	<div class="dialog message">The AnonymousPatron system preference is not defined. You can use this feature anyway but NULL will be used to update the checkout history.</div>	165	<div class="dialog message">The AnonymousPatron system preference is not defined. You can use this feature anyway but NULL will be used to update the checkout history.</div>
157	[% END %]	166	[% END %]
Lines 169-175 Link Here
169	<input type="hidden" name="step" value="2" />	178	<input type="hidden" name="step" value="2" />
170	<input type="hidden" name="branch" value="[% current_branch \| html %]" />	179	<input type="hidden" name="branch" value="[% current_branch \| html %]" />
171	</fieldset>	180	</fieldset>
172	<fieldset class="action"><input type="submit" value="Next >>" /></fieldset>	181	<fieldset class="action"><input type="submit" class="principal" value="Next >>" /></fieldset>
173	</form>	182	</form>
174	</div>	183	</div>
175	<!-- step 1 END -->	184	<!-- step 1 END -->
Lines 190-196 Link Here
190		199
191	[% IF patrons_to_delete.size %]	200	[% IF patrons_to_delete.size %]
192	<fieldset>	201	<fieldset>
193	<legend>How should patrons be deleted?</legend>	202	<h3>How should patrons be deleted?</h3>
194	<p>	203	<p>
195	<input id="delete" type="radio" name="radio" value="delete" />	204	<input id="delete" type="radio" name="radio" value="delete" />
196	<label for="delete">Permanently delete these patrons</label>	205	<label for="delete">Permanently delete these patrons</label>
Lines 230-236 Link Here
230	<input type="hidden" name="borrower_categorycode" value="[% borrower_categorycode \| html %]" />	239	<input type="hidden" name="borrower_categorycode" value="[% borrower_categorycode \| html %]" />
231	<input type="hidden" name="patron_list_id" value="[% patron_list_id \| html %]" />	240	<input type="hidden" name="patron_list_id" value="[% patron_list_id \| html %]" />
232	<input type="hidden" name="branch" value="[% current_branch \| html %]" />	241	<input type="hidden" name="branch" value="[% current_branch \| html %]" />
233	<fieldset class="action"><input type="submit" value="Finish" /> <a class="cancel" href="/cgi-bin/koha/tools/cleanborrowers.pl">Cancel</a></fieldset>	242	<fieldset class="action"><input class="principal" type="submit" value="Finish" /> <a class="cancel" href="/cgi-bin/koha/tools/cleanborrowers.pl">Cancel</a></fieldset>
234	</form>	243	</form>
235	</div>	244	</div>
236	<!-- STEP 2 END -->	245	<!-- STEP 2 END -->

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt (-5 / +16 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'cat-search.inc' %]
		6	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
5	<title>	8	<title>
6	[% IF op == 'add_form' %]	9	[% IF op == 'add_form' %]
Lines 16-22 Link Here
16	</head>	19	</head>
17		20
18	<body id="tools_csv-profiles" class="tools">	21	<body id="tools_csv-profiles" class="tools">
19	[% INCLUDE 'header.inc' %]	22	[% INCLUDE 'header.inc' form=formulaire %]
20		23
21	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	24	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
22	<ol>	25	<ol>
Lines 49-54 Link Here
49	</li>	52	</li>
50	[% END %]	53	[% END %]
51	</ol>	54	</ol>
		55	<ol>
		56	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		57	</ol>
		58	<ol>
		59	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		60	</ol>
52	</nav>	61	</nav>
53		62
54	<div class="main container-fluid">	63	<div class="main container-fluid">
Lines 259-265 Link Here
259	</ol>	268	</ol>
260	</fieldset>	269	</fieldset>
261	<fieldset class="action">	270	<fieldset class="action">
262	<input type="submit" value="Submit" />	271	<input type="submit" class="principal" value="Submit" />
263	<a class="cancel" href="/cgi-bin/koha/tools/csv-profiles.pl">Cancel</a>	272	<a class="cancel" href="/cgi-bin/koha/tools/csv-profiles.pl">Cancel</a>
264	</fieldset>	273	</fieldset>
265	</form>	274	</form>
Lines 286-292 Link Here
286	[% IF op == 'list' %]	295	[% IF op == 'list' %]
287		296
288	<div id="toolbar" class="btn-toolbar">	297	<div id="toolbar" class="btn-toolbar">
289	<a class="btn btn-default" id="newcsvprofile" href="/cgi-bin/koha/tools/csv-profiles.pl?op=add_form"><i class="fa fa-plus"></i> New CSV profile</a>	298	<div class="btn-group">
		299	<a class="pat" id="newcsvprofile" href="/cgi-bin/koha/tools/csv-profiles.pl?op=add_form"><i class="fa fa-plus"></i> New CSV profile</a>
		300	</diiv>
290	</div>	301	</div>
291		302
292	<h1>CSV profiles</h1>	303	<h1>CSV profiles</h1>
Lines 314-321 Link Here
314	<td>[% PROCESS type_description type_code = csv_profile.type %]</td>	325	<td>[% PROCESS type_description type_code = csv_profile.type %]</td>
315	<td>[% PROCESS used_for_description used_for_code = csv_profile.used_for %]</td>	326	<td>[% PROCESS used_for_description used_for_code = csv_profile.used_for %]</td>
316	<td class="actions">	327	<td class="actions">
317	<a href="/cgi-bin/koha/tools/csv-profiles.pl?op=add_form&export_format_id=[% csv_profile.export_format_id \| uri %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>	328	<a href="/cgi-bin/koha/tools/csv-profiles.pl?op=add_form&export_format_id=[% csv_profile.export_format_id \| uri %]" id="lientype" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>
318	<a href="/cgi-bin/koha/tools/csv-profiles.pl?op=delete_confirm&export_format_id=[% csv_profile.export_format_id \| uri %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a>	329	<a href="/cgi-bin/koha/tools/csv-profiles.pl?op=delete_confirm&export_format_id=[% csv_profile.export_format_id \| uri %]" id="lientype" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a>
319	</td>	330	</td>
320	</tr>	331	</tr>
321	[% END %]	332	[% END %]

Lines 2-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt (-152 / +218 lines)
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE Branches %]	3	[% USE Branches %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE 'cat-search.inc' %]
		7	[% END %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	<title>Export data &rsaquo; Tools &rsaquo; Koha</title>	9	<title>Export data &rsaquo; Tools &rsaquo; Koha</title>
7	[% INCLUDE 'doc-head-close.inc' %]	10	[% INCLUDE 'doc-head-close.inc' %]
Lines 13-19 Link Here
13	</head>	16	</head>
14		17
15	<body id="tools_export" class="tools">	18	<body id="tools_export" class="tools">
16	[% INCLUDE 'header.inc' %]	19	[% INCLUDE 'header.inc' form=formulaire %]
17		20
18	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	21	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
19	<ol>	22	<ol>
Lines 29-34 Link Here
29	</a>	32	</a>
30	</li>	33	</li>
31	</ol>	34	</ol>
		35	<ol>
		36	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		37	</ol>
		38	<ol>
		39	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		40	</ol>
32	</nav>	41	</nav>
33		42
34	<div class="main container-fluid">	43	<div class="main container-fluid">
Lines 48-63 Link Here
48	[% END %]	57	[% END %]
49		58
50	<div id="exporttype" class="toptabs">	59	<div id="exporttype" class="toptabs">
51	<ul class="nav nav-tabs" role="tablist">	60	<fieldset id="searchresults">
52	<li role="presentation" class="active">	61	<ul>
53	<a href="#bibs" aria-controls="bibs" role="tab" data-toggle="tab">Export bibliographic records</a>	62	<li><a href="#bibs">Export bibliographic records</a></li>
		63	<li><a href="#auths">Export authority records</a></li>
		64	[% IF ( allow_db_export ) %]
		65	<li><a href="#db">Export database</a></li>
		66	[% END %]
		67	[% IF ( allow_conf_export ) %]
		68	<li><a href="#conf">Export configuration</a></li>
		69	[% END %]
		70	</ul>
		71	<div id="bibs">
		72	<p>
		73	<strong>Note : The items are exported by this tool unless specified.</strong>
		74	</p>
		75
		76	<form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/tools/export.pl">
		77	<fieldset class="rows">
		78	<h3> Select records to export </h3>
		79	<ol>
		80	<li>
		81	<label for="start">From biblionumber: </label>
		82	<input id="start" type="text" name="StartingBiblionumber" size="5" />
		83	</li>
		84	<li>
		85	<label for="end">To biblionumber: </label>
		86	<input id="end" type="text" name="EndingBiblionumber" size="5" />
		87	</li>
		88
		89	<li>
		90	<label for="itemtype">Item type: </label>
		91	<select name="itemtype" id="itemtype">
		92	<option value="">-- All --</option>
		93	[% FOREACH itemtype IN itemtypes %]
		94	<option value="[% itemtype.itemtype \| html %]">[% itemtype.translated_description \| html %]</option>
		95	[% END %]
		96	</select>
54	</li>	97	</li>
55	<li role="presentation">	98	<li role="presentation">
56	<a href="#auths" aria-controls="auths" role="tab" data-toggle="tab">Export authority records</a>	99	<a href="#auths" aria-controls="auths" role="tab" data-toggle="tab">Export authority records</a>
57	</li>	100	</li>
58	[% IF ( allow_db_export ) %]	101	</ol>
59	<li role="presentation">	102
60	<a href="#db" aria-controls="db" role="tab" data-toggle="tab">Export database</a>	103	<fieldset class="rows">
		104	<h3>Call number range</h3>
		105	<ol>
		106	<li>
		107	<label for="startcn">From item call number: </label>
		108	<input id="startcn" type="text" name="start_callnumber" size="15" />
61	</li>	109	</li>
62	[% END %]	110	[% END %]
63	[% IF ( allow_conf_export ) %]	111	[% IF ( allow_conf_export ) %]
Lines 72-119 Link Here
72	<strong>Note : The items are exported by this tool unless specified.</strong>	120	<strong>Note : The items are exported by this tool unless specified.</strong>
73	</p>	121	</p>
74		122
75	<form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/tools/export.pl">	123	<fieldset class="rows">
76	<fieldset class="rows">	124	<h3>Accession date (inclusive)</h3>
77	<legend> Select records to export </legend>	125	<ol>
78	<ol>	126	<li>
79	<li>	127	<label for="from">Start date:</label>
80	<label for="start">From biblionumber: </label>	128	<input type="text" size="10" id="from" name="start_accession" value="[% from \| html %]" class="flatpickr" data-date_to="to" />
81	<input id="start" type="text" name="StartingBiblionumber" size="5" />	129	</li>
82	</li>	130	<li>
83	<li>	131	<label for="to">End date:</label>
84	<label for="end">To biblionumber: </label>	132	<input size="10" id="to" name="end_accession" value="[% end_accession \| html %]" type="text" class="flatpickr" />
85	<input id="end" type="text" name="EndingBiblionumber" size="5" />	133	</li>
86	</li>	134	</ol>
		135	</fieldset>
87		136
88	<li>	137	</fieldset>
89	<label for="itemtype">Item type: </label>	138	<fieldset class="rows">
90	<select name="itemtype" id="itemtype">	139	<h3>
91	<option value="">-- All --</option>	140	Use a file
92	[% FOREACH itemtype IN itemtypes %]	141	</h3>
93	<option value="[% itemtype.itemtype \| html %]">[% itemtype.translated_description \| html %]</option>	142	<ol>
94	[% END %]	143	<li>File containing a list of biblionumbers with one biblionumber per line. This list works as a filter: it is compatible with other parameters. (File types accepted: .csv and .txt)</li>
95	</select>	144	<li><label for="id_list_file">File: </label> <input type="file" id="id_list_file" name="id_list_file" /></li>
96	</li>	145	</ol>
		146	</fieldset>
		147	<fieldset class="rows">
		148	<h3> Options</h3>
		149	<ol> <li>
		150	<label for="dont_export_item">Don't export items:</label>
		151	<input id="dont_export_item" type="checkbox" name="dont_export_item" />
		152	</li>
		153	<li>
		154	<label for="strip_items_not_from_libraries">Remove items not owned by selected libraries:</label>
		155	<input id="strip_items_not_from_libraries" type="checkbox" name="strip_items_not_from_libraries" />
		156	</li>
		157	<li>
		158	<label for="export_remove_fields">Don't export fields:</label>
		159	<input id="export_remove_fields" type="text" name="export_remove_fields" value="[% export_remove_fields \| html %]" />
		160	separate by a blank. (e.g., 100a 200 606)
		161	</li></ol>
		162	</fieldset>
		163	<fieldset class="rows">
		164	<h3>
		165	Output format
		166	</h3>
		167	<ol><li>
		168	<label for="output_format">File format: </label>
		169	<select id="output_format" name="output_format">
		170	<option value="iso2709">MARC</option>
		171	<option value="xml">XML</option>
		172	[% IF csv_profiles %]
		173	<option value="csv">CSV</option>
		174	[% ELSE %]
		175	<option value="csv" disabled data-toggle="tooltip" data-placement="left" title="You must create a CSV profile for MARC exports to use this option.">CSV</option>
		176	[% END %]
		177	</select>
		178	</li>
		179	<li class="csv_profiles">
		180	<label for="bibs_csv_profile">CSV profile: </label>
		181	<select id="bibs_csv_profile" name="csv_profile_id">
		182	[% FOR csv_profile IN csv_profiles %]
		183	<option value="[% csv_profile.export_format_id \| html %]">[% csv_profile.profile \| html %]</option>
		184	[% END %]
		185	</select>
		186	</li>
		187	<li>
		188	<label for="filename">File name:</label><input id="filename" type="text" name="filename" value="koha.mrc" />
		189	</li></ol>
		190	</fieldset>
		191	<input type="hidden" name="op" value="export" />
		192	<input type="hidden" name="record_type" value="bibs" />
97		193
98	<li>	194	<fieldset class="action"><input type="submit" class="principal" value="Export bibliographic records" class="button" /></fieldset>
99	<label>With items owned by the following libraries: </label>	195	</form>
100	[% INCLUDE 'branch-selector.inc' branches = libraries %]	196	</div>
101	</li>
102	</ol>
103		197
104	<fieldset class="rows">	198	<div id="auths">
105	<legend>Call number range</legend>	199	<form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/tools/export.pl">
106	<ol>	200	<fieldset class="rows">
107	<li>	201	<h3> Select records to export </h3>
108	<label for="startcn">From item call number: </label>	202	<ol><li>
109	<input id="startcn" type="text" name="start_callnumber" size="15" />	203	<label for="start">From authid: </label>
110	</li>	204	<input id="start" type="text" name="starting_authid" size="6" />
111	<li>	205	</li>
112	<label for="endcn">To item call number: </label>	206	<li>
113	<input id="endcn" type="text" name="end_callnumber" size="15" />	207	<label for="end">To authid: </label>
114	</li>	208	<input id="end" type="text" name="ending_authid" size="6" />
115	</ol>	209	</li>
116	</fieldset>	210	<li>
		211	<label for="authtype">Authority type: </label>
		212	<select name="authtype" id="authtype">
		213	<option value="">-- All --</option>
		214	[% FOREACH authority_type IN authority_types %]
		215	<option value="[% authority_type.authtypecode \| html %]">[% authority_type.authtypetext \| html %]</option>
		216	[% END %]
		217	</select>
		218	</li>
		219	</ol>
		220	</fieldset>
		221	<fieldset class="rows">
		222	<h3>
		223	Use a file
		224	</h3>
		225	<ol>
		226	<li>File containing a list of authids with one authid per line. This list works as a filter: it is compatible with other parameters. (File types accepted: .csv and .txt)</li>
		227	<li><label for="id_list_file">File:</label> <input type="file" id="id_list_file" name="id_list_file" /></li>
		228	</ol>
		229	</fieldset>
		230	<fieldset class="rows">
		231	<h3>Options</h3>
		232	<ol>
		233	<li>
		234	<label for="export_remove_fields">Don't export fields:</label>
		235	<input id="export_remove_fields" type="text" name="export_remove_fields" />
		236	separate by a blank. (e.g., 100a 200 606)
		237	</li></ol>
		238	</fieldset>
		239	<fieldset class="rows">
		240	<h3>Output format</h3>
		241	<ol><li>
		242	<label for="output_format">File format: </label>
		243	<select id="output_format_auth" name="output_format">
		244	<option value="marc">MARC</option>
		245	<option value="xml">XML</option>
		246	</select>
		247	</li>
		248	<li>
		249	<label for="filename_auth">File name:</label><input id="filename_auth" type="text" name="filename_auth" value="koha.mrc" />
		250	</li></ol>
		251	</fieldset>
		252	<input type="hidden" name="op" value="export" />
		253	<inpexporttyut type="hidden" name="record_type" value="auths" />
117		254
118	<fieldset class="rows">	255	<fieldset class="rows">
119	<legend>Accession date (inclusive)</legend>	256	<legend>Accession date (inclusive)</legend>
Lines 129-190 Link Here
129	</ol>	266	</ol>
130	</fieldset>	267	</fieldset>
131		268
132	</fieldset>	269	[% IF ( allow_db_export ) %]
133	<fieldset class="rows">	270	<div id="db">
134	<legend>	271	<form method="post" action="/cgi-bin/koha/tools/export.pl">
135	Use a file	272	<p><strong>Note : This export file will be very large, and is generated nightly.</strong></p>
136	</legend>	273	<fieldset class="rows">
137	<ol>	274	<h3> Choose a file </h3>
138	<li>File containing a list of biblionumbers with one biblionumber per line. This list works as a filter: it is compatible with other parameters. (File types accepted: .csv and .txt)</li>	275	[% IF ( dbfiles && (dbfiles.size > 0) ) %]
139	<li><label for="id_list_file">File: </label> <input type="file" id="id_list_file" name="id_list_file" /></li>	276	<ul>
140	</ol>	277	[% FOREACH dbfile IN dbfiles %]
141	</fieldset>	278	<li><input type="radio" name="filename" value="[% dbfile \| html %]">[% dbfile \| html %]</input></li>
142	<fieldset class="rows">	279	[% END %]
143	<legend> Options</legend>	280	</ul>
144	<ol> <li>	281	[% ELSE %]
145	<label for="dont_export_item">Don't export items:</label>	282	<p>Unfortunately, no backups are available.</p>
146	<input id="dont_export_item" type="checkbox" name="dont_export_item" />	283	[% END %]
147	</li>	284	</fieldset>
148	<li>
149	<label for="strip_items_not_from_libraries">Remove items not owned by selected libraries:</label>
150	<input id="strip_items_not_from_libraries" type="checkbox" name="strip_items_not_from_libraries" />
151	</li>
152	<li>
153	<label for="export_remove_fields">Don't export fields:</label>
154	<input id="export_remove_fields" type="text" name="export_remove_fields" value="[% export_remove_fields \| html %]" />
155	separate by a blank. (e.g., 100a 200 606)
156	</li></ol>
157	</fieldset>
158	<fieldset class="rows">
159	<legend>
160	Output format
161	</legend>
162	<ol><li>
163	<label for="output_format">File format: </label>
164	<select id="output_format" name="output_format">
165	<option value="iso2709">MARC</option>
166	<option value="xml">XML</option>
167	[% IF csv_profiles %]
168	<option value="csv">CSV</option>
169	[% ELSE %]
170	<option value="csv" disabled data-toggle="tooltip" data-placement="left" title="You must create a CSV profile for MARC exports to use this option.">CSV</option>
171	[% END %]
172	</select>
173	</li>
174	<li class="csv_profiles">
175	<label for="bibs_csv_profile">CSV profile: </label>
176	<select id="bibs_csv_profile" name="csv_profile_id">
177	[% FOR csv_profile IN csv_profiles %]
178	<option value="[% csv_profile.export_format_id \| html %]">[% csv_profile.profile \| html %]</option>
179	[% END %]
180	</select>
181	</li>
182	<li>
183	<label for="filename">File name:</label><input id="filename" type="text" name="filename" value="koha.mrc" />
184	</li></ol>
185	</fieldset>
186	<input type="hidden" name="op" value="export" />
187	<input type="hidden" name="record_type" value="bibs" />
188		285
189	<fieldset class="action"><input type="submit" value="Export bibliographic records" class="button" /></fieldset>	286	<fieldset class="action"><input type="submit" value="Export bibliographic records" class="button" /></fieldset>
190	</form>	287	</form>
Lines 251-308 Link Here
251	</form>	348	</form>
252	</div>	349	</div>
253		350
254	[% IF ( allow_db_export ) %]	351	[% IF ( allow_conf_export ) %]
255	<div id="db" role="tabpanel" class="tab-pane">	352	<div id="conf">
256	<form method="post" action="/cgi-bin/koha/tools/export.pl">	353	<form method="post" action="/cgi-bin/koha/tools/export.pl">
257	<p><strong>Note : This export file will be very large, and is generated nightly.</strong></p>	354	<p><strong>Note : This export file will be very large, and is generated nightly.</strong></p>
258	<fieldset class="rows">	355	<fieldset class="rows">
259	<legend> Choose a file </legend>	356	<h3> Choose a file </h3>
260	[% IF ( dbfiles && (dbfiles.size > 0) ) %]	357	[% IF ( conffiles && (conffiles.size > 0) ) %]
261	<ul>	358	<ul>
262	[% FOREACH dbfile IN dbfiles %]	359	[% FOREACH conffile IN conffiles %]
263	<li><input type="radio" name="filename" value="[% dbfile \| html %]">[% dbfile \| html %]</input></li>	360	<li><input type="radio" name="filename" value="[% conffile \| html %]">[% conffile \| html %]</input></li>
264	[% END %]
265	</ul>
266	[% ELSE %]
267	<p>Unfortunately, no backups are available.</p>
268	[% END %]
269	</fieldset>
270
271	[% IF ( dbfiles && (dbfiles.size > 0) ) %]
272	<input type="hidden" name="op" value="export" />
273	<input type="hidden" name="record_type" value="db" />
274	<fieldset class="action"><input type="submit" value="Download database" class="button" /></fieldset>
275	[% END %]
276	</form>
277	</div>
278	[% END %]	361	[% END %]
279		362
280	[% IF ( allow_conf_export ) %]	363	[% IF ( conffiles && (conffiles.size > 0) ) %]
281	<div id="conf" role="tabpanel" class="tab-pane">	364	<input type="hidden" name="op" value="export" />
282	<form method="post" action="/cgi-bin/koha/tools/export.pl">	365	<input type="hidden" name="record_type" value="conf" />
283	<p><strong>Note : This export file will be very large, and is generated nightly.</strong></p>	366	<fieldset class="action"><input type="submit" value="Download configuration" class="button" /></fieldset>
284	<fieldset class="rows">	367	[% END %]
285	<legend> Choose a file </legend>	368	</form>
286	[% IF ( conffiles && (conffiles.size > 0) ) %]	369	</div>
287	<ul>	370	[% END %]
288	[% FOREACH conffile IN conffiles %]	371	</fieldset>
289	<li><input type="radio" name="filename" value="[% conffile \| html %]">[% conffile \| html %]</input></li>
290	[% END %]
291	</ul>
292	[% ELSE %]
293	<p>Unfortunately, no backups are available.</p>
294	[% END %]
295	</fieldset>
296
297	[% IF ( conffiles && (conffiles.size > 0) ) %]
298	<input type="hidden" name="op" value="export" />
299	<input type="hidden" name="record_type" value="conf" />
300	<fieldset class="action"><input type="submit" value="Download configuration" class="button" /></fieldset>
301	[% END %]
302	</form>
303	</div>
304	[% END %]
305	</div> <!-- /.tab-content -->
306	</div>	372	</div>
307		373
308	</main>	374	</main>

Lines 2-14 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt (-9 / +14 lines)
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE Branches %]	3	[% USE Branches %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE 'cat-search.inc' %]
		7	[% END %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	<title>[% Branches.GetName( branch ) \| html %] calendar &rsaquo; Tools &rsaquo; Koha</title>	9	<title>[% Branches.GetName( branch ) \| html %] calendar &rsaquo; Tools &rsaquo; Koha</title>
7	[% INCLUDE 'doc-head-close.inc' %]	10	[% INCLUDE 'doc-head-close.inc' %]
8	[% Asset.css("css/calendar.css") \| $raw %]	11	[% Asset.css("css/calendar.css") \| $raw %]
9	</head>	12	</head>
10	<body id="tools_holidays" class="tools">	13	<body id="tools_holidays" class="tools">
11	[% INCLUDE 'header.inc' %]	14	[% INCLUDE 'header.inc' form=formulaire %]
12		15
13	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	16	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
14	<ol>	17	<ol>
Lines 24-29 Link Here
24	</a>	27	</a>
25	</li>	28	</li>
26	</ol>	29	</ol>
		30	<ol>
		31	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		32	</ol>
		33	<ol>
		34	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		35	</ol>
27	</nav>	36	</nav>
28		37
29	<div class="main container-fluid">	38	<div class="main container-fluid">
Lines 78-88 Link Here
78	<!-- showTitle is necessary for exception radio button to work properly -->	87	<!-- showTitle is necessary for exception radio button to work properly -->
79	<li>	88	<li>
80	<label for="showDescription">Description:</label>	89	<label for="showDescription">Description:</label>
81	<textarea rows="2" cols="40" id="showDescription" name="showDescription"></textarea>	90	<textarea rows="2" cols="40" id="showDescription" name="showDescription"></textarea>holiday Holiday repeating weekly Holiday repeatintion for this repeated holiday.</label>
82	</li>
83	<li class="radio">
84	<div class="exceptionPossibility" style="position:static">
85	<input type="radio" name="showOperation" id="showOperationExc" value="exception" /> <label for="showOperationExc">Generate an exception for this repeated holiday.</label>
86	<a href="#" class="helptext">[?]</a>	91	<a href="#" class="helptext">[?]</a>
87	<div class="hint">You can make an exception for this holiday rule. This means that you will be able to say that for a repeatable holiday there is one day which is going to be an exception.</div>	92	<div class="hint">You can make an exception for this holiday rule. This means that you will be able to say that for a repeatable holiday there is one day which is going to be an exception.</div>
88	</div>	93	</div>
Lines 127-134 Link Here
127	<div class="hint">If checked, changes for this holiday will be copied to all libraries. If the holiday doesn't exists for a library, no change is made.</div>	132	<div class="hint">If checked, changes for this holiday will be copied to all libraries. If the holiday doesn't exists for a library, no change is made.</div>
128	</li>	133	</li>
129	</ol>	134	</ol>
130	<fieldset class="action">	135	<fieldset class="action">ay Unique holiday Holiday repeating weekly Holiday
131	<input type="submit" name="submit" value="Save" />	136	<input class="principal" type="submit" name="submit" value="Save" />
132	<a href="#" class="cancel hidePanel showHoliday">Cancel</a>	137	<a href="#" class="cancel hidePanel showHoliday">Cancel</a>
133	</fieldset>	138	</fieldset>
134	</fieldset> <!-- /.brief -->	139	</fieldset> <!-- /.brief -->
Lines 236-242 Link Here
236	<option value="[% l.branchcode \| html %]">[% l.branchname \| html %]</option>	241	<option value="[% l.branchcode \| html %]">[% l.branchname \| html %]</option>
237	[% END %]	242	[% END %]
238	</select>	243	</select>
239	<input type="submit" value="Copy" />	244	<input class="principal" type="submit" value="Copy" />
240	</form>	245	</form>
241	</div>	246	</div>
242	</div> <!-- /.col-sm-6 -->	247	</div> <!-- /.col-sm-6 -->

Lines 4-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt (-11 / +17 lines)
4	[% USE Branches %]	4	[% USE Branches %]
5	[% SET footerjs = 1 %]	5	[% SET footerjs = 1 %]
6	[% formulaire = BLOCK %]	6	[% formulaire = BLOCK %]
7	[% INCLUDE 'patron-search-header.inc.inc' %]	7	[% INCLUDE 'patron-search.inc' %]
8	[% END %]	8	[% END %]
9	[% INCLUDE 'doc-head-open.inc' %]	9	[% INCLUDE 'doc-head-open.inc' %]
10	<title>	10	<title>
Lines 48-53 Link Here
48	</li>	48	</li>
49	[% END %]	49	[% END %]
50	</ol>	50	</ol>
		51	<ol>
		52	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		53	</ol>
		54	<ol>
		55	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		56	</ol>
51	</nav>	57	</nav>
52		58
53	[% INCLUDE 'blocking_errors.inc' %]	59	[% INCLUDE 'blocking_errors.inc' %]
Lines 58-64 Link Here
58		64
59	<div class="row">	65	<div class="row">
60	<div class="col-sm-6">	66	<div class="col-sm-6">
61	<h1>Import patrons</h1>	67	<h2>Import patrons</h2>
62	[% IF ( uploadborrowers ) %]	68	[% IF ( uploadborrowers ) %]
63	<h5>Import results :</h5>	69	<h5>Import results :</h5>
64	<ul>	70	<ul>
Lines 209-215 Link Here
209		215
210	<form method="post" action="[% SCRIPT_NAME \| html %]" enctype="multipart/form-data">	216	<form method="post" action="[% SCRIPT_NAME \| html %]" enctype="multipart/form-data">
211	<fieldset class="rows">	217	<fieldset class="rows">
212	<legend>Import into the borrowers table</legend>	218	<h3>Import into the borrowers table</h3>
213		219
214	<ol>	220	<ol>
215	<li>	221	<li>
Lines 226-232 Link Here
226	</fieldset>	232	</fieldset>
227		233
228	<fieldset class="rows">	234	<fieldset class="rows">
229	<legend>Field to use for record matching</legend>	235	<h3>Field to use for record matching</h3>
230	<ol>	236	<ol>
231	<li class="radio">	237	<li class="radio">
232	<select name="matchpoint" id="matchpoint">	238	<select name="matchpoint" id="matchpoint">
Lines 241-250 Link Here
241	</fieldset>	247	</fieldset>
242		248
243	<fieldset class="rows">	249	<fieldset class="rows">
244	<legend>	250	<h3>
245	<a href="#" class="expand_defaults"><i class="fa fa-plus-square"></i> Enter default values</a>	251	<a href="#" class="expand_defaults"><i class="fa fa-plus-square"></i> Enter default values</a>
246	<a href="#" class="expand_defaults" style="display:none;"><i class="fa fa-minus-square"></i> Hide default value fields</a>	252	<a href="#" class="expand_defaults" style="display:none;"><i class="fa fa-minus-square"></i> Hide default value fields</a>
247	</legend>	253	</h3>
248		254
249	<ol class="default_values" style="display:none;">	255	<ol class="default_values" style="display:none;">
250	[% FOREACH borrower_db_column IN borrower_fields.keys.sort %]	256	[% FOREACH borrower_db_column IN borrower_fields.keys.sort %]
Lines 291-300 Link Here
291	</ol>	297	</ol>
292	</fieldset>	298	</fieldset>
293	<fieldset class="rows">	299	<fieldset class="rows">
294	<legend>	300	<h3>
295	<a href="#" class="expand_preserves"><i class="fa fa-plus-square"></i> Preserve existing values</a>	301	<a href="#" class="expand_preserves"><i class="fa fa-plus-square"></i> Preserve existing values</a>
296	<a href="#" class="expand_preserves" style="display:none;"><i class="fa fa-minus-square"></i> Hide preserve value fields</a>	302	<a href="#" class="expand_preserves" style="display:none;"><i class="fa fa-minus-square"></i> Hide preserve value fields</a>
297	</legend>	303	</h3>
298		304
299	<ol class="preserve_values" style="display:none;">	305	<ol class="preserve_values" style="display:none;">
300	<div class="hint">Selected fields will be preserved from original patron record when overwriting existing patron.</div>	306	<div class="hint">Selected fields will be preserved from original patron record when overwriting existing patron.</div>
Lines 309-315 Link Here
309	</fieldset>	315	</fieldset>
310		316
311	<fieldset class="rows">	317	<fieldset class="rows">
312	<legend>If matching record is already in the borrowers table:</legend>	318	<h3>If matching record is already in the borrowers table:</h3>
313		319
314	<ol>	320	<ol>
315	<li class="radio">	321	<li class="radio">
Lines 330-336 Link Here
330		336
331	[% IF ( Koha.Preference('ExtendedPatronAttributes') == 1 ) %]	337	[% IF ( Koha.Preference('ExtendedPatronAttributes') == 1 ) %]
332	<fieldset class="rows">	338	<fieldset class="rows">
333	<legend>Patron attributes</legend>	339	<h3>Patron attributes</h3>
334		340
335	<ol>	341	<ol>
336	<li class="radio">	342	<li class="radio">
Lines 357-363 Link Here
357		363
358	<fieldset class="action">	364	<fieldset class="action">
359	<input type="hidden" name="csrf_token" value="[% csrf_token \| html %]" />	365	<input type="hidden" name="csrf_token" value="[% csrf_token \| html %]" />
360	<input type="submit" value="Import" />	366	<input id="principal" type="submit" value="Import" />
361	</fieldset>	367	</fieldset>
362	</form>	368	</form>
363	[% END %]	369	[% END %]

Lines 4-16 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt (-17 / +28 lines)
4	[% USE KohaDates %]	4	[% USE KohaDates %]
5	[% USE Branches %]	5	[% USE Branches %]
6	[% SET footerjs = 1 %]	6	[% SET footerjs = 1 %]
		7	[% formulaire = BLOCK %]
		8	[% INCLUDE 'cat-search.inc' %]
		9	[% END %]
7	[% INCLUDE 'doc-head-open.inc' %]	10	[% INCLUDE 'doc-head-open.inc' %]
8	<title>Inventory &rsaquo; Tools &rsaquo; Koha</title>	11	<title>Inventory &rsaquo; Tools &rsaquo; Koha</title>
9	[% INCLUDE 'doc-head-close.inc' %]	12	[% INCLUDE 'doc-head-close.inc' %]
10	</head>	13	</head>
11		14
12	<body id="tools_inventory" class="tools">	15	<body id="tools_inventory" class="tools">
13	[% INCLUDE 'header.inc' %]	16	[% INCLUDE 'header.inc' form=formulaire %]
14		17
15	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	18	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
16	<ol>	19	<ol>
Lines 38-43 Link Here
38	</li>	41	</li>
39	[% END %]	42	[% END %]
40	</ol>	43	</ol>
		44	<ol>
		45	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		46	</ol>
		47	<ol>
		48	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		49	</ol>
41	</nav>	50	</nav>
42		51
43	<div class="main container-fluid">	52	<div class="main container-fluid">
Lines 45-51 Link Here
45	<div class="col-sm-10 col-sm-push-2">	54	<div class="col-sm-10 col-sm-push-2">
46	<main>	55	<main>
47		56
48	<h1>Inventory</h1>	57	<h2>Inventory</h2>
49	[% IF (moddatecount) %]<div class="dialog message">[% moddatecount \| html %] items modified : datelastseen set to [% date \| $KohaDates %]</div>	58	[% IF (moddatecount) %]<div class="dialog message">[% moddatecount \| html %] items modified : datelastseen set to [% date \| $KohaDates %]</div>
50	<div class="dialog alert">Number of potential barcodes read: [% LinesRead \| html %]</div>[% END %]	59	<div class="dialog alert">Number of potential barcodes read: [% LinesRead \| html %]</div>[% END %]
51	[% IF (errorfile) %]<div class="dialog alert">[% errorfile \| html %] can't be opened</div>[% END %]	60	[% IF (errorfile) %]<div class="dialog alert">[% errorfile \| html %] can't be opened</div>[% END %]
Lines 66-79 Link Here
66		75
67	<form method="post" id="inventory_form" action="/cgi-bin/koha/tools/inventory.pl" enctype="multipart/form-data">	76	<form method="post" id="inventory_form" action="/cgi-bin/koha/tools/inventory.pl" enctype="multipart/form-data">
68	<fieldset class="rows">	77	<fieldset class="rows">
69	<legend>Use a barcode file</legend>	78	<h3>Use a barcode file</h3>
70	<ol>	79	<ol>
71	<li><label for="uploadbarcodes">Barcode file: </label> <input type="file" id="uploadbarcodes" name="uploadbarcodes" />	80	<li><label for="uploadbarcodes">Barcode file: </label> <input type="file" id="uploadbarcodes" name="uploadbarcodes" />
72	<input type="button" id="resetuploadbarcodes" name="resetuploadbarcodes" value="Reset" /></li>	81	<input type="button" id="resetuploadbarcodes" name="resetuploadbarcodes" class="principal" value="Reset" /></li>
73	</ol>	82	</ol>
74	</fieldset>	83	</fieldset>
75	<fieldset class="rows">	84	<fieldset class="rows">
76	<legend>Or scan items one by one</legend>	85	<h3>Or scan items one by one</h3>
77	<ol>	86	<ol>
78	<li>	87	<li>
79	<label for="barcodelist">Barcode list (one barcode per line): </label>	88	<label for="barcodelist">Barcode list (one barcode per line): </label>
Lines 82-88 Link Here
82	</ol>	91	</ol>
83	</fieldset>	92	</fieldset>
84	<fieldset class="rows">	93	<fieldset class="rows">
85	<legend>Parameters</legend>	94	<h3>Parameters</h3>
86	<ol>	95	<ol>
87	<li><label for="setdate">Set inventory date to:</label> <input type="text" id="setdate" name="setdate" value="[% today \| $KohaDates %]" class="flatpickr" /></li>	96	<li><label for="setdate">Set inventory date to:</label> <input type="text" id="setdate" name="setdate" value="[% today \| $KohaDates %]" class="flatpickr" /></li>
88	<li><label for="compareinv2barcd">Compare barcodes list to results: </label><input type="checkbox" name="compareinv2barcd" id="compareinv2barcd" disabled /></li>	97	<li><label for="compareinv2barcd">Compare barcodes list to results: </label><input type="checkbox" name="compareinv2barcd" id="compareinv2barcd" disabled /></li>
Lines 91-97 Link Here
91	</ol>	100	</ol>
92	</fieldset>	101	</fieldset>
93	<fieldset class="rows">	102	<fieldset class="rows">
94	<legend>Item location filters</legend>	103	<h3>Item location filters</h3>
95	<ol><li>	104	<ol><li>
96	<label for="branch">Location: </label>	105	<label for="branch">Location: </label>
97	<input type="radio" name="branch" value="homebranch"> Home library</input>	106	<input type="radio" name="branch" value="homebranch"> Home library</input>
Lines 153-165 Link Here
153	</fieldset>	162	</fieldset>
154		163
155	<fieldset class="rows" id="optionalfilters">	164	<fieldset class="rows" id="optionalfilters">
156	<legend>Optional filters for inventory list or comparing barcodes</legend>	165	<h3>Optional filters for inventory list or comparing barcodes</h3>
157	<br/>	166	<br/>
158	<div id="statuses" style="display: block;">	167	<div id="statuses" style="display: block;">
159	[% FOREACH status IN statuses %]	168	[% FOREACH status IN statuses %]
160	[% IF (status.values) %]	169	[% IF (status.values) %]
161	<fieldset style="float: left; padding: 5px; margin: 5px;text-align:right">	170	<fieldset style="float: left; padding: 5px; margin: 5px;text-align:right">
162	<legend>[% status.fieldname \| html %]</legend>	171	<h3>[% status.fieldname \| html %]</h3>
163	<ul id="statuses-[% fieldname \| html %]" style="display: inline;">	172	<ul id="statuses-[% fieldname \| html %]" style="display: inline;">
164	[% FOREACH value IN status.values %]	173	[% FOREACH value IN status.values %]
165	[% IF (value.lib) %]	174	[% IF (value.lib) %]
Lines 202-208 Link Here
202	<li>	211	<li>
203	<label>Item types: </label>	212	<label>Item types: </label>
204	<div class="branchselector">	213	<div class="branchselector">
205	<p><a href="#" id="checkallitemtypes"> <i class="fa fa-check"></i> Select all</a> \| <a href="#" id="checknoneitemtypes"> <i class="fa fa-remove"></i> Clear all</a></p>	214	<p><a id="CheckAll" href="#" id="checkallitemtypes"> <i class="fa fa-check"></i> Select all</a> \| <a id="CheckNone" href="#" id="checknoneitemtypes"> <i class="fa fa-remove"></i> Clear all</a></p>
206	<div class="branchgridrow">	215	<div class="branchgridrow">
207	[% FOREACH itemtype IN itemtypes %]	216	[% FOREACH itemtype IN itemtypes %]
208	<div class="branchgriditem">	217	<div class="branchgriditem">
Lines 223-229 Link Here
223	</fieldset>	232	</fieldset>
224		233
225	<fieldset class="rows">	234	<fieldset class="rows">
226	<legend>Additional options</legend>	235	<h3>Additional options</h3>
227	<ol>	236	<ol>
228		237
229	<li>	238	<li>
Lines 234-240 Link Here
234	</fieldset>	243	</fieldset>
235	<input type="hidden" name="op" value="do_it" />	244	<input type="hidden" name="op" value="do_it" />
236		245
237	<fieldset class="action"><input type="submit" value="Submit" class="button" /></fieldset>	246	<fieldset class="action"><input class="principal" type="submit" value="Submit" class="button" /></fieldset>
238	</form>	247	</form>
239		248
240	[% END %]	249	[% END %]
Lines 248-256 Link Here
248	<input type="hidden" name="ccode" value="[% ccode \| html %]" />	257	<input type="hidden" name="ccode" value="[% ccode \| html %]" />
249		258
250	[% UNLESS uploadedbarcodesflag %]	259	[% UNLESS uploadedbarcodesflag %]
251	<div><a href="#" class="checkall"><i class="fa fa-check"></i> Select all</a> <a href="#" class="clearall"><i class="fa fa-remove"></i> Clear all</a></div>	260	<div><a id="lientype" href="#" class="checkall"><i class="fa fa-check"></i> Select all</a> <a id="lientype" href="#" class="clearall"><i class="fa fa-remove"></i> Clear all</a></div>
252	[% END %]	261	[% END %]
253		262
		263	<div id="searchresults">
254	<table id="inventoryt">	264	<table id="inventoryt">
255	<thead>	265	<thead>
256	<tr>	266	<tr>
Lines 333-344 Link Here
333	</table>	343	</table>
334	<div class="spacer"></div>	344	<div class="spacer"></div>
335	[% UNLESS uploadedbarcodesflag %]	345	[% UNLESS uploadedbarcodesflag %]
336	<div style="padding : .3em 0"><a href="#" class="checkall"><i class="fa fa-check"></i> Select all</a> <a href="#" class="clearall"><i class="fa fa-remove"></i> Clear all</a></div>	346	<div style="padding : .3em 0"><a id="lientype" href="#" class="checkall"><i class="fa fa-check"></i> Select all</a> <a id="lientype" href="#" class="clearall"><i class="fa fa-remove"></i> Clear all</a></div>
337	<input type="submit" id="markseenandquit" value="Mark seen and quit" />	347	<input type="submit" id="markseenandquit" class="principal" value="Mark seen and quit" />
338	<input type="submit" value="Mark seen and continue >>" id="markseenandcontinuebutton" />	348	<input type="submit" class="principal" value="Mark seen and continue >>" id="markseenandcontinuebutton" />
339	<input type="submit" value="Continue without marking >>" id="continuewithoutmarkingbutton" class="submit" />	349	<input class="principal" type="submit" value="Continue without marking >>" id="continuewithoutmarkingbutton" class="submit" />
340	[% END %]	350	[% END %]
341	</form>	351	</form>
		352	</div>
342		353
343		354
344	[% END %]	355	[% END %]

Lines 5-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt (-19 / +33 lines)
5	[% USE Branches %]	5	[% USE Branches %]
6	[% USE TablesSettings %]	6	[% USE TablesSettings %]
7	[% SET footerjs = 1 %]	7	[% SET footerjs = 1 %]
		8	[% formulaire = BLOCK %]
		9	[% INCLUDE 'letters-search.inc' %]
		10	[% END %]
8	[% INCLUDE 'doc-head-open.inc' %]	11	[% INCLUDE 'doc-head-open.inc' %]
9	<title>	12	<title>
10	[% IF ( add_form or copy_form ) %]	13	[% IF ( add_form or copy_form ) %]
Lines 49-56 Link Here
49	</head>	52	</head>
50		53
51	<body id="tools_letter" class="tools">	54	<body id="tools_letter" class="tools">
52	[% INCLUDE 'header.inc' %]	55	[% INCLUDE 'header.inc' form=formulaire %]
53		56
54	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	57	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
55	<ol>	58	<ol>
56	<li>	59	<li>
Lines 110-115 Link Here
110	[% END %]	113	[% END %]
111	[% END %]	114	[% END %]
112	</ol>	115	</ol>
		116	<ol>
		117	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		118	</ol>
		119	<ol>
		120	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		121	</ol>
113	</nav> <!-- /#breadcrumbs -->	122	</nav> <!-- /#breadcrumbs -->
114		123
115	<div id="preview_template" class="modal in" tabindex="-1" role="dialog" aria-labelledby="preview_template_label" aria-hidden="true">	124	<div id="preview_template" class="modal in" tabindex="-1" role="dialog" aria-labelledby="preview_template_label" aria-hidden="true">
Lines 144-166 Link Here
144	[% END %]	153	[% END %]
145		154
146	[% IF ( no_op_set ) %]	155	[% IF ( no_op_set ) %]
147	<h1>Notices & slips</h1>
148	<form method="get" action="/cgi-bin/koha/tools/letter.pl" id="selectlibrary">
149	<input type="hidden" name="searchfield" value="[% searchfield \| html %]" />
150	[% UNLESS independant_branch %]
151	<p>
152	Select a library:
153	<select name="branchcode" id="branch" style="width:20em;">
154	<option value="*">All libraries</option>
155	[% PROCESS options_for_libraries libraries => Branches.all( selected => branchcode ) %]
156	</select>
157	</p>
158	[% END %]
159	</form> <!-- /#selectlibrary -->
160		156
161	<div id="toolbar" class="btn-toolbar">	157	<div id="toolbar" class="btn-toolbar">
162	<div class="btn-group">	158	<div class="btn-group">
163	<button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New notice <span class="caret"></span></button>	159	<button class="pat" data-toggle="dropdown"><i class="fa fa-plus"></i> New notice <span class="caret"></span></button>
164	<ul class="dropdown-menu">	160	<ul class="dropdown-menu">
165	<li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&module=acquisition">Acquisition</a></li>	161	<li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&module=acquisition">Acquisition</a></li>
166	<li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&module=catalogue">Catalog</a></li>	162	<li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&module=catalogue">Catalog</a></li>
Lines 178-183 Link Here
178	</div>	174	</div>
179	</div> <!-- /#toolbar -->	175	</div> <!-- /#toolbar -->
180		176
		177
		178
		179	<h2>Notices & slips</h2>
		180	<form method="get" action="/cgi-bin/koha/tools/letter.pl" id="selectlibrary">
		181	<input type="hidden" name="searchfield" value="[% searchfield \| html %]" />
		182	[% UNLESS independant_branch %]
		183	<p>
		184	Select a library:
		185	<select name="branchcode" id="branch" style="width:20em;">
		186	<option value="*">All libraries</option>
		187	[% PROCESS options_for_libraries libraries => Branches.all( selected => branchcode ) %]
		188	</select>
		189	</p>
		190	[% END %]
		191	</form> <!-- /#selectlibrary -->
		192
181	[% IF ( search ) %]	193	[% IF ( search ) %]
182	<p>You searched for <strong>[% searchfield \| html %]</strong></p>	194	<p>You searched for <strong>[% searchfield \| html %]</strong></p>
183	[% END %]	195	[% END %]
Lines 193-198 Link Here
193	[% END %]	205	[% END %]
194		206
195	[% IF letter %]	207	[% IF letter %]
		208	<div id="searchresults">
196	<table id="lettert">	209	<table id="lettert">
197	<thead>	210	<thead>
198	<tr>	211	<tr>
Lines 248-263 Link Here
248	[% ELSE %]	261	[% ELSE %]
249	[% select_for_copy \| $raw %]	262	[% select_for_copy \| $raw %]
250	[% END %]	263	[% END %]
251	<button class="btn btn-default btn-xs"><i class="fa fa-clone"></i> Copy</button>	264	<button id="lientype" class="btn btn-default btn-xs"><i class="fa fa-clone"></i> Copy</button>
252	</form>	265	</form>
253	[% END # /IF !independent_branch %]	266	[% END # /IF !independent_branch %]
254	</td>	267	</td>
255	<td class="actions">	268	<td class="actions">
256	[% IF can_edit %]	269	[% IF can_edit %]
257	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/letter.pl?op=add_form&branchcode=[% lette.branchcode \| html %]&module=[% lette.module \| html %]&code=[% lette.code \| html %]"><i class="fa fa-pencil"></i> Edit</a>	270	<a id="lientype" class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/letter.pl?op=add_form&branchcode=[% lette.branchcode \| html %]&module=[% lette.module \| html %]&code=[% lette.code \| html %]"><i class="fa fa-pencil"></i> Edit</a>
258	[% END %]	271	[% END %]
259	[% IF !lette.protected && can_edit %]	272	[% IF !lette.protected && can_edit %]
260	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/letter.pl?op=delete_confirm&branchcode=[% lette.branchcode \| html %]&module=[% lette.module \| html %]&code=[% lette.code \| html %]"><i class="fa fa-trash"></i> Delete</a>	273	<a id="lientype" class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/letter.pl?op=delete_confirm&branchcode=[% lette.branchcode \| html %]&module=[% lette.module \| html %]&code=[% lette.code \| html %]"><i class="fa fa-trash"></i> Delete</a>
261	[% END %]	274	[% END %]
262	</td>	275	</td>
263	</tr>	276	</tr>
Lines 272-277 Link Here
272	<p>There are no notices.</p>	285	<p>There are no notices.</p>
273	[% END %]	286	[% END %]
274	</div>	287	</div>
		288	</div>
275	[% END # /IF lette %]	289	[% END # /IF lette %]
276	[% END # /IF no_op_set %]	290	[% END # /IF no_op_set %]
277		291

Lines 2-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt (-6 / +20 lines)
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE KohaDates %]	3	[% USE KohaDates %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE 'cat-search.inc' %]
		7	[% END %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	<title>	9	<title>
7	[% IF ( import_batch_id ) %]	10	[% IF ( import_batch_id ) %]
Lines 18-24 Link Here
18	</head>	21	</head>
19		22
20	<body id="tools_manage-marc-import" class="tools">	23	<body id="tools_manage-marc-import" class="tools">
21	[% INCLUDE 'header.inc' %]	24	[% INCLUDE 'header.inc' form=formulaire %]
22		25
23	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	26	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
24	<ol>	27	<ol>
Lines 45-61 Link Here
45	</li>	48	</li>
46	[% END %]	49	[% END %]
47	</ol>	50	</ol>
		51	<ol>
		52	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		53	</ol>
		54	<ol>
		55	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		56	</ol>
48	</nav>	57	</nav>
49		58
50	<div class="main container-fluid">	59	<div class="main container-fluid">
51	<div class="row">	60	<div class="row">
52	<div class="col-sm-10 col-sm-push-2">	61	<div class="col-sm-10 col-sm-push-2">
53	<main>	62	<main>
54	<h1>Manage staged MARC records	63	<h2>Manage staged MARC records
55	[% IF ( import_batch_id ) %]	64	[% IF ( import_batch_id ) %]
56	&rsaquo; Batch [% import_batch_id \| html %]	65	&rsaquo; Batch [% import_batch_id \| html %]
57	[% END %]	66	[% END %]
58	</h1>	67	</h2>
59		68
60	[% IF ( label_batch_msg ) %]	69	[% IF ( label_batch_msg ) %]
61	[% IF ( alert ) %]	70	[% IF ( alert ) %]
Lines 228-234 Link Here
228	[% END %]	237	[% END %]
229	</ol>	238	</ol>
230	[% IF ( can_commit ) %]	239	[% IF ( can_commit ) %]
231	<fieldset class="action"><input type="submit" value="Apply different matching rules" class="button" /></fieldset>	240	<fieldset class="action"><input type="submit" class="principal" value="Apply different matching rules" class="button" /></fieldset>
232	</form>	241	</form>
233	[% END %]	242	[% END %]
234	</fieldset> <!-- /#staged-record-matching-rules -->	243	</fieldset> <!-- /#staged-record-matching-rules -->
Lines 251-257 Link Here
251	</select>	260	</select>
252	[% END %]	261	[% END %]
253	<br />	262	<br />
254	<input type="submit" class="button" name="mainformsubmit" value="Import this batch into the catalog" />	263	<input type="submit" id="lientype" class="button" name="mainformsubmit" value="Import this batch into the catalog" />
255	</fieldset>	264	</fieldset>
256	</form> <!-- /#import_batch_form -->	265	</form> <!-- /#import_batch_form -->
257	<div id="jobpanel">	266	<div id="jobpanel">
Lines 274-279 Link Here
274	[% END # /IF can_revert %]	283	[% END # /IF can_revert %]
275	</div>	284	</div>
276		285
		286	<div id="searchresults">
		287
277	[% IF ( did_commit ) %]	288	[% IF ( did_commit ) %]
278	<div class="dialog message">Completed import of records</div>	289	<div class="dialog message">Completed import of records</div>
279	<table>	290	<table>
Lines 334-339 Link Here
334	</table>	345	</table>
335	[% END # /IF did_revert%]	346	[% END # /IF did_revert%]
336		347
		348
337	[% END # /IF batch_info %]	349	[% END # /IF batch_info %]
338		350
339	<br style="clear:both;" />	351	<br style="clear:both;" />
Lines 392-398 Link Here
392	<form method="post" action="[% batch_lis.script_name \| html %]" name="clean_batch_[% batch_lis.import_batch_id \| html %]" id="clean_batch_[% batch_lis.import_batch_id \| html %]" class="batch_form batch_clean">	404	<form method="post" action="[% batch_lis.script_name \| html %]" name="clean_batch_[% batch_lis.import_batch_id \| html %]" id="clean_batch_[% batch_lis.import_batch_id \| html %]" class="batch_form batch_clean">
393	<input type="hidden" name="import_batch_id" value="[% batch_lis.import_batch_id \| html %]" />	405	<input type="hidden" name="import_batch_id" value="[% batch_lis.import_batch_id \| html %]" />
394	<input type="hidden" name="op" value="clean-batch" />	406	<input type="hidden" name="op" value="clean-batch" />
395	<button type="submit" class="btn btn-default btn-xs"><i class="fa fa-eraser"></i> Clean</button>	407	<button id="lientype" type="submit" class="btn btn-default btn-xs"><i class="fa fa-eraser"></i> Clean</button>
396	</form>	408	</form>
397	[% ELSIF ( batch_lis.import_status == 'cleaned' ) %]	409	[% ELSIF ( batch_lis.import_status == 'cleaned' ) %]
398	<form method="post" action="/cgi-bin/koha/tools/manage-marc-import.pl" name="delete_batch_[% batch_lis.import_batch_id \| html %]" id="delete_batch_[% batch_lis.import_batch_id \| html %]" class="batch_form batch_delete">	410	<form method="post" action="/cgi-bin/koha/tools/manage-marc-import.pl" name="delete_batch_[% batch_lis.import_batch_id \| html %]" id="delete_batch_[% batch_lis.import_batch_id \| html %]" class="batch_form batch_delete">
Lines 443-448 Link Here
443	</div>	455	</div>
444	</div> <!-- /#marcPreview -->	456	</div> <!-- /#marcPreview -->
445	[% END # /IF import_batch_id %]	457	[% END # /IF import_batch_id %]
		458
		459	</div>
446	</main>	460	</main>
447		461
448	</div> <!-- /.col-sm-10.col-sm-push-2 -->	462	</div> <!-- /.col-sm-10.col-sm-push-2 -->

Lines 3-8 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt (-15 / +28 lines)
3	[% USE Asset %]	3	[% USE Asset %]
4	[% USE TablesSettings %]	4	[% USE TablesSettings %]
5	[% SET footerjs = 1 %]	5	[% SET footerjs = 1 %]
		6	[% formulaire = BLOCK %]
		7	[% INCLUDE 'cat-search.inc' %]
		8	[% END %]
6	[% INCLUDE 'doc-head-open.inc' %]	9	[% INCLUDE 'doc-head-open.inc' %]
7	<title>MARC modification templates &rsaquo; Tools &rsaquo; Koha</title>	10	<title>MARC modification templates &rsaquo; Tools &rsaquo; Koha</title>
8	[% INCLUDE 'doc-head-close.inc' %]	11	[% INCLUDE 'doc-head-close.inc' %]
Lines 20-26 Link Here
20	</head>	23	</head>
21		24
22	<body id="tools_marc_modification_templates" class="tools">	25	<body id="tools_marc_modification_templates" class="tools">
23	[% INCLUDE 'header.inc' %]	26	[% INCLUDE 'header.inc' form=formulaire %]
24		27
25	[% IF ( TemplatesLoop ) %]	28	[% IF ( TemplatesLoop ) %]
26	[% FOREACH TemplatesLoo IN TemplatesLoop %]	29	[% FOREACH TemplatesLoo IN TemplatesLoop %]
Lines 56-61 Link Here
56	</li>	59	</li>
57	[% END %]	60	[% END %]
58	</ol>	61	</ol>
		62	<ol>
		63	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		64	</ol>
		65	<ol>
		66	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		67	</ol>
59	</nav>	68	</nav>
60		69
61	<div class="main container-fluid">	70	<div class="main container-fluid">
Lines 64-75 Link Here
64	<main>	73	<main>
65		74
66	<div id="toolbar" class="btn-toolbar">	75	<div id="toolbar" class="btn-toolbar">
67	<a href="#" data-toggle="modal" data-template_id="" data-target="#createTemplate" id="new_template" class="btn btn-default duplicate_template"><i class="fa fa-plus"></i> New template</a>	76	<div>
		77	<a href="#" data-toggle="modal" data-template_id="" data-target="#createTemplate" id="new_template" class="pat duplicate_template"><i class="fa fa-plus"></i> New template</a>
68	[% IF ( template_id != '' ) %]	78	[% IF ( template_id != '' ) %]
69	<a href="#" id="new_action" class="btn btn-default"><i class="fa fa-plus"></i> New action</a>	79	<a href="#" id="new_action" class="pat"><i class="fa fa-plus"></i> New action</a>
70	<a class="btn btn-default delete_template" href="/cgi-bin/koha/tools/marc_modification_templates.pl?template_id=[% template_id \| html %]&op=delete_template"><i class="fa fa-fw fa-trash"></i> Delete template</a>	80	<a class="pat delete_template" href="/cgi-bin/koha/tools/marc_modification_templates.pl?template_id=[% template_id \| html %]&op=delete_template"><i class="fa fa-fw fa-trash"></i> Delete template</a>
71	[% END %]	81	[% END %]
72	</div>	82	</div></div>
73		83
74	[% IF error %]	84	[% IF error %]
75	[% IF error == 'no_from_field' %]	85	[% IF error == 'no_from_field' %]
Lines 83-88 Link Here
83		93
84	<h1>MARC modification templates [% template_id \| html %]</h1>	94	<h1>MARC modification templates [% template_id \| html %]</h1>
85		95
		96	<div id="searchresults">
86	<table id="templatest">	97	<table id="templatest">
87	<thead>	98	<thead>
88	<tr>	99	<tr>
Lines 97-117 Link Here
97	<td>[% TemplatesLoo.template_id \| html %]</td>	108	<td>[% TemplatesLoo.template_id \| html %]</td>
98	<td>[% TemplatesLoo.name \| html %]</td>	109	<td>[% TemplatesLoo.name \| html %]</td>
99	<td class="actions">	110	<td class="actions">
100	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/marc_modification_templates.pl?template_id=[% TemplatesLoo.template_id \| html %]&op=select_template" ><i class="fa fa-fw fa-pencil"></i> Edit actions</a>	111	<a id="lientype" class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/marc_modification_templates.pl?template_id=[% TemplatesLoo.template_id \| html %]&op=select_template" ><i class="fa fa-fw fa-pencil"></i> Edit actions</a>
101	<a class="btn btn-default btn-xs duplicate_template" href="#" data-toggle="modal" data-template_id="[% TemplatesLoo.template_id \| html %]" data-target="#createTemplate"><i class="fa fa-fw fa-copy"></i> Duplicate</a>	112	<a id="lientype" class="btn btn-default btn-xs duplicate_template" href="#" data-toggle="modal" data-template_id="[% TemplatesLoo.template_id \| html %]" data-target="#createTemplate"><i class="fa fa-fw fa-copy"></i> Duplicate</a>
102	<a class="btn btn-default btn-xs delete_template" href="/cgi-bin/koha/tools/marc_modification_templates.pl?template_id=[% TemplatesLoo.template_id \| html %]&op=delete_template"><i class="fa fa-fw fa-trash"></i> Delete</a>	113	<a id="lientype" class="btn btn-default btn-xs delete_template" href="/cgi-bin/koha/tools/marc_modification_templates.pl?template_id=[% TemplatesLoo.template_id \| html %]&op=delete_template"><i class="fa fa-fw fa-trash"></i> Delete</a>
103	</td>	114	</td>
104	</tr>	115	</tr>
105	[% END %]	116	[% END %]
106	</tbody>	117	</tbody>
107	</table>	118	</table>
		119	</div>
108		120
109	[% ELSE %]	121	[% ELSE %]
110		122
111	<h1>Actions for <em>[% template_name \| html %]</em></h1>	123	<h1>Actions for <em>[% template_name \| html %]</em></h1>
112		124
113	[% IF ( ActionsLoop ) %]	125	[% IF ( ActionsLoop ) %]
114		126	<div id="searchresults">
115	<table id="template_actions" class="template_actions">	127	<table id="template_actions" class="template_actions">
116	<thead>	128	<thead>
117	<tr>	129	<tr>
Lines 191-205 Link Here
191	</td>	203	</td>
192	<td>[% ActionsLoo.description \| html %]</td>	204	<td>[% ActionsLoo.description \| html %]</td>
193	<td>	205	<td>
194	<a class="btn btn-default btn-xs edit_action" href="#modaction" data-mmta_id="[% ActionsLoo.mmta_id \| html %]"><i class="fa fa-pencil"></i> Edit</a>	206	<a class="btn btn-default btn-xs edit_action" id="lientype" href="#modaction" data-mmta_id="[% ActionsLoo.mmta_id \| html %]"><i class="fa fa-pencil"></i> Edit</a>
195	</td>	207	</td>
196	<td>	208	<td>
197	<a class="btn btn-default btn-xs" href="marc_modification_templates.pl?template_id=[% ActionsLoo.template_id \| html %]&op=delete_action&mmta_id=[% ActionsLoo.mmta_id \| html %]" onclick="return confirmDeleteAction();"><i class="fa fa-trash"></i> Delete</a>	209	<a class="btn btn-default btn-xs" id="lientype" hhref="marc_modification_templates.pl?template_id=[% ActionsLoo.template_id \| html %]&op=delete_action&mmta_id=[% ActionsLoo.mmta_id \| html %]" onclick="return confirmDeleteAction();"><i class="fa fa-trash"></i> Delete</a>
198	</td>	210	</td>
199	</tr>	211	</tr>
200	[% END # /FOREACH ActionsLoo %]	212	[% END # /FOREACH ActionsLoo %]
201	</tbody>	213	</tbody>
202	</table>	214	</table>
		215	</div>
203	[% ELSE %]	216	[% ELSE %]
204	<div class="dialog message template_actions"><p>There are no defined actions for this template.</p></div>	217	<div class="dialog message template_actions"><p>There are no defined actions for this template.</p></div>
205	[% END # /IF ActionsLoop %]	218	[% END # /IF ActionsLoop %]
Lines 207-213 Link Here
207	<form method="post" action="/cgi-bin/koha/tools/marc_modification_templates.pl" id="add_action" >	220	<form method="post" action="/cgi-bin/koha/tools/marc_modification_templates.pl" id="add_action" >
208	<a name="modaction"></a>	221	<a name="modaction"></a>
209	<fieldset>	222	<fieldset>
210	<legend id="modaction_legend">Add a new action</legend>	223	<h3 id="modaction_legend">Add a new action</h3>
211	<div id="warning_multivalued" style="color:red; display:none;">You have chosen a condition on the same field as the original field. If your records contain multivalued fields it is highly recommended not to do that.</div>	224	<div id="warning_multivalued" style="color:red; display:none;">You have chosen a condition on the same field as the original field. If your records contain multivalued fields it is highly recommended not to do that.</div>
212		225
213	<div class="action_line">	226	<div class="action_line">
Lines 289-295 Link Here
289	<input type="hidden" name="template_id" value="[% template_id \| html %]" />	302	<input type="hidden" name="template_id" value="[% template_id \| html %]" />
290	<input type="hidden" name="mmta_id" id="mmta_id" />	303	<input type="hidden" name="mmta_id" id="mmta_id" />
291	<input type="hidden" name="op" value="add_action" />	304	<input type="hidden" name="op" value="add_action" />
292	<input id="action_submit" type="submit" value="Add action" />	305	<input id="action_submit" class="principal" type="submit" value="Add action" />
293	<a href="#modaction" class="cancel" id="cancel_edit" onclick="cancelEditAction();">Cancel</a>	306	<a href="#modaction" class="cancel" id="cancel_edit" onclick="cancelEditAction();">Cancel</a>
294	</fieldset>	307	</fieldset>
295		308
Lines 335-342 Link Here
335	</fieldset>	348	</fieldset>
336	</div>	349	</div>
337	<div class="modal-footer">	350	<div class="modal-footer">
338	<button type="submit" class="btn btn-default">Submit</button>	351	<button type="submit" class="btn btn-default principal">Submit</button>
339	<button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Cancel</button>	352	<button class="cancel" data-dismiss="modal" aria-hidden="true">Cancel</button>
340	</div>	353	</div>
341	</form>	354	</form>
342	</div>	355	</div>

Lines 6-18 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt (-5 / +13 lines)
6	[% USE Categories %]	6	[% USE Categories %]
7	[% USE TablesSettings %]	7	[% USE TablesSettings %]
8	[% SET footerjs = 1 %]	8	[% SET footerjs = 1 %]
		9	[% formulaire = BLOCK %]
		10	[% INCLUDE 'cat-search.inc' %]
		11	[% END %]
9	[% INCLUDE 'doc-head-open.inc' %]	12	[% INCLUDE 'doc-head-open.inc' %]
10	<title>Batch patron modification &rsaquo; Tools &rsaquo; Koha</title>	13	<title>Batch patron modification &rsaquo; Tools &rsaquo; Koha</title>
11	[% INCLUDE 'doc-head-close.inc' %]	14	[% INCLUDE 'doc-head-close.inc' %]
12	</head>	15	</head>
13		16
14	<body id="tools_modborrowers" class="tools">	17	<body id="tools_modborrowers" class="tools">
15	[% INCLUDE 'header.inc' %]	18	[% INCLUDE 'header.inc' form=formulaire %]
16		19
17	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	20	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
18	<ol>	21	<ol>
Lines 26-31 Link Here
26	<a href="#" aria-current="page">Batch patron modification</a>	29	<a href="#" aria-current="page">Batch patron modification</a>
27	</li>	30	</li>
28	</ol>	31	</ol>
		32	<ol>
		33	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		34	</ol>
		35	<ol>
		36	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		37	</ol>
29	</nav>	38	</nav>
30		39
31	<div class="main container-fluid">	40	<div class="main container-fluid">
Lines 73-81 Link Here
73	name="cardnumberlist">[% cardnumberlist \| html %]</textarea>	82	name="cardnumberlist">[% cardnumberlist \| html %]</textarea>
74	</li>	83	</li>
75	</ol>	84	</ol>
76	</fieldset>	85
77	<fieldset class="action">	86	<input type="submit" value="Continue" class="button principal" />
78	<input type="submit" value="Continue" class="button" />
79	<a class="cancel" href="/cgi-bin/koha/tools/tools-home.pl">Cancel</a>	87	<a class="cancel" href="/cgi-bin/koha/tools/tools-home.pl">Cancel</a>
80	</fieldset>	88	</fieldset>
81	</div>	89	</div>
Lines 139-145 Link Here
139	<div class="dialog alert">	147	<div class="dialog alert">
140	<p>No patron card numbers or borrowernumbers given.</p>	148	<p>No patron card numbers or borrowernumbers given.</p>
141	<form action="/cgi-bin/koha/tools/modborrowers.pl" method="get">	149	<form action="/cgi-bin/koha/tools/modborrowers.pl" method="get">
142	<button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> OK</button>	150	<button type="submit" class="approve" id="lientype"><i class="fa fa-fw fa-check"></i> OK</button>
143	</form>	151	</form>
144	</div>	152	</div>
145	[% END #Alert if no patrons %]	153	[% END #Alert if no patrons %]

Lines 3-15 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt (-1 / +10 lines)
3	[% USE Koha %]	3	[% USE Koha %]
4	[% USE Branches %]	4	[% USE Branches %]
5	[% SET footerjs = 1 %]	5	[% SET footerjs = 1 %]
		6	[% formulaire = BLOCK %]
		7	[% INCLUDE 'cat-search.inc' %]
		8	[% END %]
6	[% INCLUDE 'doc-head-open.inc' %]	9	[% INCLUDE 'doc-head-open.inc' %]
7	<title>Overdue notice/status triggers &rsaquo; Tools &rsaquo; Koha</title>	10	<title>Overdue notice/status triggers &rsaquo; Tools &rsaquo; Koha</title>
8	[% INCLUDE 'doc-head-close.inc' %]	11	[% INCLUDE 'doc-head-close.inc' %]
9	</head>	12	</head>
10		13
11	<body id="tools_overduerules" class="tools">	14	<body id="tools_overduerules" class="tools">
12	[% INCLUDE 'header.inc' %]	15	[% INCLUDE 'header.inc' form=formulaire %]
13		16
14	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	17	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
15	<ol>	18	<ol>
Lines 25-30 Link Here
25	</a>	28	</a>
26	</li>	29	</li>
27	</ol>	30	</ol>
		31	<ol>
		32	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		33	</ol>
		34	<ol>
		35	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		36	</ol>
28	</nav>	37	</nav>
29		38
30	<div class="main container-fluid">	39	<div class="main container-fluid">

Lines 2-8 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt (-2 / +8 lines)
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
4	[% formulaire = BLOCK %]	4	[% formulaire = BLOCK %]
5	[% INCLUDE 'patron-search-header.inc.inc' %]	5	[% INCLUDE 'patron-search.inc' %]
6	[% END %]	6	[% END %]
7	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
8	<title>Upload patron images &rsaquo; Tools &rsaquo; Koha</title>	8	<title>Upload patron images &rsaquo; Tools &rsaquo; Koha</title>
Lines 11-17 Link Here
11		11
12	<body id="tools_picture-upload" class="tools">	12	<body id="tools_picture-upload" class="tools">
13		13
14	[% INCLUDE 'header.inc' form= formulaire %]	14	[% INCLUDE 'header.inc' form=formulaire %]
15		15
16	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	16	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
17	<ol>	17	<ol>
Lines 38-43 Link Here
38	</li>	38	</li>
39	[% END %]	39	[% END %]
40	</ol>	40	</ol>
		41	<ol>
		42	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		43	</ol>
		44	<ol>
		45	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		46	</ol>
41	</nav>	47	</nav>
42		48
43	[% INCLUDE 'blocking_errors.inc' %]	49	[% INCLUDE 'blocking_errors.inc' %]

Lines 3-8 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/problem-reports.tt (-1 / +10 lines)
3	[% USE Koha %]	3	[% USE Koha %]
4	[% USE KohaDates %]	4	[% USE KohaDates %]
5	[% SET footerjs = 1 %]	5	[% SET footerjs = 1 %]
		6	[% formulaire = BLOCK %]
		7	[% INCLUDE 'prefs-admin-search.inc' %]
		8	[% END %]
6	[% INCLUDE 'doc-head-open.inc' %]	9	[% INCLUDE 'doc-head-open.inc' %]
7	<title>OPAC problem reports &rsaquo; Administration &rsaquo; Koha</title>	10	<title>OPAC problem reports &rsaquo; Administration &rsaquo; Koha</title>
8	[% INCLUDE 'doc-head-close.inc' %]	11	[% INCLUDE 'doc-head-close.inc' %]
Lines 10-16 Link Here
10		13
11	<body id="tools_problem-reports" class="tools">	14	<body id="tools_problem-reports" class="tools">
12		15
13	[% INCLUDE 'header.inc' %]	16	[% INCLUDE 'header.inc' form=formulaire %]
14		17
15	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	18	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
16	<ol>	19	<ol>
Lines 26-31 Link Here
26	</a>	29	</a>
27	</li>	30	</li>
28	</ol>	31	</ol>
		32	<ol>
		33	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		34	</ol>
		35	<ol>
		36	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		37	</ol>
29	</nav>	38	</nav>
30		39
31	<div class="main container-fluid">	40	<div class="main container-fluid">

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt (-3 / +12 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'cat-search.inc' %]
		6	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
5	<title>Quote uploader &rsaquo; Tools &rsaquo; Koha</title>	8	<title>Quote uploader &rsaquo; Tools &rsaquo; Koha</title>
6	[% INCLUDE 'doc-head-close.inc' %]	9	[% INCLUDE 'doc-head-close.inc' %]
Lines 9-15 Link Here
9	</head>	12	</head>
10		13
11	<body id="tools_quotes" class="tools">	14	<body id="tools_quotes" class="tools">
12	[% INCLUDE 'header.inc' %]	15	[% INCLUDE 'header.inc' form=formulaire %]
13		16
14	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	17	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
15	<ol>	18	<ol>
Lines 28-33 Link Here
28	</a>	31	</a>
29	</li>	32	</li>
30	</ol>	33	</ol>
		34	<ol>
		35	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		36	</ol>
		37	<ol>
		38	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		39	</ol>
31	</nav>	40	</nav>
32		41
33	<div class="main container-fluid">	42	<div class="main container-fluid">
Lines 49-55 Link Here
49	<div id="csv_error" class="alert" style="visibility: hidden;">Something went wrong, check your CSV file.</div>	58	<div id="csv_error" class="alert" style="visibility: hidden;">Something went wrong, check your CSV file.</div>
50	<div id="instructions">	59	<div id="instructions">
51	<fieldset id="file_uploader_help" class="rows">	60	<fieldset id="file_uploader_help" class="rows">
52	<legend>Instructions</legend>	61	<h3>Instructions</h3>
53	<div id="file_uploader_inst">	62	<div id="file_uploader_inst">
54	<ul>	63	<ul>
55	<li>The quote uploader accepts standard csv files with two columns: "source","text"</li>	64	<li>The quote uploader accepts standard csv files with two columns: "source","text"</li>
Lines 67-73 Link Here
67	</div>	76	</div>
68		77
69	<fieldset id="file_uploader" class="rows">	78	<fieldset id="file_uploader" class="rows">
70	<legend>Upload quotes</legend>	79	<h3>Upload quotes</h3>
71	<div id="file_upload">	80	<div id="file_upload">
72	<input type="file" name="file" />	81	<input type="file" name="file" />
73	<button id="cancel_upload" style="display:none">Cancel upload</button>	82	<button id="cancel_upload" style="display:none">Cancel upload</button>

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt (-6 / +19 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'cat-search.inc' %]
		6	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
5	<title>Quote editor &rsaquo; Tools &rsaquo; Koha</title>	8	<title>Quote editor &rsaquo; Tools &rsaquo; Koha</title>
6	[% INCLUDE 'doc-head-close.inc' %]	9	[% INCLUDE 'doc-head-close.inc' %]
Lines 8-14 Link Here
8	</head>	11	</head>
9		12
10	<body id="tools_quotes" class="tools">	13	<body id="tools_quotes" class="tools">
11	[% INCLUDE 'header.inc' %]	14	[% INCLUDE 'header.inc' form=formulaire %]
12		15
13	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	16	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
14	<ol>	17	<ol>
Lines 24-29 Link Here
24	</a>	27	</a>
25	</li>	28	</li>
26	</ol>	29	</ol>
		30	<ol>
		31	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		32	</ol>
		33	<ol>
		34	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		35	</ol>
27	</nav>	36	</nav>
28		37
29	<div class="main container-fluid">	38	<div class="main container-fluid">
Lines 53-65 Link Here
53		62
54	[% IF op == 'list' %]	63	[% IF op == 'list' %]
55	<div id="toolbar" class="btn-toolbar">	64	<div id="toolbar" class="btn-toolbar">
56	<a class="btn btn-default" id="newquote" href="/cgi-bin/koha/tools/quotes.pl?op=add_form"><i class="fa fa-plus"></i> New quote</a>	65	<div>
57	<a class="btn btn-default" id="import_quotes" href="/cgi-bin/koha/tools/quotes-upload.pl"><i class="fa fa-folder-open"></i> Import quotes</a>	66	<a class="pat" id="newquote" href="/cgi-bin/koha/tools/quotes.pl?op=add_form"><i class="fa fa-plus"></i> New quote</a>
		67	<a class="pat" id="import_quotes" href="/cgi-bin/koha/tools/quotes-upload.pl"><i class="fa fa-folder-open"></i> Import quotes</a>
		68	</div>
58	</div>	69	</div>
59	[% END %]	70	[% END %]
60		71
61	[% IF op == 'add_form' %]	72	[% IF op == 'add_form' %]
62	<h1>[% IF quote %]Modify quote[% ELSE %]New quote[% END %]</h1>	73	<h2>[% IF quote %]Modify quote[% ELSE %]New quote[% END %]</h2>
63	<form action="/cgi-bin/koha/tools/quotes.pl" id="Aform" name="Aform" class="validated" method="post">	74	<form action="/cgi-bin/koha/tools/quotes.pl" id="Aform" name="Aform" class="validated" method="post">
64	<fieldset class="rows">	75	<fieldset class="rows">
65	<input type="hidden" name="op" value="add_validate" />	76	<input type="hidden" name="op" value="add_validate" />
Lines 78-84 Link Here
78	</fieldset>	89	</fieldset>
79	<fieldset class="action">	90	<fieldset class="action">
80	<input type="hidden" name="id" value="[% quote.id \| html %]" />	91	<input type="hidden" name="id" value="[% quote.id \| html %]" />
81	<input type="submit" value="Submit" />	92	<input class="principal" type="submit" value="Submit" />
82	<a class="cancel" href="/cgi-bin/koha/tools/quotes.pl">Cancel</a>	93	<a class="cancel" href="/cgi-bin/koha/tools/quotes.pl">Cancel</a>
83	</fieldset>	94	</fieldset>
84	</form>	95	</form>
Lines 100-107 Link Here
100	[% END %]	111	[% END %]
101		112
102	[% IF op == 'list' %]	113	[% IF op == 'list' %]
103	<h1>Quotes</h1>	114	<h2>Quotes</h2>
104	[% IF quotes_count > 0 %]	115	[% IF quotes_count > 0 %]
		116	<div id="searchresults">
105	<table id="quotes">	117	<table id="quotes">
106	<thead>	118	<thead>
107	<tr>	119	<tr>
Lines 115-120 Link Here
115	</table>	127	</table>
116	[% ELSE %]	128	[% ELSE %]
117	<div class="dialog message">There are no quotes defined. <a href="/cgi-bin/koha/tools/quotes.pl?op=add_form">Start defining quotes</a>.</div>	129	<div class="dialog message">There are no quotes defined. <a href="/cgi-bin/koha/tools/quotes.pl?op=add_form">Start defining quotes</a>.</div>
		130	</div>
118	[% END %]	131	[% END %]
119		132
120	<div id="delete_confirm_modal" class="modal" tabindex="-1" role="dialog" aria-labelledby="delete_confirm_modal_label" aria-hidden="true">	133	<div id="delete_confirm_modal" class="modal" tabindex="-1" role="dialog" aria-labelledby="delete_confirm_modal_label" aria-hidden="true">

Lines 1-13 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt (-4 / +14 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'circ-search.inc' %]
		6	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
5	<title>Task scheduler &rsaquo; Tools &rsaquo; Koha</title>	8	<title>Task scheduler &rsaquo; Tools &rsaquo; Koha</title>
6	[% INCLUDE 'doc-head-close.inc' %]	9	[% INCLUDE 'doc-head-close.inc' %]
7	</head>	10	</head>
8		11
9	<body id="tools_scheduler" class="tools">	12	<body id="tools_scheduler" class="tools">
10	[% INCLUDE 'header.inc' %]	13	[% INCLUDE 'header.inc' form=formulaire %]
11		14
12	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	15	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
13	<ol>	16	<ol>
Lines 23-28 Link Here
23	</a>	26	</a>
24	</li>	27	</li>
25	</ol>	28	</ol>
		29	<ol>
		30	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		31	</ol>
		32	<ol>
		33	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		34	</ol>
26	</nav>	35	</nav>
27		36
28	<div class="main container-fluid">	37	<div class="main container-fluid">
Lines 40-46 Link Here
40	<input type="hidden" name="mode" value="job_add" />	49	<input type="hidden" name="mode" value="job_add" />
41		50
42	<fieldset class="rows">	51	<fieldset class="rows">
43	<legend>Task scheduler</legend><ol>	52	<h3>Task scheduler</h3><ol>
44	<li><span class="label">Current server time is:</span>	53	<li><span class="label">Current server time is:</span>
45	[% time \| html %]</li>	54	[% time \| html %]</li>
46	<li><label for="starttime">Time:</label>	55	<li><label for="starttime">Time:</label>
Lines 73-80 Link Here
73		82
74	<input type="text" name="email" id="email" size="50" />	83	<input type="text" name="email" id="email" size="50" />
75	</li>	84	</li>
76	</ol></fieldset>	85	</ol>
77	<fieldset class="action"><input class="submit-button" type="submit" value="Save" /></fieldset>	86	<fieldset class="action"><input class="submit-button principal" type="submit" value="Save" />
		87	</fieldset></fieldset>
78	</form>	88	</form>
79		89
80	[% IF ( JOBS ) %]<h2>Jobs already entered</h2>	90	[% IF ( JOBS ) %]<h2>Jobs already entered</h2>

Lines 36-41 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt (+6 lines)
36	</a>	36	</a>
37	</li>	37	</li>
38	</ol>	38	</ol>
		39	<ol>
		40	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		41	</ol>
		42	<ol>
		43	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		44	</ol>
39	</nav>	45	</nav>
40		46
41	<div class="main container-fluid">	47	<div class="main container-fluid">

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt (-10 / +20 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'cat-search.inc' %]
		6	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
5	<title>Stage MARC records for import &rsaquo; Tools &rsaquo; Koha</title>	8	<title>Stage MARC records for import &rsaquo; Tools &rsaquo; Koha</title>
6	[% INCLUDE 'doc-head-close.inc' %]	9	[% INCLUDE 'doc-head-close.inc' %]
Lines 12-18 Link Here
12		15
13	</head>	16	</head>
14	<body id="tools_stage-marc-import" class="tools">	17	<body id="tools_stage-marc-import" class="tools">
15	[% INCLUDE 'header.inc' %]	18	[% INCLUDE 'header.inc' form=formulaire %]
16		19
17	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	20	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
18	<ol>	21	<ol>
Lines 40-45 Link Here
40	</li>	43	</li>
41	[% END %]	44	[% END %]
42	</ol>	45	</ol>
		46	<ol>
		47	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		48	</ol>
		49	<ol>
		50	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		51	</ol>
43	</nav>	52	</nav>
44		53
45	<div class="main container-fluid">	54	<div class="main container-fluid">
Lines 54-59 Link Here
54	</div>	63	</div>
55	[% END %]	64	[% END %]
56		65
		66	<h2>Stage MARC records for import</h2>
57	[% IF ( uploadmarc ) %]	67	[% IF ( uploadmarc ) %]
58	<h1>MARC staging results</h1>	68	<h1>MARC staging results</h1>
59	<ul>	69	<ul>
Lines 96-102 Link Here
96	</ul>	106	</ul>
97	<form method="post" action="[% SCRIPT_NAME \| html %]" id="uploadfile" enctype="multipart/form-data">	107	<form method="post" action="[% SCRIPT_NAME \| html %]" id="uploadfile" enctype="multipart/form-data">
98	<fieldset class="rows" id="uploadform">	108	<fieldset class="rows" id="uploadform">
99	<legend>Upload a file to stage</legend>	109	<h3>Upload a file to stage</h3>
100	<ol>	110	<ol>
101	<li>	111	<li>
102	<div id="fileuploadform">	112	<div id="fileuploadform">
Lines 106-112 Link Here
106	</li>	116	</li>
107	</ol>	117	</ol>
108	<fieldset class="action">	118	<fieldset class="action">
109	<button id="fileuploadbutton">Upload file</button>	119	<button class="principal" id="fileuploadbutton">Upload file</button>
110	<button id="fileuploadcancel">Cancel</button>	120	<button id="fileuploadcancel">Cancel</button>
111	</fieldset>	121	</fieldset>
112	</fieldset>	122	</fieldset>
Lines 122-128 Link Here
122	</form>	132	</form>
123		133
124	<fieldset class="rows" id="profile_fieldset">	134	<fieldset class="rows" id="profile_fieldset">
125	<legend>Pre-fill values with profile?</legend>	135	<h3>Pre-fill values with profile?</h3>
126	<ol>	136	<ol>
127	<li>	137	<li>
128	<label for="profile">Profile: </label>	138	<label for="profile">Profile: </label>
Lines 145-151 Link Here
145	<input type="hidden" name="uploadedfileid" id="uploadedfileid" value="" />	155	<input type="hidden" name="uploadedfileid" id="uploadedfileid" value="" />
146	<input type="hidden" name="runinbackground" id="runinbackground" value="" />	156	<input type="hidden" name="runinbackground" id="runinbackground" value="" />
147	<input type="hidden" name="completedJobID" id="completedJobID" value="" />	157	<input type="hidden" name="completedJobID" id="completedJobID" value="" />
148	<legend>Settings</legend>	158	<h3>Settings</h3>
149	<ol><li>	159	<ol><li>
150	<label for="comments">Comments about this file: </label>	160	<label for="comments">Comments about this file: </label>
151	<input type="text" id="comments" name="comments" />	161	<input type="text" id="comments" name="comments" />
Lines 183-189 Link Here
183		193
184	[% IF MarcModificationTemplatesLoop %]	194	[% IF MarcModificationTemplatesLoop %]
185	<fieldset class="rows">	195	<fieldset class="rows">
186	<legend>Modify records using a MARC modification template?</legend>	196	<h3>Modify records using a MARC modification template?</h3>
187	<ol>	197	<ol>
188	<li>	198	<li>
189	<label for="comments">Template: </label>	199	<label for="comments">Template: </label>
Lines 199-205 Link Here
199	[% END %]	209	[% END %]
200		210
201	<fieldset class="rows">	211	<fieldset class="rows">
202	<legend>Look for existing records in catalog?</legend>	212	<h3>Look for existing records in catalog?</h3>
203	<ol><li><label for="matcher">Record matching rule:</label>	213	<ol><li><label for="matcher">Record matching rule:</label>
204	<select name="matcher" id="matcher">	214	<select name="matcher" id="matcher">
205	<option value="">Do not look for matching records</option>	215	<option value="">Do not look for matching records</option>
Lines 218-224 Link Here
218	</ol>	228	</ol>
219	</fieldset>	229	</fieldset>
220	<fieldset class="rows" id="items">	230	<fieldset class="rows" id="items">
221	<legend>Check for embedded item record data?</legend>	231	<h3>Check for embedded item record data?</h3>
222	<ol>	232	<ol>
223	<li class="radio">	233	<li class="radio">
224	<input type="radio" id="parse_itemsyes" name="parse_items" value="1" checked="checked" />	234	<input type="radio" id="parse_itemsyes" name="parse_items" value="1" checked="checked" />
Lines 238-244 Link Here
238	</fieldset>	248	</fieldset>
239		249
240	<fieldset class="rows" id="save_profile">	250	<fieldset class="rows" id="save_profile">
241	<legend>Save profile</legend>	251	<h3>Save profile</h3>
242	<ol>	252	<ol>
243	<li>	253	<li>
244	<label for="profile_name">Profile name:</label>	254	<label for="profile_name">Profile name:</label>
Lines 250-256 Link Here
250	</fieldset>	260	</fieldset>
251		261
252	<fieldset class="action">	262	<fieldset class="action">
253	<input type="button" id="mainformsubmit" value="Stage for import" />	263	<input class="principal" type="button" id="mainformsubmit" value="Stage for import" />
254	</fieldset>	264	</fieldset>
255		265
256	<div id="jobpanel"><div id="jobstatus" class="progress_panel">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div>	266	<div id="jobpanel"><div id="jobstatus" class="progress_panel">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div>

Lines 5-17 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt (-1 / +10 lines)
5	[% USE KohaDates %]	5	[% USE KohaDates %]
6	[% USE TablesSettings %]	6	[% USE TablesSettings %]
7	[% SET footerjs = 1 %]	7	[% SET footerjs = 1 %]
		8	[% formulaire = BLOCK %]
		9	[% INCLUDE 'cat-search.inc' %]
		10	[% END %]
8	[% INCLUDE 'doc-head-open.inc' %]	11	[% INCLUDE 'doc-head-open.inc' %]
9	<title>Stock rotation &rsaquo; Koha</title>	12	<title>Stock rotation &rsaquo; Koha</title>
10	[% INCLUDE 'doc-head-close.inc' %]	13	[% INCLUDE 'doc-head-close.inc' %]
11	</head>	14	</head>
12		15
13	<body id="tools_stockrotation" class="tools">	16	<body id="tools_stockrotation" class="tools">
14	[% INCLUDE 'header.inc' %]	17	[% INCLUDE 'header.inc' form=formulaire %]
15		18
16	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	19	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
17	<ol>	20	<ol>
Lines 81-86 Link Here
81	</li>	84	</li>
82	[% END %]	85	[% END %]
83	</ol>	86	</ol>
		87	<ol>
		88	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		89	</ol>
		90	<ol>
		91	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		92	</ol>
84	</nav>	93	</nav>
85		94
86	<div class="main container-fluid">	95	<div class="main container-fluid">

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt (-5 / +14 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
		4	[% formulaire = BLOCK %]
		5	[% INCLUDE 'cat-search.inc' %]
		6	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
5	<title>	8	<title>
6	Koha &rsaquo;	9	Koha &rsaquo;
Lines 76-82 Link Here
76	</head>	79	</head>
77		80
78	<body id="tools_upload-images" class="tools">	81	<body id="tools_upload-images" class="tools">
79	[% INCLUDE 'header.inc' %]	82	[% INCLUDE 'header.inc' form=formulaire %]
80		83
81	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	84	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
82	<ol>	85	<ol>
Lines 121-126 Link Here
121	</li>	124	</li>
122	[% END %]	125	[% END %]
123	</ol>	126	</ol>
		127	<ol>
		128	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		129	</ol>
		130	<ol>
		131	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		132	</ol>
124	</nav>	133	</nav>
125		134
126	<div class="main container-fluid">	135	<div class="main container-fluid">
Lines 129-142 Link Here
129	<main>	138	<main>
130		139
131	[% UNLESS itemnumber \|\| biblionumber %]	140	[% UNLESS itemnumber \|\| biblionumber %]
132	<h1>Upload local cover image</h1>	141	<h2>Upload local cover image</h2>
133	[% ELSIF biblio %]	142	[% ELSIF biblio %]
134	<h1>	143	<h2>
135	Upload local cover image for <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber \| uri %]"><em>[% INCLUDE 'biblio-title.inc' %]</em></a>	144	Upload local cover image for <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber \| uri %]"><em>[% INCLUDE 'biblio-title.inc' %]</em></a>
136	[% IF ( itemnumber ) %], Item number: [% itemnumber \| html %][% END %]	145	[% IF ( itemnumber ) %], Item number: [% itemnumber \| html %][% END %]
137	</h1>	146	</h2>
138	[% ELSIF itemnumber %]	147	[% ELSIF itemnumber %]
139	<h1>Upload local cover image for item number: [% itemnumber \| html %]</h1>	148	<h2>Upload local cover image for item number: [% itemnumber \| html %]</h2>
140	[% END %]	149	[% END %]
141		150
142	[% IF ( uploadimage ) %]	151	[% IF ( uploadimage ) %]

Lines 5-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt (-9 / +18 lines)
5	[% USE TablesSettings %]	5	[% USE TablesSettings %]
6	[% USE AuthorisedValues %]	6	[% USE AuthorisedValues %]
7	[% SET footerjs = 1 %]	7	[% SET footerjs = 1 %]
		8	[% formulaire = BLOCK %]
		9	[% INCLUDE 'cat-search.inc' %]
		10	[% END %]
8	[% INCLUDE 'doc-head-open.inc' %]	11	[% INCLUDE 'doc-head-open.inc' %]
9	[% IF plugin %]	12	[% IF plugin %]
10	<title>Upload plugin</title>	13	<title>Upload plugin</title>
Lines 42-47 Link Here
42	</a>	45	</a>
43	</li>	46	</li>
44	</ol>	47	</ol>
		48	<ol>
		49	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		50	</ol>
		51	<ol>
		52	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		53	</ol>
45	</nav>	54	</nav>
46	[% END %]	55	[% END %]
47		56
Lines 49-55 Link Here
49	<form method="post" action="/cgi-bin/koha/tools/upload.pl" id="uploadfile" enctype="multipart/form-data">	58	<form method="post" action="/cgi-bin/koha/tools/upload.pl" id="uploadfile" enctype="multipart/form-data">
50	[% PROCESS plugin_pars %]	59	[% PROCESS plugin_pars %]
51	<fieldset class="rows" id="uploadform">	60	<fieldset class="rows" id="uploadform">
52	<legend>Upload new files</legend>	61	<h3>Upload new files</h3>
53	<ol>	62	<ol>
54	<li>	63	<li>
55	<div id="fileuploadform">	64	<div id="fileuploadform">
Lines 96-103 Link Here
96	</li>	105	</li>
97	</ol>	106	</ol>
98	<fieldset class="action">	107	<fieldset class="action">
99	<button id="fileuploadbutton">Upload</button>	108	<button id="fileuploadbutton" class="principal">Upload</button>
100	<button id="fileuploadcancel">Cancel</button>	109	<button id="fileuploadcancel" class="cancel">Cancel</button>
101	</fieldset>	110	</fieldset>
102	</fieldset>	111	</fieldset>
103	<div id="fileuploadpanel">	112	<div id="fileuploadpanel">
Lines 134-140 Link Here
134	</li>	143	</li>
135	</ol>	144	</ol>
136	<fieldset class="action">	145	<fieldset class="action">
137	<button id="browsebutton" class="submit">Search</button>	146	<button id="browsebutton" class="submit principal">Search</button>
138	</fieldset>	147	</fieldset>
139	</fieldset>	148	</fieldset>
140	</form>	149	</form>
Lines 146-152 Link Here
146	[% PROCESS plugin_pars %]	155	[% PROCESS plugin_pars %]
147	<input type="hidden" name="op" value="search"/>	156	<input type="hidden" name="op" value="search"/>
148	<fieldset class="brief">	157	<fieldset class="brief">
149	<h4>Search uploads by name or hashvalue</h4>	158	<h3>Search uploads by name or hashvalue</h3>
150	<ol>	159	<ol>
151	<li>	160	<li>
152	<label for="term">Search term: </label>	161	<label for="term">Search term: </label>
Lines 154-160 Link Here
154	</li>	163	</li>
155	</ol>	164	</ol>
156	<fieldset class="action">	165	<fieldset class="action">
157	<button id="searchbutton" class="submit">Search</button>	166	<button id="searchbutton" class="submit principal">Search</button>
158	</fieldset>	167	</fieldset>
159	</fieldset>	168	</fieldset>
160	</form>	169	</form>
Lines 179-185 Link Here
179	[% IF !plugin %]	188	[% IF !plugin %]
180	<form id="back">	189	<form id="back">
181	<fieldset class="action">	190	<fieldset class="action">
182	<button class="submit">Back</button>	191	<button class="submit principal">Back</button>
183	</fieldset>	192	</fieldset>
184	</form>	193	</form>
185	[% END %]	194	[% END %]
Lines 262-268 Link Here
262	<main>	271	<main>
263	[% ELSE %]	272	[% ELSE %]
264	<body id="tools_upload" class="tools">	273	<body id="tools_upload" class="tools">
265	[% INCLUDE 'header.inc' %]	274	[% INCLUDE 'header.inc' form=formulaire %]
266	[% PROCESS breadcrumbs %]	275	[% PROCESS breadcrumbs %]
267		276
268	<div class="main container-fluid">	277	<div class="main container-fluid">
Lines 271-277 Link Here
271	<main>	280	<main>
272	[% END %]	281	[% END %]
273		282
274	<h1>Upload</h1>	283	<h2>Upload</h2>
275	<div class="dialog alert" id="myalerts" style="display:none;"></div>	284	<div class="dialog alert" id="myalerts" style="display:none;"></div>
276		285
277	[% PROCESS submitter %]	286	[% PROCESS submitter %]

Lines 6-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt (-5 / +14 lines)
6	[% USE KohaDates %]	6	[% USE KohaDates %]
7	[% USE TablesSettings %]	7	[% USE TablesSettings %]
8	[% SET footerjs = 1 %]	8	[% SET footerjs = 1 %]
		9	[% formulaire = BLOCK %]
		10	[% INCLUDE 'cat-search.inc' %]
		11	[% END %]
9	[% INCLUDE 'doc-head-open.inc' %]	12	[% INCLUDE 'doc-head-open.inc' %]
10	<title>	13	<title>
11	[% IF ( do_it ) %]	14	[% IF ( do_it ) %]
Lines 44-50 Link Here
44	ins {	47	ins {
45	background-color: #e6ffe6;	48	background-color: #e6ffe6;
46	}	49	}
47	del {	50	del {bread
48	background-color: #ffe6e6;	51	background-color: #ffe6e6;
49	}	52	}
50	#col1 ins,	53	#col1 ins,
Lines 60-66 Link Here
60	</head>	63	</head>
61		64
62	<body id="tools_viewlog" class="tools">	65	<body id="tools_viewlog" class="tools">
63	[% INCLUDE 'header.inc' %]	66	[% INCLUDE 'header.inc' form=formulaire %]
64		67
65	[% BLOCK translate_log_module %]	68	[% BLOCK translate_log_module %]
66	[% SWITCH module %]	69	[% SWITCH module %]
Lines 189-194 Link Here
189	</li>	192	</li>
190	[% END %]	193	[% END %]
191	</ol>	194	</ol>
		195	<ol>
		196	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		197	</ol>
		198	<ol>
		199	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		200	</ol>
192	</nav>	201	</nav>
193		202
194	<div class="main container-fluid">	203	<div class="main container-fluid">
Lines 196-202 Link Here
196	<div class="col-sm-10 col-sm-push-2">	205	<div class="col-sm-10 col-sm-push-2">
197	<main>	206	<main>
198		207
199	<h1>Browse system logs</h1>	208	<h2>Browse system logs</h2>
200	<form method="post" action="/cgi-bin/koha/tools/viewlog.pl">	209	<form method="post" action="/cgi-bin/koha/tools/viewlog.pl">
201	[% IF ( do_it ) %]	210	[% IF ( do_it ) %]
202	<input type="hidden" name="do_it" value="[% do_it \| html %]" />	211	<input type="hidden" name="do_it" value="[% do_it \| html %]" />
Lines 288-294 Link Here
288	</ol>	297	</ol>
289	</fieldset>	298	</fieldset>
290	<fieldset class="rows">	299	<fieldset class="rows">
291	<legend>Output</legend>	300	<h3>Output</h3>
292	<ol>	301	<ol>
293	<li>	302	<li>
294	<label for="screen" >To screen in the browser:</label> <input id="screen" type="radio" checked="checked" name="output" value="screen" />	303	<label for="screen" >To screen in the browser:</label> <input id="screen" type="radio" checked="checked" name="output" value="screen" />
Lines 308-314 Link Here
308	</ol>	317	</ol>
309	</fieldset>	318	</fieldset>
310	<fieldset class="action">	319	<fieldset class="action">
311	<input type="submit" value="Submit" />	320	<input type="submit" class="principal" value="Submit" />
312	<input type="hidden" name="do_it" value="1" />	321	<input type="hidden" name="do_it" value="1" />
313	</fieldset>	322	</fieldset>
314	</form>	323	</form>

Lines 4-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt (-3 / +2 lines)
4	[% USE KohaDates %]	4	[% USE KohaDates %]
5	[% SET footerjs = 1 %]	5	[% SET footerjs = 1 %]
6	[% formulaire = BLOCK %]	6	[% formulaire = BLOCK %]
7	[% INCLUDE 'circ-search.inc' %]	7	[% INCLUDE 'lis-search.inc' %]
8	[% END %]	8	[% END %]
9	[% INCLUDE 'doc-head-open.inc' %]	9	[% INCLUDE 'doc-head-open.inc' %]
10	<title>	10	<title>
Lines 328-334 Link Here
328	[% IF op == 'add_form' OR op == 'edit_form' %]	328	[% IF op == 'add_form' OR op == 'edit_form' %]
329		329
330	<form method="post" action="/cgi-bin/koha/virtualshelves/shelves.pl" class="validated">	330	<form method="post" action="/cgi-bin/koha/virtualshelves/shelves.pl" class="validated">
331	<fieldset class="brief">	331	<fieldset id="select-libs">
332		332
333	[% IF op == 'add_form' %]	333	[% IF op == 'add_form' %]
334	<h3>Create a new list</h3>	334	<h3>Create a new list</h3>
335	-

Return to bug 30952

Lines 132-138 table { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss (-5 / +18 lines)
132	}	132	}
133		133
134	tbody {	134	tbody {
135
136	border-top: 2px solid #A19B9E;	135	border-top: 2px solid #A19B9E;
137		136
138	td {	137	td {
Lines 144-151 table { Link Here
144	display: none;	143	display: none;
145	}	144	}
146	}	145	}
147	}
148		146
		147	.dropdown-menu{
		148	background-color: #F3F4F4;
		149
		150	a{
		151	color: #000;
		152
		153	&:hover,
		154	&:focus{
		155	background-image: none;
		156	background-color: #F3F4F4;
		157	}
		158	}
		159	}
		160	}
149	}	161	}
150		162
151	/* Row grouping */	163	/* Row grouping */
Lines 174-186 table { Link Here
174	td,	186	td,
175	th {	187	th {
176	//border-bottom: 1px solid $table-border-color;	188	//border-bottom: 1px solid $table-border-color;
177	border-left: 1px solid $table-border-color;	189	//border-left: 1px solid $table-border-color;
178	padding: .2em .3em;	190	padding: .2em .9em;
179	}	191	}
180		192
181	td {	193	td {
182	background-color: #FFFFFF;	194	background-color: #FFFFFF;
183	vertical-align: top;	195	vertical-align: top;
		196	text-align: center;
184		197
185	&.actions {	198	&.actions {
186	white-space: nowrap;	199	white-space: nowrap;
Lines 393-399 tbody { Link Here
393	.dataTables_wrapper {	406	.dataTables_wrapper {
394	.dataTables_processing {	407	.dataTables_processing {
395	background-color: #F4F8F9;	408	background-color: #F4F8F9;
396	border: 2px solid #82B4BE;	409	border: 2px solid #538200;
397	border-radius: 3px;	410	border-radius: 3px;
398	box-shadow: 2px 2px 3px 1px rgba(0, 0, 0, .2);	411	box-shadow: 2px 2px 3px 1px rgba(0, 0, 0, .2);
399	color: #333;	412	color: #333;

Lines 94-106 $selected: #B9DB88; Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/css/src/calendar.scss (-5 / +18 lines)
94	}	94	}
95		95
96	.panel {	96	.panel {
97	border: 1px solid #B9D8D9;	97	//border: 1px solid #B9D8D9;
98	border-radius: 4px;	98	//border-radius: 4px;
99	box-shadow: none;	99	//box-shadow: none;
100	padding: 0;	100	//padding: 0;
101	display: none;	101	display: none;
102	margin: 1em 0;	102	//margin: 1em 0;
103	z-index: 1;	103	z-index: 1;
		104
		105
		106	height: 100%;
		107	width: 100%;
		108	background-color: #FFF;
		109	position: relative;
		110	color: #696969;
		111	left: 0px;
		112	top: 0px;
		113	margin: 0em 1em 1em 0em;
		114	padding: 1em;
		115	box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356);
		116	//display: inline-block;
104	}	117	}
105		118
106	fieldset.brief {	119	fieldset.brief {

Lines 1-47 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc (-33 / +109 lines)
1		1
2	<div id="header_search">	2	<div id="header_search">
3	[% INCLUDE 'patron-search-box.inc' %]	3	[% INCLUDE 'patron-search-box.inc' %]
		4
		5	[% IF (CAN_user_circulate_circulate_remaining_permissions) %]
		6	<div id="checkout_search" class="residentsearch">
		7	<form action="/cgi-bin/koha/circ/circulation.pl" method="post">
		8	<input id="inputsearch" class="inpu focus" type="text" autocomplete="off" placeholder="Enter patron card number or partial name" />
		9	<input type="hidden" name="quicksearch" value="1" />
		10	<input value="" type="submit" id="submitsearch" />
		11	</form>
		12	</div>
4		13
5	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]	14	<div id="checkin_search" class="residentsearch">
6	<div id="checkin_search" class="residentsearch">	15	<form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
7	<form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">	16	<input name="barcode" id="inputsearch" class="inpu" accesskey="r" type="text" placeholder="Scan a barcode to check in" />
8	<input type="text" name="barcode" class="head-searchbox" id="ret_barcode" accesskey="r" placeholder="Scan a barcode to check in:" />	17	<input value="" type="submit" id="submitsearch" />
9	<input value="Submit" class="submit" type="submit" />	18	</form>
10	</form>	19	</div>
11	</div>	20
12		21	<div id="renew_search" class="residentsearch">
13	<div id="renew_search" class="residentsearch">	22	<form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
14	<form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">	23	<input name="barcode" id="inputsearch" class="inpu" type="text" placeholder="Scan a barcode to renew" />
15	<input type="text" class="head-searchbox" name="barcode" id="ren_barcode" placeholder="Scan a barcode to renew:" />	24	<input value="" type="submit" id="submitsearch" />
16	<input value="Submit" class="submit" type="submit" />	25	</form>
17	</form>	26	</div>
18	</div>
19	[% END %]	27	[% END %]
20		28
21	[% IF CAN_user_borrowers_edit_borrowers %]	29	[% IF CAN_user_borrowers_edit_borrowers %]
22	<div id="patron_search" class="residentsearch">	30	<div id="patron_search" class="residentsearch">
23	<form action="/cgi-bin/koha/members/member.pl" method="post">	31	<form action="/cgi-bin/koha/members/member.pl" method="post">
24	<input name="searchmember" class="head-searchbox" id="searchmember" type="text" placeholder="Enter patron card number or partial name:" />	32	<input name="searchmember" class="head-searchbox" id="inputsearch" class="inpu" type="text" placeholder="Enter patron card number or partial name" />
25	<input type="hidden" name="quicksearch" value="1" />	33	<input type="hidden" name="quicksearch" value="1" />
26	<input value="Submit" class="submit" type="submit" />	34	<input value="" id="submitsearch" type="submit" />
27	</form>	35	</form>
28	</div>	36	</div>
29	[% END %]	37	[% END %]
30		38
31	<ul>	39	<ul>
32	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]	40	<span id="buttonssearch">
33	<li><a class="keep_text" href="#circ_search">Check out</a></li>	41	<span id="button_1" title="Check out" onclick="clique(this)" class="iconsearch"><i class="fa fa-upload"></i></span> <span id="button_2" title="Check in" onclick="clique(this)" class="iconsearch"><i class="fa fa-download"></i></span> <span id="icon_3" title="Renew" onclick="clique(this)" class="iconsearch"><i class="fa fa-retweet"></i></span> <span id="icon_4" title="Search patrons" onclick="clique(this)" class="iconsearch"><i class="fa fa-fw fa-id-card-o"></i></span>
34	[% END %]	42	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_1" onclick="toggle(this)" class="buttonsearch active" href="#circ_search">Check-out</span>[% END %]
35	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]	43	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_2" onclick="toggle(this)" class="buttonsearch" href="#checkin_search">Check-in</span>[% END %]
36	<li><a class="keep_text" href="#checkin_search">Check in</a></li>	44	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_3" onclick="toggle(this)" class="buttonsearch" href="#renew_search">Renew</span>[% END %]
37	[% END %]	45	[% IF ( CAN_user_borrowers_edit_borrowers ) %]<span id="button_4" onclick="toggle(this)" class="buttonsearch" href="#patron_search">Search patrons</span>[% END %]
38	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]	46	</span>
39	<li><a class="keep_text" href="#renew_search">Renew</a></li>
40	[% END %]
41	[% IF CAN_user_borrowers_edit_borrowers %]
42	<li><a class="keep_text" href="#patron_search">Search patrons</a></li>
43	[% END %]
44	</ul>	47	</ul>
		48	</div>
		49
		50	<script type="text/javascript">
		51	function focusInput(){
		52	document.getElementById('inputsearch').focus();
		53	}
		54
		55	function toggle(elem){
		56	var buttonssearch = document.getElementsByClassName('active');
		57	for (var i = buttonssearch.length - 1; i >= 0; i--) {
		58	buttonssearch[i].classList.remove('active');
		59	}
		60
		61	if(elem){
		62	elem.classList.add('active');
		63	fold();
		64	}else{//Back
		65	document.getElementById('button_1').classList.add('active');
		66	document.getElementById('containersearch').classList.remove('fold');
		67	document.getElementById('inputsearch').style = '';
		68	}
		69
		70	focusInput();
		71	}
		72
		73	function clique(elem){
		74	var buttonssearch = document.getElementsByClassName('buttonsearch');
		75	var iconssearch = document.getElementsByClassName('iconsearch');
		76	var inputssearch = document.getElementsByClassName('inpu');
		77	for (var i = buttonssearch.length - 1; i >= 0; i--) {
		78	buttonssearch[i].classList.remove('active');
		79	if (elem == iconssearch[i]){
		80	buttonssearch[i].classList.add('active');
		81	}
		82	}
		83
		84	for (var i = inputssearch.length - 1; i >= 0; i--) {
		85	inputssearch[i].classList.remove('focus');
		86
		87	if (elem == iconssearch[i]){
		88	inputssearch[i].classList.add('focus');
		89	}
		90	}
		91
		92	focusInput();
		93	fold(elem);
		94	}
		95
		96	function fold(elem){
		97	document.getElementById('containersearch').classList.add('fold');
		98	// document.getElementById('inputsearch').style = "width:calc(500px - 100px)";
		99	setTimeout(
		100	function(){
		101	var offsetWidth = document.getElementById('buttonssearch').offsetWidth +5;
		102	document.getElementById('inputsearch').style = "width:calc(500px - "+offsetWidth+"px)";
		103	}
		104	, 250);
		105	}
		106
		107
		108
		109
		110	$('.btn').click(function(){
		111	if($(this).hasClass('active')){
112	$(this).removeClass('active')
113	} else {
114	$(this).addClass('active')
115	}
116	});
117	</script>
118
119	<!-- /header_search -->
120	<!-- End Main page Resident Search Box -->
45		121
46	</div><!-- /#header_search -->	122	</div><!-- /#header_search -->
47	<!-- End advanced search page resident search box -->	123	<!-- End advanced search page resident search box -->

Lines 4-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc (-14 / +14 lines)
4		4
5	[% IF ( CAN_user_editcatalogue_edit_catalogue \|\| CAN_user_editcatalogue_edit_items \|\| CAN_user_serials_create_subscription ) %]	5	[% IF ( CAN_user_editcatalogue_edit_catalogue \|\| CAN_user_editcatalogue_edit_items \|\| CAN_user_serials_create_subscription ) %]
6	<div class="btn-group">	6	<div class="btn-group">
7	<button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button>	7	<button class="pat dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button>
8	<ul class="dropdown-menu">	8	<ul class="dropdown-menu">
9	[% IF ( CAN_user_editcatalogue_edit_catalogue ) %]	9	[% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
10	<li><a id="newbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl">New record</a></li>	10	<li><a id="newbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl">New record</a></li>
Lines 29-35 Link Here
29		29
30	[% IF ( CAN_user_editcatalogue_edit_catalogue \|\| CAN_user_editcatalogue_edit_items \|\| CAN_user_tools_items_batchmod \|\| CAN_user_tools_items_batchdel ) or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %]	30	[% IF ( CAN_user_editcatalogue_edit_catalogue \|\| CAN_user_editcatalogue_edit_items \|\| CAN_user_tools_items_batchmod \|\| CAN_user_tools_items_batchdel ) or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %]
31	<div class="btn-group">	31	<div class="btn-group">
32	<button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button>	32	<button class="pat dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button>
33	<ul class="dropdown-menu">	33	<ul class="dropdown-menu">
34	[% IF CAN_user_editcatalogue_edit_catalogue or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %]	34	[% IF CAN_user_editcatalogue_edit_catalogue or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %]
35	<li><a id="editbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber \| html %]">Edit record</a></li>	35	<li><a id="editbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber \| html %]">Edit record</a></li>
Lines 92-98 Link Here
92	[% END %]	92	[% END %]
93		93
94	<div class="btn-group">	94	<div class="btn-group">
95	<button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-download"></i> Save <span class="caret"></span></button>	95	<button class="pat dropdown-toggle" data-toggle="dropdown"><i class="fa fa-download"></i> Save <span class="caret"></span></button>
96	<ul class="dropdown-menu">	96	<ul class="dropdown-menu">
97	<li><a href="/cgi-bin/koha/catalogue/export.pl?format=bibtex&op=export&bib=[% biblionumber \| uri %]">BIBTEX</a></li>	97	<li><a href="/cgi-bin/koha/catalogue/export.pl?format=bibtex&op=export&bib=[% biblionumber \| uri %]">BIBTEX</a></li>
98	<li><a href="#" data-toggle="modal" data-target="#exportModal_">Dublin Core</a></li>	98	<li><a href="#" data-toggle="modal" data-target="#exportModal_">Dublin Core</a></li>
Lines 108-131 Link Here
108	[% IF (Koha.Preference("intranetbookbag")) %]	108	[% IF (Koha.Preference("intranetbookbag")) %]
109	[% IF ( incart ) %]	109	[% IF ( incart ) %]
110	<div class="btn-group">	110	<div class="btn-group">
111	<a id="cart[% biblionumber \| html %]" class="btn btn-default addtocart incart" href="#"><i class="fa fa-shopping-cart"></i> Add to cart</a>	111	<a id="cart[% biblionumber \| html %]" class="pat addtocart incart" href="#"><i class="fa fa-shopping-cart"></i> Add to cart</a>
112	</div>	112	</div>
113	<div class="btn-group">	113	<div class="btn-group">
114	<a id="cartR[% biblionumber \| html %]" class="btn btn-default cartRemove incart" href="#"><i class="fa fa-shopping-cart"></i> Remove from cart</a>	114	<a id="cartR[% biblionumber \| html %]" class="pat cartRemove incart" href="#"><i class="fa fa-shopping-cart"></i> Remove from cart</a>
115	</div>	115	</div>
116	[% ELSE %]	116	[% ELSE %]
117	<div class="btn-group">	117	<div class="btn-group">
118	<a id="cart[% biblionumber \| html %]" class="btn btn-default addtocart" href="#"><i class="fa fa-shopping-cart"></i> Add to cart</a>	118	<a id="cart[% biblionumber \| html %]" class="pat addtocart" href="#"><i class="fa fa-shopping-cart"></i> Add to cart</a>
119	</div>	119	</div>
120	<div class="btn-group">	120	<div class="btn-group">
121	<a id="cartR[% biblionumber \| html %]" class="btn btn-default cartRemove" href="#"><i class="fa fa-shopping-cart"></i> Remove from cart</a>	121	<a id="cartR[% biblionumber \| html %]" class="pat cartRemove" href="#"><i class="fa fa-shopping-cart"></i> Remove from cart</a>
122	</div>	122	</div>
123	[% END %]	123	[% END %]
124	[% END %]	124	[% END %]
125		125
126	[% IF Koha.Preference('virtualshelves') %]	126	[% IF Koha.Preference('virtualshelves') %]
127	<div class="btn-group">	127	<div class="btn-group">
128	<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">	128	<button type="button" class="pat dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
129	<i class="fa fa-list"></i> Add to list <span class="caret"></span>	129	<i class="fa fa-list"></i> Add to list <span class="caret"></span>
130	</button>	130	</button>
131	<ul class="dropdown-menu">	131	<ul class="dropdown-menu">
Lines 168-181 Link Here
168	</div>	168	</div>
169	[% END # /IF virtualshelves %]	169	[% END # /IF virtualshelves %]
170		170
171	<div class="btn-group"><a id="printbiblio" class="btn btn-default"><i class="fa fa-print"></i> Print</a></div>	171	<div class="btn-group"><a id="printbiblio" class="pat"><i class="fa fa-print"></i> Print</a></div>
172		172
173	[% IF ( CAN_user_reserveforothers ) %]	173	[% IF ( CAN_user_reserveforothers ) %]
174	[% SET items = biblio.items %]	174	[% SET items = biblio.items %]
175	[% IF Context.Scalar(Context.Scalar(items, "filter_by_for_hold"), "count") %]	175	[% IF Context.Scalar(Context.Scalar(items, "filter_by_for_hold"), "count") %]
176	[% IF ( holdfor ) %]	176	[% IF ( holdfor ) %]
177	<div class="btn-group">	177	<div class="btn-group">
178	<button class="btn btn-default dropdown-toggle" data-toggle="dropdown">	178	<button class="pat dropdown-toggle" data-toggle="dropdown">
179	<i class="fa fa-sticky-note-o"></i>	179	<i class="fa fa-sticky-note-o"></i>
180	Place hold	180	Place hold
181	<span class="caret"></span>	181	<span class="caret"></span>
Lines 186-204 Link Here
186	</ul>	186	</ul>
187	</div>	187	</div>
188	[% ELSE %]	188	[% ELSE %]
189	<div class="btn-group"><a id="placehold" class="btn btn-default" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber \| html %]"><i class="fa fa-sticky-note-o"></i> Place hold</a></div>	189	<div class="btn-group"><a id="placehold" class="pat" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber \| html %]"><i class="fa fa-sticky-note-o"></i> Place hold</a></div>
190	[% END %]	190	[% END %]
191	[% END %]	191	[% END %]
192	[% END %]	192	[% END %]
193		193
194	[% IF Koha.Preference('ArticleRequests') %]	194	[% IF Koha.Preference('ArticleRequests') %]
195	<div class="btn-group"><a id="placehold" class="btn btn-default" href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% biblionumber \| html %]"><i class="fa fa-file-text-o"></i> Request article</a></div>	195	<div class="btn-group"><a id="placehold" class="pat" href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% biblionumber \| html %]"><i class="fa fa-file-text-o"></i> Request article</a></div>
196	[% END %]	196	[% END %]
197		197
198	[% IF ( CAN_user_acquisition_order_manage ) %]	198	[% IF ( CAN_user_acquisition_order_manage ) %]
199	[% IF ( searchtoorder_basketno && searchtoorder_vendorid ) %]	199	[% IF ( searchtoorder_basketno && searchtoorder_vendorid ) %]
200	<div class="btn-group">	200	<div class="btn-group">
201	<a class="btn btn-default" href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% searchtoorder_vendorid \| uri %]&basketno=[% searchtoorder_basketno \| uri %]&biblionumber=[% biblionumber \| uri %]"><i class="fa fa-shopping-basket"></i> Add order</a>	201	<a class="pat" href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% searchtoorder_vendorid \| uri %]&basketno=[% searchtoorder_basketno \| uri %]&biblionumber=[% biblionumber \| uri %]"><i class="fa fa-shopping-basket"></i> Add order</a>
202	</div>	202	</div>
203	[% END %]	203	[% END %]
204	[% END %]	204	[% END %]
Lines 232-238 Link Here
232	</fieldset>	232	</fieldset>
233	</div>	233	</div>
234	<div class="modal-footer">	234	<div class="modal-footer">
235	<button type="submit" class="btn btn-default">Export</button>	235	<button type="submit" class="pat">Export</button>
236	<button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Cancel</button>	236	<button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Cancel</button>
237	</div>	237	</div>
238	<input type="hidden" name="op" value="export" />	238	<input type="hidden" name="op" value="export" />

Lines 11-23 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc (-9 / +12 lines)
11	[% patron_type_class = 'is-staff' %]	11	[% patron_type_class = 'is-staff' %]
12	[% END %]	12	[% END %]
13		13
14		14	<div id="filters">
15	<div class="patroninfo [% patron_type_class \| html %]">	15	<div class="patroninfo [% patron_type_class \| html %]">
16	[% IF ( patronimages ) %]	16	[% IF ( patronimages ) %]
17	<h5 class="text-center">	17	<h5 class="text-center">
18	[% ELSE %]	18	[% ELSE %]
19	<h5>	19	<h5>
20	[% END %]	20	[% END %]
		21
21	[% IF ( patron_is_staff ) %]	22	[% IF ( patron_is_staff ) %]
22	<i class="fa fa-shield fa-fw" title="Staff patron"></i>	23	<i class="fa fa-shield fa-fw" title="Staff patron"></i>
23	[% END %]	24	[% END %]
Lines 27-32 Link Here
27	[% END %]	28	[% END %]
28		29
29	[% INCLUDE 'patron-title.inc' %]	30	[% INCLUDE 'patron-title.inc' %]
		31
		32	[% IF ( patron.dateofbirth ) %]
		33	<li class="patrondateofbirth">
		34	[% INCLUDE 'patron-age.inc' %]
		35	</li>
		36	[% END %]
		37
30	</h5>	38	</h5>
31		39
32	[% IF Koha.Preference('showLastPatron') %]	40	[% IF Koha.Preference('showLastPatron') %]
Lines 79-90 Link Here
79	[% END %]	87	[% END %]
80	[% END %]	88	[% END %]
81		89
82	[% IF ( patron.dateofbirth ) %]	90
83	<li class="patrondateofbirth">
84	<span>Born:</span>
85	[% INCLUDE 'patron-age.inc' %]
86	</li>
87	[% END %]
88		91
89	[% UNLESS ( patron.address or patron.address2 ) %]	92	[% UNLESS ( patron.address or patron.address2 ) %]
90	<li><span class="empty" id="noaddressstored">No address stored.</span></li>	93	<li><span class="empty" id="noaddressstored">No address stored.</span></li>
Lines 133-139 Link Here
133	</ul>	136	</ul>
134	</div>	137	</div>
135		138
136	<div id="menu-side">	139	<div id="navmenulist">
137	<ul>	140	<ul>
138	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]	141	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
139	[% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% patron.borrowernumber \| uri %]">Check out</a></li>	142	[% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% patron.borrowernumber \| uri %]">Check out</a></li>
Lines 190-196 Link Here
190	[% IF Koha.Preference('UseRecalls') && CAN_user_recalls %]	193	[% IF Koha.Preference('UseRecalls') && CAN_user_recalls %]
191	[% IF recallsview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/recallshistory.pl?borrowernumber=[% patron.borrowernumber \| uri %]">Recalls history</a></li>	194	[% IF recallsview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/recallshistory.pl?borrowernumber=[% patron.borrowernumber \| uri %]">Recalls history</a></li>
192	[% END %]	195	[% END %]
193	</ul></div>	196	</ul></div></div>
194		197
195	[% IF patronimages && CAN_user_tools_batch_upload_patron_images %]	198	[% IF patronimages && CAN_user_tools_batch_upload_patron_images %]
196	<!-- Modal -->	199	<!-- Modal -->

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/lis-search.inc (+140 lines)
		1	[% USE Koha %]
		2	<!-- Begin Main page Resident Search Box -->
		3
		4	<div id="containersearch" class="fold">
		5	[% IF (CAN_user_borrowers) %]
		6	<div id="checkout_search" class="residentsearch">
		7	<form action="/cgi-bin/koha/circ/circulation.pl" id="patronsearch" method="post">
		8	<input id="inputsearch" class="inpu" type="text" autocomplete="off" placeholder="Enter patron card number or partial name" />
		9	<input type="hidden" name="quicksearch" value="1" />
		10	<input value="" type="submit" id="submitsearch" />
		11	</form>
		12	</div>
		13	[% END %]
		14
		15	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
		16	<div id="checkin_search" class="residentsearch">
		17	<form action="/cgi-bin/koha/members/member.pl" id="patronsearch" method="post">
		18	[% IF ( PatronAutoComplete ) %]
		19	<div class="autocomplete">
		20	<input autocomplete="off" class="inpu" id="inputsearch" name="findborrower" class="head-searchbox" type="text" placeholder="Scan a barcode to check in" />
		21	<input value="" id="submitsearch" type="submit"/>
		22
		23	[% IF ( stickyduedate ) %]
		24	<input type="hidden" name="duedatespec" value="[% duedatespec \| html %]" />
		25	<input type="hidden" name="stickyduedate" value="[% stickyduedate \| html %]" />
		26	[% END %]
		27	</div>
		28
		29	[% ELSE %]
		30	<input id="inputsearch" name="findborrower" class="inpu head-searchbox" type="text" autocomplete="off" placeholder=Scan a barcode to check in" />
		31	[% IF ( stickyduedate ) %]
		32	<input type="hidden" name="duedatespec" value="[% duedatespec \| html %]" />
		33	<input type="hidden" name="stickyduedate" value="[% stickyduedate \| html %]" />
		34	[% END %]
		35	<input value="" id="submitsearch" type="submit" />
		36	[% END %]
		37	</form>
		38	</div>
		39
		40	<div id="renew_search" class="residentsearch">
		41	<form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
		42	<input name="barcode" id="inputsearch" class="inpu" accesskey="r" type="text" placeholder="Scan a barcode to renew" />
		43	<input value="" type="submit" id="submitsearch" />
		44	</form>
		45	</div>
		46	<div id="search_search" class="residentsearch">
		47	<form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
		48	<input name="barcode" id="inputsearch" class="inpu" type="text" placeholder="Enter search keyords" />
		49	<input value="" type="submit" id="submitsearch" />
		50	</form>
		51	</div>
		52	[% END %]
		53
		54	[% IF ( CAN_user_catalogue ) %]
		55	<div id="search_search" class="residentsearch">
		56	<form method="post" action="/cgi-bin/koha/catalogue/search.pl" autocomplete="off" method="get" id="cat-search-block">
		57	[% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
		58	[% INCLUDE 'search_indexes.inc' %]
		59	[% END %]
		60	<input name="barcode" class="inpu" id="inputsearch focus" type="text" placeholder="Enter search keyords" />
		61	<input value="" type="submit" id="submitsearch" />
		62	</form>
		63	</div>
		64	[% END %]
65
66	<ul>
67	<span id="buttonssearch">
68	<span id="button_1" title="Check out" onclick="clique(this)" class="iconsearch"><i class="fa fa-upload"></i></span> <span id="button_2" title="Check in" onclick="clique(this)" class="iconsearch"><i class="fa fa-download"></i></span> <span id="icon_3" title="Renew" onclick="clique(this)" class="iconsearch"><i class="fa fa-retweet"></i></span> <span id="icon_4" title="Search catalog" onclick="clique(this)" class="iconsearch"><i class="fa fa-fw fa-search"></i></span>
69	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_1" onclick="toggle(this)" class="buttonsearch" href="#circ_search">Check-out</span>[% END %]
70	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_2" onclick="toggle(this)" class="buttonsearch" href="#checkin_search">Check-in</span>[% END %]
71	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_3" onclick="toggle(this)" class="buttonsearch" href="#renew_search">Renew</span>[% END %]
72	[% IF ( CAN_user_catalogue ) %]<span id="button_5" onclick="toggle(this)" class="buttonsearch active" href="#catalog_search">Search catalog</span>[% END %]
73	</span>
74	</ul>
75	</div>
76
77	<script type="text/javascript">
78	function focusInput(){
79	document.getElementById('inputsearch').focus();
80	}
81
82	function toggle(elem){
83	var buttonssearch = document.getElementsByClassName('active');
84	for (var i = buttonssearch.length - 1; i >= 0; i--) {
85	buttonssearch[i].classList.remove('active');
86	}
87
88	if(elem){
89	elem.classList.add('active');
90	fold();
91	}else{//Back
92	document.getElementById('button_1').classList.add('active');
93	document.getElementById('containersearch').classList.remove('fold');
94	document.getElementById('inputsearch').style = '';
95	}
96
97	focusInput();
98	}
99
100
101	function clique(elem){
102	var buttonssearch = document.getElementsByClassName('buttonsearch');
103	var iconssearch = document.getElementsByClassName('iconsearch');
104	var inputssearch = document.getElementsByClassName('inpu');
105	for (var i = buttonssearch.length - 1; i >= 0; i--) {
106	buttonssearch[i].classList.remove('active');
107	if (elem == iconssearch[i]){
108	buttonssearch[i].classList.add('active');
109	}
110	}
111
112	for (var i = inputssearch.length - 1; i >= 0; i--) {
113	inputssearch[i].classList.remove('focus');
114
115	if (elem == iconssearch[i]){
116	inputssearch[i].classList.add('focus');
117	}
118	}
119
120	fold();
121	focusInput();
122	}
123
124	function fold(){
125
126	document.getElementById('containersearch').classList.add('fold');
127	// document.getElementById('inputsearch').style = "width:calc(500px - 100px)";
128	setTimeout(
129	function(){
130	var offsetWidth = document.getElementById('buttonssearch').offsetWidth +5;
131	document.getElementById('inputsearch').style = "width:calc(500px - "+offsetWidth+"px)";
132	}
133	, 250);
134	}
135
136
137	</script>
138
139	<!-- /header_search -->
140	<!-- End Main page Resident Search Box -->

Lines 5-24 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc (-3 / +7 lines)
5		5
6	[% UNLESS ( no_add ) %]	6	[% UNLESS ( no_add ) %]
7	<div id="toolbar" class="btn-toolbar">	7	<div id="toolbar" class="btn-toolbar">
8	<div>	8	<div class="btn-group">
9	<button class="pat" data-toggle="dropdown"><i class="fa fa-plus"></i> New patron <span class="caret"></span></button>	9	<button class="pat" data-toggle="dropdown"><i class="fa fa-plus"></i> New patron <span class="caret"></span></button>
10	<ul id="patdrop" class="dropdown-menu">	10	<ul class="dropdown-menu">
11	[% FOREACH category IN categories %]<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&categorycode=[% category.categorycode \| uri %]">[% category.description \| html %]</a></li>[% END %]	11	[% FOREACH category IN categories %]<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&categorycode=[% category.categorycode \| uri %]">[% category.description \| html %]</a></li>[% END %]
12	</ul>	12	</ul>
		13	</div>
13		14
		15	<div class="btn-group">
14	[% IF Koha.Preference('PatronQuickAddFields') \|\| Koha.Preference('BorrowerMandatoryField') %]	16	[% IF Koha.Preference('PatronQuickAddFields') \|\| Koha.Preference('BorrowerMandatoryField') %]
15	<button class="pat" data-toggle="dropdown"><i class="fa fa-plus"></i> Quick add new patron <span class="caret"></span></button>	17	<button class="pat" data-toggle="dropdown"><i class="fa fa-plus"></i> Quick add new patron <span class="caret"></span></button>
16	<ul id="patdrop" class="dropdown-menu">	18	<ul class="dropdown-menu">
17	[% FOREACH category IN categories %]<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&categorycode=[% category.categorycode \| uri %]&quickadd=true">[% category.description \| html %]</a></li>[% END %]	19	[% FOREACH category IN categories %]<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&categorycode=[% category.categorycode \| uri %]&quickadd=true">[% category.description \| html %]</a></li>[% END %]
18	</ul>	20	</ul>
19		21
20	[% END %]	22	[% END %]
		23	</div>
21		24
		25	<div class="btn-group">
22	[% IF CAN_user_tools_manage_patron_lists %]	26	[% IF CAN_user_tools_manage_patron_lists %]
23	<a class="pat" href="/cgi-bin/koha/patron_lists/lists.pl"><i class="fa fa-edit"></i> Patron lists</a>	27	<a class="pat" href="/cgi-bin/koha/patron_lists/lists.pl"><i class="fa fa-edit"></i> Patron lists</a>
24	[% END %]	28	[% END %]

Lines 37-43 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc (-6 / +6 lines)
37	[% IF ( expiry ) %]	37	[% IF ( expiry ) %]
38	<span>Patron's card expired on [% expiry \| $KohaDates %]</span>	38	<span>Patron's card expired on [% expiry \| $KohaDates %]</span>
39	[% END %]	39	[% END %]
40	<a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber \| uri %]&destination=circ&reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% patron.borrowernumber \| html %]">Edit details</a>	40	<a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber \| uri %]&destination=circ&reregistration=y" id="lientype">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% patron.borrowernumber \| html %]" id="lientype">Edit details</a>
41	</li>	41	</li>
42	[% END %]	42	[% END %]
43		43
Lines 71-81 Link Here
71	[% END %]	71	[% END %]
72	</em><br/>	72	</em><br/>
73	[% END %]	73	[% END %]
74	<a class="btn btn-xs btn-default" href="#reldebarments" onclick="$('#debarments-tab-link').click()"><i class="fa fa-ban"></i> View restrictions</a>	74	<a class="btn btn-xs btn-default" href="#reldebarments" onclick="$('#debarments-tab-link').click()" id="lientype"><i class="fa fa-ban"></i> View restrictions</a>
75		75
76	[% IF (noissues && CAN_user_circulate_force_checkout) %]	76	[% IF (noissues && CAN_user_circulate_force_checkout) %]
77	<span class="override_debarment">	77	<span class="override_debarment">
78	<a href="/cgi-bin/koha/circ/circulation.pl?forceallow=1&borrowernumber=[% patron.borrowernumber \| uri %]" class="btn btn-xs btn-default">Override restriction temporarily</a>	78	<a href="/cgi-bin/koha/circ/circulation.pl?forceallow=1&borrowernumber=[% patron.borrowernumber \| uri %]" class="btn btn-xs btn-default" id="lientype">Override restriction temporarily</a>
79	</span>	79	</span>
80	[% END %]	80	[% END %]
81	</li> <!-- /.blocker -->	81	</li> <!-- /.blocker -->
Lines 83-89 Link Here
83		83
84	[% IF ( odues ) %]	84	[% IF ( odues ) %]
85	<li class="odues blocker">	85	<li class="odues blocker">
86	<span class="circ-hlt">Overdues:</span> Patron has ITEMS OVERDUE <a href="#checkouts">See highlighted items below</a>	86	<span class="circ-hlt">Overdues:</span> Patron has ITEMS OVERDUE <a href="#checkouts" id="lientype">See highlighted items below</a>
87	</li>	87	</li>
88	[% END %]	88	[% END %]
89		89
Lines 203-209 Link Here
203		203
204	[% IF ( patron_messages ) %]	204	[% IF ( patron_messages ) %]
205	<div id="messages" class="circmessage">	205	<div id="messages" class="circmessage">
206	<h4>Messages</h4>	206	<h3>Messages</h3>
207	<ul>	207	<ul>
208	[% FOREACH patron_message IN patron_messages %]	208	[% FOREACH patron_message IN patron_messages %]
209	<li>	209	<li>
Lines 220-226 Link Here
220	<em>"[% patron_message.message \| html %]"</em>	220	<em>"[% patron_message.message \| html %]"</em>
221	</span>	221	</span>
222	[% IF patron_message.branchcode == Branches.GetLoggedInBranchcode OR Koha.Preference('AllowAllMessageDeletion') %]	222	[% IF patron_message.branchcode == Branches.GetLoggedInBranchcode OR Koha.Preference('AllowAllMessageDeletion') %]
223	<a class="btn btn-link" href="/cgi-bin/koha/circ/del_message.pl?message_id=[% patron_message.message_id \| html %]&borrowernumber=[% patron_message.borrowernumber \| html %]&from=moremember" onclick='return confirm(_("Are you sure you want to delete this message? This cannot be undone."));'><i class="fa fa-trash"></i> Delete</a>	223	<a class="btn btn-link" id="lientype" href="/cgi-bin/koha/circ/del_message.pl?message_id=[% patron_message.message_id \| html %]&borrowernumber=[% patron_message.borrowernumber \| html %]&from=moremember" onclick='return confirm(_("Are you sure you want to delete this message? This cannot be undone."));'><i class="fa fa-trash"></i> Delete</a>
224	[% END %]	224	[% END %]
225	</li>	225	</li>
226	[% END %]	226	[% END %]

Lines 40-54 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt (-7 / +9 lines)
40	<h1>Your cart</h1>	40	<h1>Your cart</h1>
41		41
42	<div id="toolbar" class="btn-toolbar">	42	<div id="toolbar" class="btn-toolbar">
		43	<div>
43	[% IF ( verbose ) %]	44	[% IF ( verbose ) %]
44	<a href="basket.pl" class="btn btn-default showdetails showless"><i class="fa fa-folder"></i> Brief display</a>	45	<a href="basket.pl" class="pat showdetails showless"><i class="fa fa-folder"></i> Brief display</a>
45	[% ELSE %]	46	[% ELSE %]
46	<a href="basket.pl" class="btn btn-default showdetails showmore"><i class="fa fa-folder-open"></i> More details</a>	47	<a href="basket.pl" class="pat showdetails showmore"><i class="fa fa-folder-open"></i> More details</a>
47	[% END %]	48	[% END %]
48		49
49	<a class="btn btn-default" href="basket.pl" id="send_cart"><i class="fa fa-envelope"></i> Send</a>	50	<a class="pat" href="basket.pl" id="send_cart"><i class="fa fa-envelope"></i> Send</a>
50	<div class="btn-group">	51	<div class="btn-group">
51	<a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#" id="downloadcart"><i class="fa fa-download"></i> Download <span class="caret"></span> </a>	52	<a class="pat dropdown-toggle" data-toggle="dropdown" href="#" id="downloadcart"><i class="fa fa-download"></i> Download <span class="caret"></span> </a>
52	<ul class="dropdown-menu">	53	<ul class="dropdown-menu">
53	<li><a href="/cgi-bin/koha/basket/downloadcart.pl?format=iso2709&bib_list=[% bib_list \| uri %]">iso2709</a></li>	54	<li><a href="/cgi-bin/koha/basket/downloadcart.pl?format=iso2709&bib_list=[% bib_list \| uri %]">iso2709</a></li>
54	<li><a href="/cgi-bin/koha/basket/downloadcart.pl?format=ris&bib_list=[% bib_list \| uri %]">RIS</a></li>	55	<li><a href="/cgi-bin/koha/basket/downloadcart.pl?format=ris&bib_list=[% bib_list \| uri %]">RIS</a></li>
Lines 58-66 Link Here
58	[% END %]	59	[% END %]
59	</ul>	60	</ul>
60	</div>	61	</div>
61	<a class="btn btn-default" href="basket.pl" id="print_cart"><i class="fa fa-print"></i> Print</a>	62	<a class="pat" href="basket.pl" id="print_cart"><i class="fa fa-print"></i> Print</a>
62	<a class="btn btn-default" href="basket.pl" id="empty_cart"><i class="fa fa-trash"></i> Empty and close</a>	63	<a class="pat" href="basket.pl" id="empty_cart"><i class="fa fa-trash"></i> Empty and close</a>
63	<a class="btn btn-default close" href="basket.pl"><i class="fa fa-times-circle"></i> Hide window</a>	64	<a class="pat close" href="basket.pl"><i class="fa fa-times-circle"></i> Hide window</a>
		65	</div>
64	</div>	66	</div>
65		67
66		68

Lines 43-49 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt (-3 / +3 lines)
43	<li><label for="subjectsubdiv">Subject sub-division: </label> <input type="text" id="subjectsubdiv" name="subjectsubdiv" value="" /></li>	43	<li><label for="subjectsubdiv">Subject sub-division: </label> <input type="text" id="subjectsubdiv" name="subjectsubdiv" value="" /></li>
44	<li><label for="title">Title (any): </label> <input type="text" id="title" name="title" value="[% title \| html %]" /></li>	44	<li><label for="title">Title (any): </label> <input type="text" id="title" name="title" value="[% title \| html %]" /></li>
45	<li><label for="uniformtitle">Title (uniform): </label> <input type="text" id="uniformtitle" name="uniformtitle" value="[% uniformtitle \| html %]" /></li>	45	<li><label for="uniformtitle">Title (uniform): </label> <input type="text" id="uniformtitle" name="uniformtitle" value="[% uniformtitle \| html %]" /></li>
46	<li><a id="resetZ3950Search" href="#"><i class="fa fa-trash"></i> Clear search form</a></li>	46	<li><a id="resetZ3950Search" href="#">Clear search form</a></li>
47	</ol>	47	</ol>
48	</fieldset>	48	</fieldset>
49	</div>	49	</div>
Lines 68-74 Link Here
68	</div>	68	</div>
69	<nav class="navbar navbar-default navbar-fixed-bottom">	69	<nav class="navbar navbar-default navbar-fixed-bottom">
70	<div class="container-fluid">	70	<div class="container-fluid">
71	<fieldset class="action"><input type="submit" class="submit" value="Search" /> <a class="cancel close" href="#">Cancel</a></fieldset>	71	<fieldset class="action"><input type="submit" id="principal" class="submit" value="Search" /> <a class="cancel close" href="#">Cancel</a></fieldset>
72	</div>	72	</div>
73	</nav>	73	</nav>
74	</form>	74	</form>
Lines 90-96 Link Here
90	<td>[% breeding_loo.heading_code \| html %]</td>	90	<td>[% breeding_loo.heading_code \| html %]</td>
91	<td class="actions">	91	<td class="actions">
92	<div class="btn-group dropup">	92	<div class="btn-group dropup">
93	<a class="btn btn-default btn-xs z3950actions" href="#">MARC</a><button class="btn-xs dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>	93	<a class="btn btn-default btn-xs z3950actions" id="lientype" href="#">MARC</a><button class="btn-xs dropdown-toggle" id="lientype" data-toggle="dropdown"><span class="caret"></span></button>
94	<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="cataloguesearchactions[% breeding_loo.breedingid \| html %]">	94	<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="cataloguesearchactions[% breeding_loo.breedingid \| html %]">
95	<li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid \| uri %]" title="MARC" class="previewData" data-action="show_marc"><i class="fa fa-eye"></i> MARC preview</a></li>	95	<li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid \| uri %]" title="MARC" class="previewData" data-action="show_marc"><i class="fa fa-eye"></i> MARC preview</a></li>
96	<li><a href="/cgi-bin/koha/authorities/authorities.pl?breedingid=[% breeding_loo.breedingid \| uri %]&authtypecode=[% breeding_loo.heading_code \| uri %]&authid=[% breeding_loo.authid \| uri %]&index=[% index \| uri %]" class="chosen" title="Import" data-action="import"><i class="fa fa-download"></i> Import</a></li>	96	<li><a href="/cgi-bin/koha/authorities/authorities.pl?breedingid=[% breeding_loo.breedingid \| uri %]&authtypecode=[% breeding_loo.heading_code \| uri %]&authid=[% breeding_loo.authid \| uri %]&index=[% index \| uri %]" class="chosen" title="Import" data-action="import"><i class="fa fa-download"></i> Import</a></li>

Lines 10-16 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-40 / +41 lines)
10	[% PROCESS 'member-alt-contact-style.inc' %]	10	[% PROCESS 'member-alt-contact-style.inc' %]
11	[% SET footerjs = 1 %]	11	[% SET footerjs = 1 %]
12	[% formulaire = BLOCK %]	12	[% formulaire = BLOCK %]
13	[% INCLUDE 'patron-search-header.inc' %]	13	[% INCLUDE 'patron-search.inc' %]
14	[% END %]	14	[% END %]
15	[% INCLUDE 'doc-head-open.inc' %]	15	[% INCLUDE 'doc-head-open.inc' %]
16	<title>	16	<title>
Lines 27-33 Link Here
27	[% END %] &rsaquo; Patrons &rsaquo; Koha	27	[% END %] &rsaquo; Patrons &rsaquo; Koha
28	</title>	28	</title>
29	<style>	29	<style>
30	legend:hover {	30	h3:hover {
31	cursor: pointer;	31	cursor: pointer;
32	}	32	}
33	</style>	33	</style>
Lines 35-41 legend:hover { Link Here
35	</head>	35	</head>
36		36
37	<body id="pat_memberentrygen"s>	37	<body id="pat_memberentrygen"s>
38	[% INCLUDE 'header.inc' form=formulaire %]	38	[% INCLUDE 'header.inc' form= formulaire %]
39		39
40	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	40	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
41	<ol>	41	<ol>
Lines 117-123 legend:hover { Link Here
117	[% INCLUDE 'noadd-warnings.inc' %]	117	[% INCLUDE 'noadd-warnings.inc' %]
118		118
119	[% UNLESS ( no_add ) %]	119	[% UNLESS ( no_add ) %]
120	<h1>	120	<h2>
121	[% IF ( opadd ) %]	121	[% IF ( opadd ) %]
122	Add patron	122	Add patron
123	[% ELSIF ( opduplicate ) %]	123	[% ELSIF ( opduplicate ) %]
Lines 127-133 legend:hover { Link Here
127	[% END %]	127	[% END %]
128	[% INCLUDE 'patron-title.inc' %]	128	[% INCLUDE 'patron-title.inc' %]
129	[% IF categoryname %]([% categoryname \| html %])[% END %]	129	[% IF categoryname %]([% categoryname \| html %])[% END %]
130	</h1>	130	</h2>
131		131
132	[% IF quickadd && opadd && !check_member %]	132	[% IF quickadd && opadd && !check_member %]
133	<a href="#" class="toggle_quick_add"><i class="fa fa-plus-square"></i> Show full form</a>	133	<a href="#" class="toggle_quick_add"><i class="fa fa-plus-square"></i> Show full form</a>
Lines 230-247 legend:hover { Link Here
230		230
231	[% UNLESS ( check_member ) %]	231	[% UNLESS ( check_member ) %]
232	<div id="toolbar" class="btn-toolbar">	232	<div id="toolbar" class="btn-toolbar">
		233	<div>
233	[% IF quickadd && opadd %]	234	[% IF quickadd && opadd %]
234	<button class="btn btn-default toggler principal" id="save_quick_add" name="save"><i class="fa fa-save"></i> Save</button>	235	<button class="btn btn-default toggler principal" id="save_quick_add" name="save"><i class="fa fa-save"></i> Save</button>
235	[% END %]	236	[% END %]
236	<button class="btn btn-default toggler principal" id="saverecord" name="save" ><i class="fa fa-save"></i> Save</button>	237	<button class="btn btn-default toggler principal" id="saverecord" name="save" ><i class="fa fa-save"></i> Save</button>
237	[% IF opadd %]	238	[% IF opadd %]
238	<a class="btn btn-default" href="/cgi-bin/koha/members/member.pl" class="toggler save_entryform">	239	<a class="cancel" href="/cgi-bin/koha/members/member.pl" class="toggler save_entryform">
239	[% ELSE %]	240	[% ELSE %]
240	<a class="btn btn-default" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber \| html %]">	241	<a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber \| html %]">
241	[% END %]	242	[% END %]
242	<i class="fa fa-times"></i> Cancel	243	<i class="fa fa-times"></i> Cancel
243	</a>	244	</a>
244	</div>	245	</div></div>
245	[% END %]	246	[% END %]
246		247
247	<form name="form" id="entryform" action="/cgi-bin/koha/members/memberentry.pl" method="post" autocomplete="off" class="toggler">	248	<form name="form" id="entryform" action="/cgi-bin/koha/members/memberentry.pl" method="post" autocomplete="off" class="toggler">
Lines 277-283 legend:hover { Link Here
277	[% IF ( step_1 ) %]	278	[% IF ( step_1 ) %]
278	[% UNLESS notitle && nosurname && nofirstname && nodateofbirth && noinitials && noothernames &&nosex %]	279	[% UNLESS notitle && nosurname && nofirstname && nodateofbirth && noinitials && noothernames &&nosex %]
279	<fieldset class="rows" id="memberentry_identity">	280	<fieldset class="rows" id="memberentry_identity">
280	<legend id="identity_lgd">[% IF ( I ) %]Organization [% ELSE %]Patron [% END %]identity</legend>	281	<h3 id="identity_lgd">[% IF ( I ) %]Organization [% ELSE %]Patron [% END %]identity</h3>
281	<ol>	282	<ol>
282	[% UNLESS ( I ) %]	283	[% UNLESS ( I ) %]
283	[% UNLESS notitle %]	284	[% UNLESS notitle %]
Lines 442-448 legend:hover { Link Here
442	[% SET possible_relationships = Koha.Preference('borrowerRelationship') %]	443	[% SET possible_relationships = Koha.Preference('borrowerRelationship') %]
443	<div id="memberentry_guarantor_anchor">	444	<div id="memberentry_guarantor_anchor">
444	<fieldset id="memberentry_guarantor" class="rows">	445	<fieldset id="memberentry_guarantor" class="rows">
445	<legend>Patron guarantor</legend>	446	<h3>Patron guarantor</h3>
446		447
447	<div id="guarantor_relationships">	448	<div id="guarantor_relationships">
448	[% FOREACH r IN relationships %]	449	[% FOREACH r IN relationships %]
Lines 604-610 legend:hover { Link Here
604		605
605	[% UNLESS nocontactname && nocontactfirstname && norelationship %]	606	[% UNLESS nocontactname && nocontactfirstname && norelationship %]
606	<fieldset class="rows" id="non_patron_guarantor">	607	<fieldset class="rows" id="non_patron_guarantor">
607	<legend>Non-patron guarantor</legend>	608	<h3>Non-patron guarantor</h3>
608	<ol>	609	<ol>
609	[% UNLESS nocontactname %]	610	[% UNLESS nocontactname %]
610	<li>	611	<li>
Lines 668-674 legend:hover { Link Here
668		669
669	[% UNLESS nophone && nophonepro && nomobile && noemail && noemailpro && nofax %]	670	[% UNLESS nophone && nophonepro && nomobile && noemail && noemailpro && nofax %]
670	<fieldset class="rows" id="memberentry_contact">	671	<fieldset class="rows" id="memberentry_contact">
671	<legend id="contact_lgd">Contact information</legend>	672	<h3 id="contact_lgd">Contact information</h3>
672	<ol>	673	<ol>
673	[% UNLESS nophone %]	674	[% UNLESS nophone %]
674	<li>	675	<li>
Lines 857-863 legend:hover { Link Here
857	[% IF ( step_3 ) %]	858	[% IF ( step_3 ) %]
858	[% SET autoMemberNum = Koha.Preference('autoMemberNum') %]	859	[% SET autoMemberNum = Koha.Preference('autoMemberNum') %]
859	<fieldset class="rows" id="memberentry_library_management">	860	<fieldset class="rows" id="memberentry_library_management">
860	<legend id="library_management_lgd">Library management</legend>	861	<h3 id="library_management_lgd">Library management</h3>
861	<ol>	862	<ol>
862	[% UNLESS nocardnumber %]	863	[% UNLESS nocardnumber %]
863	<li>	864	<li>
Lines 1056-1062 legend:hover { Link Here
1056		1057
1057	[% UNLESS nodateenrolled && noopacnote && noborrowernotes %]	1058	[% UNLESS nodateenrolled && noopacnote && noborrowernotes %]
1058	<fieldset class="rows" id="memberentry_subscription">	1059	<fieldset class="rows" id="memberentry_subscription">
1059	<legend id="library_setup_lgd">Library setup</legend><ol>	1060	<h3 id="library_setup_lgd">Library setup</h3><ol>
1060	[% UNLESS nodateenrolled %]	1061	[% UNLESS nodateenrolled %]
1061	<li>	1062	<li>
1062	[% IF ( mandatorydateenrolled ) %]	1063	[% IF ( mandatorydateenrolled ) %]
Lines 1142-1148 legend:hover { Link Here
1142		1143
1143	[% UNLESS nouserid && nopassword && !CanUpdatePasswordExpiration %]	1144	[% UNLESS nouserid && nopassword && !CanUpdatePasswordExpiration %]
1144	<fieldset class="rows" id="memberentry_userid">	1145	<fieldset class="rows" id="memberentry_userid">
1145	<legend id="opac_staff_login_lgd">OPAC/Staff interface login</legend>	1146	<h3 id="opac_staff_login_lgd">OPAC/Staff interface login</h3>
1146	<ol>	1147	<ol>
1147	[% UNLESS nouserid %]	1148	[% UNLESS nouserid %]
1148	<li>	1149	<li>
Lines 1298-1304 legend:hover { Link Here
1298	<!--this zones are not necessary in modif mode -->	1299	<!--this zones are not necessary in modif mode -->
1299	[% UNLESS ( opadd \|\| opduplicate ) %]	1300	[% UNLESS ( opadd \|\| opduplicate ) %]
1300	<fieldset class="rows" id="memberentry_account_flags">	1301	<fieldset class="rows" id="memberentry_account_flags">
1301	<legend id="account_flags_lgd">Patron account flags</legend>	1302	<h3 id="account_flags_lgd">Patron account flags</h3>
1302	<ol class="radio">	1303	<ol class="radio">
1303	[% FOREACH flagloo IN flagloop %]	1304	[% FOREACH flagloo IN flagloop %]
1304	<li>	1305	<li>
Lines 1332-1338 legend:hover { Link Here
1332	</fieldset> <!-- /#memberentry_account_flags -->	1333	</fieldset> <!-- /#memberentry_account_flags -->
1333		1334
1334	<fieldset class="rows" id="memberentry_restrictions">	1335	<fieldset class="rows" id="memberentry_restrictions">
1335	<legend id="restrictions_lgd">Patron restrictions</legend>	1336	<h3 id="restrictions_lgd">Patron restrictions</h3>
1336	[% IF ( debarments ) %]	1337	[% IF ( debarments ) %]
1337	<table>	1338	<table>
1338	<thead>	1339	<thead>
Lines 1379-1388 legend:hover { Link Here
1379	[% END # /IF ( debarments ) %]	1380	[% END # /IF ( debarments ) %]
1380		1381
1381	[% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]	1382	[% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
1382	<p><a href="#" id="add_manual_restriction">Add manual restriction</a></p>	1383	<p><a href="#" id="add_manual_restriction"><i class="fa fa-plus"></i> Add manual restriction</a></p>
1383	<fieldset id="manual_restriction_form">	1384	<fieldset id="manual_restriction_form">
1384	<input type="hidden" id="add_debarment" name="add_debarment" value="0" />	1385	<input type="hidden" id="add_debarment" name="add_debarment" value="0" />
1385	<legend id="manual_restriction_lgd">Add manual restriction</legend>	1386	<h3 id="manual_restriction_lgd">Add manual restriction</h3>
1386	<ol>	1387	<ol>
1387	<li>	1388	<li>
1388	<label for="debarred_comment">Comment: </label>	1389	<label for="debarred_comment">Comment: </label>
Lines 1406-1412 legend:hover { Link Here
1406	[% IF ( step_7 ) %]	1407	[% IF ( step_7 ) %]
1407	[% IF Koha.Preference('HouseboundModule') %]	1408	[% IF Koha.Preference('HouseboundModule') %]
1408	<fieldset class="rows" id="memberentry_housebound_roles">	1409	<fieldset class="rows" id="memberentry_housebound_roles">
1409	<legend id="housebound_roles">Housebound roles</legend>	1410	<h3 id="housebound_roles">Housebound roles</h3>
1410	<ol class="radio">	1411	<ol class="radio">
1411	<li>	1412	<li>
1412	<label class="radio" for="housebound_chooser">	1413	<label class="radio" for="housebound_chooser">
Lines 1447-1459 legend:hover { Link Here
1447	[% IF Koha.Preference('ExtendedPatronAttributes') %]	1448	[% IF Koha.Preference('ExtendedPatronAttributes') %]
1448	[% UNLESS ( no_patron_attribute_types ) %]	1449	[% UNLESS ( no_patron_attribute_types ) %]
1449	<fieldset class="rows" id="memberentry_patron_attributes">	1450	<fieldset class="rows" id="memberentry_patron_attributes">
1450	<legend id="patron_attributes_lgd">Additional attributes and identifiers</legend>	1451	<h3 id="patron_attributes_lgd">Additional attributes and identifiers</h3>
1451	<input type="hidden" name="setting_extended_patron_attributes" value="1" />	1452	<input type="hidden" name="setting_extended_patron_attributes" value="1" />
1452	[% FOREACH pa_loo IN patron_attributes %]	1453	[% FOREACH pa_loo IN patron_attributes %]
1453	<ol class="attributes_table">	1454	<ol class="attributes_table">
1454	[% IF pa_loo.class %]	1455	[% IF pa_loo.class %]
1455	<fieldset id="aai_[% pa_loo.class \| html %]">	1456	<fieldset id="aai_[% pa_loo.class \| html %]">
1456	<legend id="[% pa_loo.class \| html %]_lgd">[% pa_loo.lib \| html %]</legend>	1457	<h3 id="[% pa_loo.class \| html %]_lgd">[% pa_loo.lib \| html %]</h3>
1457	[% END %]	1458	[% END %]
1458	[% FOREACH patron_attribute IN pa_loo.items %]	1459	[% FOREACH patron_attribute IN pa_loo.items %]
1459	<li data-category_code="[% patron_attribute.category_code \| html %]">	1460	<li data-category_code="[% patron_attribute.category_code \| html %]">
Lines 1489-1495 legend:hover { Link Here
1489	[% END %]	1490	[% END %]
1490	[% END # /IF ( patron_attribute.use_dropdown ) %]	1491	[% END # /IF ( patron_attribute.use_dropdown ) %]
1491	<input type="hidden" id="[% patron_attribute.form_id \| html %]_code" name="[% patron_attribute.form_id \| html %]_code" value="[% patron_attribute.code \| html %]" />	1492	<input type="hidden" id="[% patron_attribute.form_id \| html %]_code" name="[% patron_attribute.form_id \| html %]_code" value="[% patron_attribute.code \| html %]" />
1492	<a href="#" class="clear_attribute"><i class="fa fa-fw fa-trash"></i> Clear</a>	1493	<a href="#" class="clear_attribute" id="lientype"><i class="fa fa-fw fa-trash"></i> Clear</a>
1493	[% IF ( patron_attribute.repeatable ) %]	1494	[% IF ( patron_attribute.repeatable ) %]
1494	<a href="#" class="clone_attribute"><i class="fa fa-fw fa-plus"></i> New</a>	1495	<a href="#" class="clone_attribute"><i class="fa fa-fw fa-plus"></i> New</a>
1495	[% END %]	1496	[% END %]
Lines 1507-1513 legend:hover { Link Here
1507	[% IF ( step_5 ) %]	1508	[% IF ( step_5 ) %]
1508	[% IF ( EnhancedMessagingPreferences ) %]	1509	[% IF ( EnhancedMessagingPreferences ) %]
1509	<fieldset class="rows" id="memberentry_messaging_prefs">	1510	<fieldset class="rows" id="memberentry_messaging_prefs">
1510	<legend id="patron_messaging_prefs_lgd">Patron messaging preferences</legend>	1511	<h3 id="patron_messaging_prefs_lgd">Patron messaging preferences</h3>
1511	<div id="messaging_prefs_loading" class="form-message" style="display:none">	1512	<div id="messaging_prefs_loading" class="form-message" style="display:none">
1512	<img src="[% interface \| html %]/[% theme \| html %]/img/spinner-small.gif" alt="" /> Loading new messaging defaults	1513	<img src="[% interface \| html %]/[% theme \| html %]/img/spinner-small.gif" alt="" /> Loading new messaging defaults
1513	</div>	1514	</div>
Lines 1542-1548 legend:hover { Link Here
1542		1543
1543	[% IF quickadd && opadd && !check_member %]	1544	[% IF quickadd && opadd && !check_member %]
1544	<form id="quick_add_form" class="toggler">	1545	<form id="quick_add_form" class="toggler">
1545	<fieldset class="rows quick_add"><legend>Quick add</legend>	1546	<fieldset class="rows quick_add"><h3>Quick add</h3>
1546	<ol id="quick_add_list">	1547	<ol id="quick_add_list">
1547	</ol>	1548	</ol>
1548	</fieldset>	1549	</fieldset>
Lines 1580-1651 legend:hover { Link Here
1580	function showHideFields(){	1581	function showHideFields(){
1581	[% UNLESS step == 1 %]	1582	[% UNLESS step == 1 %]
1582	[% IF fieldstohide.match('identity') %]	1583	[% IF fieldstohide.match('identity') %]
1583	$("#memberentry_identity").find('legend').nextAll().toggle();	1584	$("#memberentry_identity").find('h3').nextAll().toggle();
1584	[% END %]	1585	[% END %]
1585	[% IF show_guarantor \|\| guarantor %]	1586	[% IF show_guarantor \|\| guarantor %]
1586	[% IF fieldstohide.match('guarantor') %]	1587	[% IF fieldstohide.match('guarantor') %]
1587	$("#memberentry_guarantor").find('legend').nextAll().toggle();	1588	$("#memberentry_guarantor").find('h3').nextAll().toggle();
1588	$("#guarantor_template").toggle();	1589	$("#guarantor_template").toggle();
1589	[% END %]	1590	[% END %]
1590	[% END %]	1591	[% END %]
1591	[% IF fieldstohide.match('primary_address') %]	1592	[% IF fieldstohide.match('primary_address') %]
1592	$("#memberentry_mainaddress").find('legend').nextAll().toggle();	1593	$("#memberentry_mainaddress").find('h3').nextAll().toggle();
1593	[% END %]	1594	[% END %]
1594	[% IF fieldstohide.match('primary_contact') %]	1595	[% IF fieldstohide.match('primary_contact') %]
1595	$("#memberentry_contact").find('legend').nextAll().toggle();	1596	$("#memberentry_contact").find('h3').nextAll().toggle();
1596	[% END %]	1597	[% END %]
1597	[% END %]	1598	[% END %]
1598	[% UNLESS step == 6 %]	1599	[% UNLESS step == 6 %]
1599	[% IF fieldstohide.match('alt_address') %]	1600	[% IF fieldstohide.match('alt_address') %]
1600	$("#memberentry_address").find('legend').nextAll().toggle();	1601	$("#memberentry_address").find('h3').nextAll().toggle();
1601	[% END %]	1602	[% END %]
1602	[% END %]	1603	[% END %]
1603	[% UNLESS step == 2 %]	1604	[% UNLESS step == 2 %]
1604	[% IF fieldstohide.match('alt_contact') %]	1605	[% IF fieldstohide.match('alt_contact') %]
1605	$("#memberentry_altaddress").find('legend').nextAll().toggle();	1606	$("#memberentry_altaddress").find('h3').nextAll().toggle();
1606	[% END %]	1607	[% END %]
1607	[% END %]	1608	[% END %]
1608	[% UNLESS step == 3 %]	1609	[% UNLESS step == 3 %]
1609	[% IF fieldstohide.match('lib_mgmt') %]	1610	[% IF fieldstohide.match('lib_mgmt') %]
1610	$("#memberentry_library_management").find('legend').nextAll().toggle();	1611	$("#memberentry_library_management").find('h3').nextAll().toggle();
1611	[% END %]	1612	[% END %]
1612	[% UNLESS nodateenrolled && noopacnote && noborrowernotes %]	1613	[% UNLESS nodateenrolled && noopacnote && noborrowernotes %]
1613	[% IF fieldstohide.match('lib_setup') %]	1614	[% IF fieldstohide.match('lib_setup') %]
1614	$("#memberentry_subscription").find('legend').nextAll().toggle();	1615	$("#memberentry_subscription").find('h3').nextAll().toggle();
1615	[% END %]	1616	[% END %]
1616	[% END %]	1617	[% END %]
1617	[% UNLESS nouserid && nopassword %]	1618	[% UNLESS nouserid && nopassword %]
1618	[% IF fieldstohide.match('login') %]	1619	[% IF fieldstohide.match('login') %]
1619	$("#memberentry_userid").find('legend').nextAll().toggle();	1620	$("#memberentry_userid").find('h3').nextAll().toggle();
1620	[% END %]	1621	[% END %]
1621	[% END %]	1622	[% END %]
1622	[% UNLESS ( opadd \|\| opduplicate ) %]	1623	[% UNLESS ( opadd \|\| opduplicate ) %]
1623	[% IF fieldstohide.match('flags') %]	1624	[% IF fieldstohide.match('flags') %]
1624	$("#memberentry_account_flags").find('legend').nextAll().toggle();	1625	$("#memberentry_account_flags").find('h3').nextAll().toggle();
1625	[% END %]	1626	[% END %]
1626	[% END %]	1627	[% END %]
1627	[% IF fieldstohide.match('debarments') %]	1628	[% IF fieldstohide.match('debarments') %]
1628	$("#memberentry_restrictions").find('legend').nextAll().toggle();	1629	$("#memberentry_restrictions").find('h3').nextAll().toggle();
1629	[% END %]	1630	[% END %]
1630	[% END %]	1631	[% END %]
1631	[% UNLESS step == 7 %]	1632	[% UNLESS step == 7 %]
1632	[% IF Koha.Preference('HouseboundModule') %]	1633	[% IF Koha.Preference('HouseboundModule') %]
1633	[% IF fieldstohide.match('housebound') %]	1634	[% IF fieldstohide.match('housebound') %]
1634	$("#memberentry_housebound_roles").find('legend').nextAll().toggle();	1635	$("#memberentry_housebound_roles").find('h3').nextAll().toggle();
1635	[% END %]	1636	[% END %]
1636	[% END %]	1637	[% END %]
1637	[% END %]	1638	[% END %]
1638	[% UNLESS step == 4 %]	1639	[% UNLESS step == 4 %]
1639	[% IF Koha.Preference('ExtendedPatronAttributes') %]	1640	[% IF Koha.Preference('ExtendedPatronAttributes') %]
1640	[% IF fieldstohide.match('additional') %]	1641	[% IF fieldstohide.match('additional') %]
1641	$("#memberentry_patron_attributes").find('legend').nextAll().toggle();	1642	$("#memberentry_patron_attributes").find('h3').nextAll().toggle();
1642	[% END %]	1643	[% END %]
1643	[% END %]	1644	[% END %]
1644	[% END %]	1645	[% END %]
1645	[% UNLESS step == 5 %]	1646	[% UNLESS step == 5 %]
1646	[% IF Koha.Preference('EnhancedMessagingPreferences') %]	1647	[% IF Koha.Preference('EnhancedMessagingPreferences') %]
1647	[% IF fieldstohide.match('messaging') %]	1648	[% IF fieldstohide.match('messaging') %]
1648	$("#memberentry_messaging_prefs").find('legend').nextAll().toggle();	1649	$("#memberentry_messaging_prefs").find('h3').nextAll().toggle();
1649	$("#messaging_prefs_loading").toggle();	1650	$("#messaging_prefs_loading").toggle();
1650	[% END %]	1651	[% END %]
1651	[% END %]	1652	[% END %]
Lines 1658-1664 legend:hover { Link Here
1658	showHideFields();	1659	showHideFields();
1659	});	1660	});
1660		1661
1661	$("legend").click(function(){	1662	$("h3").click(function(){
1662	$(this).nextAll().toggle();	1663	$(this).nextAll().toggle();
1663	$("#messaging_prefs_loading").hide();	1664	$("#messaging_prefs_loading").hide();
1664	$("#guarantor_template").hide();	1665	$("#guarantor_template").hide();

Lines 12-18 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-29 / +82 lines)
12	[% PROCESS 'member-display-alt-address-style.inc' %]	12	[% PROCESS 'member-display-alt-address-style.inc' %]
13	[% SET footerjs = 1 %]	13	[% SET footerjs = 1 %]
14	[% formulaire = BLOCK %]	14	[% formulaire = BLOCK %]
15	[% INCLUDE 'patron-search-header.inc' %]	15	[% INCLUDE 'patron-search.inc' %]
16	[% END %]	16	[% END %]
17	[% INCLUDE 'doc-head-open.inc' %]	17	[% INCLUDE 'doc-head-open.inc' %]
18	[% Asset.css("lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css") \| $raw %]	18	[% Asset.css("lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css") \| $raw %]
Lines 91-107 Link Here
91	</div>	91	</div>
92	[% END %]	92	[% END %]
93		93
94	<div class="row">	94	<div>
95		95
96	[% IF ( was_renewed ) %]	96	<h2>
		97	[% UNLESS ( I ) %]
		98	[% patron.title \| html %] [% patron.firstname \| html %]
		99	[% END %]
		100	[% patron.surname \| html %] ([% patron.cardnumber \| html %])
		101	</h2>
		102
		103	<fieldset id="searchresults">
		104	[% IF ( was_renewed ) %]
97	<div class="dialog message">	105	<div class="dialog message">
98	Patron's account has been renewed until [% patron.dateexpiry \| $KohaDates %]	106	Patron's account has been renewed until [% patron.dateexpiry \| $KohaDates %]
99	</div>	107	</div>
100	[% END %]	108	[% END %]
101		109
102	<div id="patron_messages" class="circmessage attention">	110	<div id="patron_messages" class="circmessage attention">
103	[% INCLUDE 'patron_messages.inc' %]	111	[% INCLUDE 'patron_messages.inc' %]
104	</div>	112	</div>
		113	</fieldset>
105		114
106	<h1>	115	<h1>
107	[% UNLESS ( I ) %]	116	[% UNLESS ( I ) %]
Lines 110-124 Link Here
110	[% patron.surname \| html %] ([% patron.cardnumber \| html %])	119	[% patron.surname \| html %] ([% patron.cardnumber \| html %])
111	</h1>	120	</h1>
112	<div class="col-sm-6">	121	<div class="col-sm-6">
		122	<fieldset class="rows">
113		123
114	<div id="patron-information" class="patroninfo-section">	124	<div id="patron-information" class="patroninfo-section">
115		125
116	<div class="patroninfo-heading">	126	<div class="patroninfo-heading">
117	<h3>Contact information</h3>	127	<h3>Contact information</h3>
118	[% IF ( guarantor.borrowernumber ) %]	128	[% IF ( guarantor.borrowernumber ) %]
119	<a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber \| html %]&step=1&guarantorid=[% guarantor.borrowernumber \| html %]"><i class="fa fa-pencil"></i> Edit</a>	129	<a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber \| html %]&step=1&guarantorid=[% guarantor.borrowernumber \| html %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a>
120	[% ELSE %]	130	[% ELSE %]
121	<a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber \| html %]&step=1"><i class="fa fa-pencil"></i> Edit</a>	131	<a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber \| html %]&step=1" id="lientype"><i class="fa fa-pencil"></i> Edit</a>
122	[% END %]	132	[% END %]
123	</div>	133	</div>
124		134
Lines 263-274 Link Here
263	</div> [% # /div.rows %]	273	</div> [% # /div.rows %]
264	</div> [% # /div#patron-information %]	274	</div> [% # /div#patron-information %]
265		275
		276	[% IF ( patronimages ) %]
		277	[% IF ( CAN_user_tools_batch_upload_patron_images ) %]
		278	<div id="manage-patron-image" class="patroninfo-section">
		279	[% IF ( patron.image ) %]
		280	<div class="patroninfo-heading">
		281	<h3>Manage patron image</h3>
		282	<a class="btn btn-default btn-xs" id="show-picture-upload" href="#" id="lientype"><i class="fa fa-pencil"></i> Edit</a>
		283	</div>
		284	[% ELSE %]
		285	<div class="patroninfo-heading">
		286	<h3>Upload patron image</h3>
		287	<a class="btn btn-default btn-xs" id="show-picture-upload" href="#"><i class="fa fa-plus"></i> Add</a>
		288	</div>
		289	[% END %]
		290	<form method="post" id="picture-upload" style="display:none;" action="/cgi-bin/koha/tools/picture-upload.pl" enctype="multipart/form-data">
		291	[% IF ( patron.image ) %]
		292	<div class="hint">To update the image for [% patron.title \| html %] [% patron.firstname \| html %] [% patron.surname \| html %], select a new image file and click 'Upload.' <br />Click the 'Delete' button to remove the current image.</div>
		293	[% ELSE %]
		294	<div class="hint">[% patron.title \| html %] [% patron.firstname \| html %] [% patron.surname \| html %] does not currently have an image available. To import an image for [% patron.title \| html %] [% patron.firstname \| html %] [% patron.surname \| html %], enter the name of an image file to upload.</div>
		295	[% END %]
		296	<p>Only PNG, GIF, JPEG, XPM formats are supported. Maximum image size is 2MB.</p>
		297	<label for="uploadfile">Select the file to upload: </label>
		298	<input type="file" id="uploadfile" name="uploadfile" required="required" />
		299	<div class="action">
		300	<input type="hidden" name="csrf_token" value="[% csrf_token \| html %]" />
		301	<input type="hidden" id="image" name="filetype" value="image" />
		302	<input type="hidden" id="cardnumber" name="cardnumber" value="[% patron.cardnumber \| html %]" />
		303	<input type="hidden" name="borrowernumber" value="[% patron.borrowernumber \| html %]" />
		304	<button type="submit" class="btn btn-default btn-xs"><i class="fa fa-upload"></i> Upload</button>
		305	<input name="op" type="hidden" value="Upload" />
		306	[% IF ( patron.image ) %]
		307	<a id="delpicture" href="/cgi-bin/koha/tools/picture-upload.pl?op=Delete&borrowernumber=[% patron.borrowernumber \| html %]&csrf_token=[% csrf_token \| html %]" class="btn btn-default btn-xs delete"><i class="fa fa-trash"></i> Delete</a>
		308	[% END %]
		309	<a href="#" id="cancel-picture-upload" class="cancel">Cancel</a>
		310	</div>
		311	</form>
		312	</div> [% # /div#manage-patron-image %]
		313	[% END %]
		314	[% END %]
		315
266	[% IF Koha.Preference('HouseboundModule') %]	316	[% IF Koha.Preference('HouseboundModule') %]
267	<div id="houseboundroles" class="patroninfo-section">	317	<div id="houseboundroles" class="patroninfo-section">
268	[% IF ( housebound_role.housebound_chooser == 1 OR housebound_role.housebound_deliverer == 1 ) %]	318	[% IF ( housebound_role.housebound_chooser == 1 OR housebound_role.housebound_deliverer == 1 ) %]
269	<div class="patroninfo-heading">	319	<div class="patroninfo-heading">
270	<h3>Housebound roles</h3>	320	<h3>Housebound roles</h3>
271	<a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber \| html %]&step=7"><i class="fa fa-pencil"></i> Edit</a>	321	<a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber \| html %]&step=7" id="lientype"><i class="fa fa-pencil"></i> Edit</a>
272	</div>	322	</div>
273	<div class="rows">	323	<div class="rows">
274	<ol>	324	<ol>
Lines 293-299 Link Here
293	[% ELSE %]	343	[% ELSE %]
294	<div class="patroninfo-heading">	344	<div class="patroninfo-heading">
295	<h3>Housebound roles</h3>	345	<h3>Housebound roles</h3>
296	<a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber \| html %]&step=7"><i class="fa fa-plus"></i> Add</a>	346	<a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber \| html %]&step=7" id="lientype"><i class="fa fa-plus"></i> Add</a>
297	</div>	347	</div>
298	[% END %]	348	[% END %]
299	</div> [% #/ div#houseboundroles %]	349	</div> [% #/ div#houseboundroles %]
Lines 305-311 Link Here
305	[% IF ( attributes_loop ) %]	355	[% IF ( attributes_loop ) %]
306	<div class="patroninfo-heading">	356	<div class="patroninfo-heading">
307	<h3>Additional attributes and identifiers</h3>	357	<h3>Additional attributes and identifiers</h3>
308	<a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber \| html %]&step=4"><i class="fa fa-pencil"></i> Edit</a>	358	<a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber \| html %]&step=4" id="lientype"><i class="fa fa-pencil"></i> Edit</a>
309	</div>	359	</div>
310	[% FOREACH attribute IN attributes_loop %]	360	[% FOREACH attribute IN attributes_loop %]
311	[% IF attribute.class %]	361	[% IF attribute.class %]
Lines 329-335 Link Here
329	[% ELSE %]	379	[% ELSE %]
330	<div class="patroninfo-heading">	380	<div class="patroninfo-heading">
331	<h3>Additional attributes and identifiers</h3>	381	<h3>Additional attributes and identifiers</h3>
332	<a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber \| html %]&step=4"><i class="fa fa-plus"></i> Add</a>	382	<a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber \| html %]&step=4" id="lientype"><i class="fa fa-plus"></i> Add</a>
333	</div>	383	</div>
334	[% END %]	384	[% END %]
335	</div> [% # /div#patron-extended-attributes %]	385	</div> [% # /div#patron-extended-attributes %]
Lines 340-346 Link Here
340	<div id="patron-messaging-prefs" class="patroninfo-section">	390	<div id="patron-messaging-prefs" class="patroninfo-section">
341	<div class="patroninfo-heading">	391	<div class="patroninfo-heading">
342	<h3>Patron messaging preferences</h3>	392	<h3>Patron messaging preferences</h3>
343	<a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber \| html %]&step=5"><i class="fa fa-pencil"></i> Edit</a>	393	<a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber \| html %]&step=5" id="lientype"><i class="fa fa-pencil"></i> Edit</a>
344	</div>	394	</div>
345	[% INCLUDE 'messaging-preference-form.inc' %]	395	[% INCLUDE 'messaging-preference-form.inc' %]
346	[% IF Koha.Preference('SMSSendDriver') %]	396	[% IF Koha.Preference('SMSSendDriver') %]
Lines 361-374 Link Here
361	[% END %]	411	[% END %]
362	</div> [% # /div#patron-messaging-prefs %]	412	</div> [% # /div#patron-messaging-prefs %]
363	[% END %]	413	[% END %]
364		414	</fieldset>
365	</div> <!-- /.col-sm-6 -->	415	</div> <!-- /.col-sm-6 -->
366		416
367	<div class="col-sm-6">	417	<div class="col-sm-6">
		418	<fieldset class="rows">
368	<div id="patron-library-details" class="patroninfo-section">	419	<div id="patron-library-details" class="patroninfo-section">
369	<div class="patroninfo-heading">	420	<div class="patroninfo-heading">
370	<h3>Library use</h3>	421	<h3>Library use</h3>
371	<a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber \| html %]&step=3"><i class="fa fa-pencil"></i> Edit</a>	422	<a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber \| html %]&step=3" id="lientype"><i class="fa fa-pencil"></i> Edit</a>
372	</div>	423	</div>
373	<div class="rows">	424	<div class="rows">
374	<ol>	425	<ol>
Lines 404-415 Link Here
404	<span class="blocker">	455	<span class="blocker">
405	[% patron.dateexpiry \| $KohaDates %]	456	[% patron.dateexpiry \| $KohaDates %]
406	<strong><em>Expired</em></strong>	457	<strong><em>Expired</em></strong>
407	<a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber \| uri %]&reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber \| html %]">Edit details</a>	458	<a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber \| uri %]&reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber \| html %]" id="lientype">Edit details</a>
408	</span>	459	</span>
409	[% ELSIF ( patron.is_going_to_expire ) %]	460	[% ELSIF ( patron.is_going_to_expire ) %]
410	[% patron.dateexpiry \| $KohaDates %]	461	[% patron.dateexpiry \| $KohaDates %]
411	<strong><em>Patron expires soon</em></strong>	462	<strong><em>Patron expires soon</em></strong>
412	<a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber \| uri %]&reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber \| html %]">Edit details</a>	463	<a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber \| uri %]&reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber \| html %]" id="lientype">Edit details</a>
413	[% ELSE %]	464	[% ELSE %]
414	[% patron.dateexpiry \| $KohaDates %]	465	[% patron.dateexpiry \| $KohaDates %]
415	[% END %]	466	[% END %]
Lines 510-516 Link Here
510	[% IF ( patron.B_phone \|\| patron.B_email \|\| patron.contactnote \|\| patron.B_address \|\| patron.B_address2 \|\| patron.B_city \|\| patron.B_zipcode \|\| patron.B_country ) %]	561	[% IF ( patron.B_phone \|\| patron.B_email \|\| patron.contactnote \|\| patron.B_address \|\| patron.B_address2 \|\| patron.B_city \|\| patron.B_zipcode \|\| patron.B_country ) %]
511	<div class="patroninfo-heading">	562	<div class="patroninfo-heading">
512	<h3>Alternate address</h3>	563	<h3>Alternate address</h3>
513	<a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber \| html %]&step=6"><i class="fa fa-pencil"></i> Edit</a>	564	<a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber \| html %]&step=6" id="lientype"><i class="fa fa-pencil"></i> Edit</a>
514	</div>	565	</div>
515	<div class="address">	566	<div class="address">
516	<ul>	567	<ul>
Lines 544-550 Link Here
544	[% ELSE %]	595	[% ELSE %]
545	<div class="patroninfo-heading">	596	<div class="patroninfo-heading">
546	<h3 class="inline">Alternate address</h3>	597	<h3 class="inline">Alternate address</h3>
547	<a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber \| html %]&step=6"><i class="fa fa-plus"></i> Add</a>	598	<a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber \| html %]&step=6" id="lientype"><i class="fa fa-plus"></i> Add</a>
548	</div>	599	</div>
549	[% END %]	600	[% END %]
550	</div> [% # /div#patron-alternate-address %]	601	</div> [% # /div#patron-alternate-address %]
Lines 553-559 Link Here
553	[% IF ( patron.altcontactsurname \|\| patron.altcontactfirstname \|\| patron.altcontactaddress1 \|\| patron.altcontactaddress2 \|\| patron.altcontactaddress3 \|\| patron.altcontactstate \|\| patron.altcontactzipcode \|\| patron.altcontactcountry \|\| patron.altcontactphone ) %]	604	[% IF ( patron.altcontactsurname \|\| patron.altcontactfirstname \|\| patron.altcontactaddress1 \|\| patron.altcontactaddress2 \|\| patron.altcontactaddress3 \|\| patron.altcontactstate \|\| patron.altcontactzipcode \|\| patron.altcontactcountry \|\| patron.altcontactphone ) %]
554	<div class="patroninfo-heading">	605	<div class="patroninfo-heading">
555	<h3>Alternative contact</h3>	606	<h3>Alternative contact</h3>
556	<a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber \| html %]&step=2"><i class="fa fa-pencil"></i> Edit</a>	607	<a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber \| html %]&step=2" id="lientype"><i class="fa fa-pencil"></i> Edit</a>
557	</div>	608	</div>
558	<div class="rows">	609	<div class="rows">
559	<ol>	610	<ol>
Lines 617-623 Link Here
617	[% ELSE %]	668	[% ELSE %]
618	<div class="patroninfo-heading">	669	<div class="patroninfo-heading">
619	<h3>Alternative contact</h3>	670	<h3>Alternative contact</h3>
620	<a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber \| html %]&step=2"><i class="fa fa-plus"></i> Add</a>	671	<a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber \| html %]&step=2" id="lientype"><i class="fa fa-plus"></i> Add</a>
621	</div>	672	</div>
622	[% END %]	673	[% END %]
623	</div> [% # /div#patron-alternative-contact %]	674	</div> [% # /div#patron-alternative-contact %]
Lines 626-632 Link Here
626	<div id="patron-files" class="patroninfo-section">	677	<div id="patron-files" class="patroninfo-section">
627	<div class="patroninfo-heading">	678	<div class="patroninfo-heading">
628	<h3>Files</h3>	679	<h3>Files</h3>
629	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/members/files.pl?borrowernumber=[% patron.borrowernumber \| uri %]"><i class="fa fa-list"></i> Manage</a>	680	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/members/files.pl?borrowernumber=[% patron.borrowernumber \| uri %]" id="lientype"><i class="fa fa-list"></i> Manage</a>
630		681
631	[% IF ( files ) %]	682	[% IF ( files ) %]
632	<div class="rows">	683	<div class="rows">
Lines 646-656 Link Here
646	</div> <!-- /.patroninfo-heading -->	697	</div> <!-- /.patroninfo-heading -->
647	</div> <!-- /#patron-files -->	698	</div> <!-- /#patron-files -->
648	[% END # /IF EnableBorrowerFiles %]	699	[% END # /IF EnableBorrowerFiles %]
		700	</fieldset>
649		701
650	</div> <!-- /div.col-sm-6 -->	702	</div> <!-- /div.col-sm-6 -->
651	</div> <!-- /div.row -->	703	</div> <!-- /div.row -->
652		704
653	<div id="finesholdsissues" class="toptabs">	705	<fieldset id="finesholdsissues" class="toptabs">
		706	<fieldset id="searchresultst">
654	<ul>	707	<ul>
655	<li>	708	<li>
656	<a href="#checkouts">Checkouts ([% issuecount \|\| 0 \| html %])</a>	709	<a href="#checkouts">Checkouts ([% issuecount \|\| 0 \| html %])</a>
Lines 791-797 Link Here
791	<fieldset class="action">	844	<fieldset class="action">
792	<input type="hidden" name="from" value="borrower" />	845	<input type="hidden" name="from" value="borrower" />
793	<input type="hidden" name="borrowernumber" value="[% patron.borrowernumber \| html %]" />	846	<input type="hidden" name="borrowernumber" value="[% patron.borrowernumber \| html %]" />
794	<input type="submit" value="Suspend all holds" />	847	<input type="submit" class="principal" value="Suspend all holds" />
795		848
796	[% IF Koha.Preference('AutoResumeSuspendedHolds') %]	849	[% IF Koha.Preference('AutoResumeSuspendedHolds') %]
797	<label for="suspend_until">until</label>	850	<label for="suspend_until">until</label>
Lines 806-812 Link Here
806	<input type="hidden" name="from" value="borrower" />	859	<input type="hidden" name="from" value="borrower" />
807	<input type="hidden" name="borrowernumber" value="[% patron.borrowernumber \| html %]" />	860	<input type="hidden" name="borrowernumber" value="[% patron.borrowernumber \| html %]" />
808	<input type="hidden" name="suspend" value="0" />	861	<input type="hidden" name="suspend" value="0" />
809	<input type="submit" value="Resume all suspended holds" />	862	<input type="submit" class="principal" value="Resume all suspended holds" />
810	</fieldset>	863	</fieldset>
811	</form>	864	</form>
812	[% END # IF SuspendHoldsIntranet %]	865	[% END # IF SuspendHoldsIntranet %]
Lines 830-837 Link Here
830	[% IF Koha.Preference('ArticleRequests') %]	883	[% IF Koha.Preference('ArticleRequests') %]
831	[% INCLUDE 'patron-article-requests.inc' %]	884	[% INCLUDE 'patron-article-requests.inc' %]
832	[% END %]	885	[% END %]
833		886	</fieldset>
834	</div> <!-- /div#finesholdsissues -->	887	</fieldset> <!-- /div#finesholdsissues -->
835	</main>	888	</main>
836	</div> <!-- /.col-sm-10.col-sm-push-2 -->	889	</div> <!-- /.col-sm-10.col-sm-push-2 -->
837		890
Lines 925-931 Link Here
925	for (var i=0;i < Nodes.length;i++){	978	for (var i=0;i < Nodes.length;i++){
926	if (Nodes[i].nodeName=="INPUT" && Nodes[i].getAttribute("type")=="checkbox"){	979	if (Nodes[i].nodeName=="INPUT" && Nodes[i].getAttribute("type")=="checkbox"){
927	Nodes[i].checked=false;	980	Nodes[i].checked=false;
928	}	981	view_restrictions }
929	}	982	}
930	} else {	983	} else {
931	var Node=me.parentNode.nextSibling;	984	var Node=me.parentNode.nextSibling;

Lines 53-58 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt (-4 / +5 lines)
53	<h1>Acquisitions statistics </h1>	53	<h1>Acquisitions statistics </h1>
54	[% IF ( do_it ) %]	54	[% IF ( do_it ) %]
55	[% FOREACH mainloo IN mainloop %]	55	[% FOREACH mainloo IN mainloop %]
		56	<h2>Acquisitions statistics </h2>
56	[% IF ( mainloo.loopfilter.size ) %]	57	[% IF ( mainloo.loopfilter.size ) %]
57	<p><strong>Filtered on:</strong></p>	58	<p><strong>Filtered on:</strong></p>
58	[% FOREACH loopfilte IN mainloo.loopfilter %]	59	[% FOREACH loopfilte IN mainloo.loopfilter %]
Lines 114-120 Link Here
114	[% ELSE %]	115	[% ELSE %]
115	<form method="post" action="/cgi-bin/koha/reports/acquisitions_stats.pl">	116	<form method="post" action="/cgi-bin/koha/reports/acquisitions_stats.pl">
116	<fieldset class="rows">	117	<fieldset class="rows">
117	<legend>Acquisitions statistics</legend>	118	<h3>Acquisitions statistics</h3>
118	<table>	119	<table>
119	<thead>	120	<thead>
120	<tr>	121	<tr>
Lines 283-289 Link Here
283	</fieldset>	284	</fieldset>
284		285
285	<fieldset class="rows">	286	<fieldset class="rows">
286	<legend> Cell value </legend>	287	<h3> Cell value </h3>
287	<ol>	288	<ol>
288	<li>	289	<li>
289	<label for="cellvalue1">Count items:</label><input type="radio" name="Cellvalue" id="cellvalue1" value="1" checked="checked" />	290	<label for="cellvalue1">Count items:</label><input type="radio" name="Cellvalue" id="cellvalue1" value="1" checked="checked" />
Lines 304-310 Link Here
304	</fieldset>	305	</fieldset>
305		306
306	<fieldset class="rows">	307	<fieldset class="rows">
307	<legend>Output</legend>	308	<h3>Output</h3>
308	<ol>	309	<ol>
309	<li>	310	<li>
310	<label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" />	311	<label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" />
Lines 330-336 Link Here
330	</fieldset>	331	</fieldset>
331		332
332	<fieldset class="action">	333	<fieldset class="action">
333	<input type="submit" value="Submit" />	334	<input type="submit" class="principal" value="Submit" />
334	<input type="hidden" name="report_name" value="[% report_name \| html %]" />	335	<input type="hidden" name="report_name" value="[% report_name \| html %]" />
335	<input type="hidden" name="do_it" value="1" />	336	<input type="hidden" name="do_it" value="1" />
336	</fieldset>	337	</fieldset>

Lines 61-66 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt (-3 / +4 lines)
61	<h1>Patrons statistics</h1>	61	<h1>Patrons statistics</h1>
62	[% IF ( do_it ) %]	62	[% IF ( do_it ) %]
63	[% FOREACH mainloo IN mainloop %]	63	[% FOREACH mainloo IN mainloop %]
		64	<h2>Patrons statistics</h2>
64	[% IF ( mainloo.loopfilter.size>0 ) %]	65	[% IF ( mainloo.loopfilter.size>0 ) %]
65	<p>Filtered on:</p>	66	<p>Filtered on:</p>
66	[% FOREACH loopfilte IN mainloo.loopfilter %]	67	[% FOREACH loopfilte IN mainloo.loopfilter %]
Lines 101-107 Link Here
101	[% ELSE %]	102	[% ELSE %]
102		103
103	<form method="post" action="/cgi-bin/koha/reports/borrowers_stats.pl">	104	<form method="post" action="/cgi-bin/koha/reports/borrowers_stats.pl">
104	<fieldset class="rows"><legend>Patrons statistics</legend>	105	<fieldset class="rows"><h3>Patrons statistics</h3>
105	<table>	106	<table>
106	<thead>	107	<thead>
107	<tr>	108	<tr>
Lines 293-299 Link Here
293		294
294		295
295	<fieldset class="rows">	296	<fieldset class="rows">
296	<legend>Output</legend>	297	<h3>Output</h3>
297	<ol>	298	<ol>
298	<li>	299	<li>
299	<label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" />	300	<label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" />
Lines 321-327 Link Here
321	</fieldset>	322	</fieldset>
322		323
323	<fieldset class="action">	324	<fieldset class="action">
324	<input type="submit" value="Submit" />	325	<input type="submit" class="principal" value="Submit" />
325	<input type="hidden" name="report_name" value="[% report_name \| html %]" />	326	<input type="hidden" name="report_name" value="[% report_name \| html %]" />
326	<input type="hidden" name="do_it" value="1" />	327	<input type="hidden" name="do_it" value="1" />
327	</fieldset>	328	</fieldset>

Lines 54-59 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt (-4 / +5 lines)
54	<h1>Catalog statistics</h1>	54	<h1>Catalog statistics</h1>
55	[% IF ( do_it ) %]	55	[% IF ( do_it ) %]
56	[% FOREACH mainloo IN mainloop %]	56	[% FOREACH mainloo IN mainloop %]
		57	<h2>Catalog statistics</h2>
57	[% IF ( mainloo.loopfilter ) %]	58	[% IF ( mainloo.loopfilter ) %]
58	<p>Filtered on:</p>	59	<p>Filtered on:</p>
59	[% FOREACH loopfilte IN mainloo.loopfilter %]	60	[% FOREACH loopfilte IN mainloo.loopfilter %]
Lines 106-112 Link Here
106		107
107	<form method="post" action="/cgi-bin/koha/reports/catalogue_stats.pl">	108	<form method="post" action="/cgi-bin/koha/reports/catalogue_stats.pl">
108	<fieldset class="rows">	109	<fieldset class="rows">
109	<legend>Catalog statistics</legend>	110	<h3>Catalog statistics</h3>
110	<table>	111	<table>
111	<thead>	112	<thead>
112	<tr>	113	<tr>
Lines 284-290 Link Here
284	</table><br /></fieldset>	285	</table><br /></fieldset>
285		286
286	<fieldset class="rows">	287	<fieldset class="rows">
287	<legend>Cell value</legend>	288	<h3>Cell value</h3>
288	<ol>	289	<ol>
289	<li>	290	<li>
290	<label for="cellvalue_items">Count total items</label>	291	<label for="cellvalue_items">Count total items</label>
Lines 302-308 Link Here
302	</fieldset>	303	</fieldset>
303		304
304	<fieldset class="rows">	305	<fieldset class="rows">
305	<legend>Output</legend>	306	<h3>Output</h3>
306	<ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /></li>	307	<ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /></li>
307	<li><label for="outputfile">To a file: </label><input type="radio" name="output" value="file" id="outputfile" />	308	<li><label for="outputfile">To a file: </label><input type="radio" name="output" value="file" id="outputfile" />
308	<label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" />	309	<label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" />
Lines 327-333 Link Here
327	</fieldset>	328	</fieldset>
328		329
329	<fieldset class="action">	330	<fieldset class="action">
330	<input type="submit" value="Submit" />	331	<input type="submit" class="principal" value="Submit" />
331	<input type="hidden" name="report_name" value="[% report_name \| html %]" />	332	<input type="hidden" name="report_name" value="[% report_name \| html %]" />
332	<input type="hidden" name="do_it" value="1" />	333	<input type="hidden" name="do_it" value="1" />
333	</fieldset>	334	</fieldset>

Lines 57-62 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt (-4 / +5 lines)
57	<h1>Circulation statistics</h1>	57	<h1>Circulation statistics</h1>
58	[% IF ( do_it ) %]	58	[% IF ( do_it ) %]
59	[% FOREACH mainloo IN mainloop %]	59	[% FOREACH mainloo IN mainloop %]
		60	<h2>Circulation statistics</h2>
60	[% IF ( mainloo.loopfilter ) %]	61	[% IF ( mainloo.loopfilter ) %]
61	<p>Filtered on:</p>	62	<p>Filtered on:</p>
62	<ul>	63	<ul>
Lines 121-127 Link Here
121		122
122	<form method="post" action="/cgi-bin/koha/reports/issues_stats.pl">	123	<form method="post" action="/cgi-bin/koha/reports/issues_stats.pl">
123	<fieldset class="rows">	124	<fieldset class="rows">
124	<legend>Circulation statistics</legend><table>	125	<h3>Circulation statistics</h3><table>
125	<thead>	126	<thead>
126	<tr>	127	<tr>
127	<th>Title</th>	128	<th>Title</th>
Lines 349-355 Link Here
349	</table><br /></fieldset>	350	</table><br /></fieldset>
350		351
351	<fieldset class="rows">	352	<fieldset class="rows">
352	<legend>Cell value</legend>	353	<h3>Cell value</h3>
353	<ol>	354	<ol>
354	<li>	355	<li>
355	<label for="cellvalue1">Count total items:</label>	356	<label for="cellvalue1">Count total items:</label>
Lines 367-373 Link Here
367	</fieldset>	368	</fieldset>
368		369
369	<fieldset class="rows">	370	<fieldset class="rows">
370	<legend>Output</legend>	371	<h3>Output</h3>
371	<ol>	372	<ol>
372	<li>	373	<li>
373	<label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" />	374	<label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" />
Lines 395-401 Link Here
395	</fieldset>	396	</fieldset>
396		397
397	<fieldset class="action">	398	<fieldset class="action">
398	<input type="submit" value="Submit" />	399	<input type="submit" class="principal" value="Submit" />
399	<input type="hidden" name="report_name" value="[% report_name \| html %]" />	400	<input type="hidden" name="report_name" value="[% report_name \| html %]" />
400	<input type="hidden" name="do_it" value="1" />	401	<input type="hidden" name="do_it" value="1" />
401	</fieldset>	402	</fieldset>

Lines 58-63 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt (-4 / +5 lines)
58	<h1>Holds statistics</h1>	58	<h1>Holds statistics</h1>
59	[% IF ( do_it ) %]	59	[% IF ( do_it ) %]
60	[% IF ( mainloop ) %]	60	[% IF ( mainloop ) %]
		61	<h2>Holds statistics</h2>
61	[% IF ( loopfilter ) %]	62	[% IF ( loopfilter ) %]
62	<p>Filtered on:</p>	63	<p>Filtered on:</p>
63	<ul>	64	<ul>
Lines 107-113 Link Here
107		108
108	<form method="post" action="/cgi-bin/koha/reports/reserves_stats.pl">	109	<form method="post" action="/cgi-bin/koha/reports/reserves_stats.pl">
109	<fieldset class="rows">	110	<fieldset class="rows">
110	<legend>Holds statistics</legend><table>	111	<h3>Holds statistics</h3><table>
111	<thead>	112	<thead>
112	<tr>	113	<tr>
113	<th>Title</th>	114	<th>Title</th>
Lines 302-312 Link Here
302	</tbody>	303	</tbody>
303	</table><br /></fieldset>	304	</table><br /></fieldset>
304		305
305	<fieldset class="rows"><legend>Cell value </legend><ol><li><label for="cellvalue1">Count holds:</label> <input type="radio" name="Cellvalue" value="1" id="cellvalue1" checked="checked" /> </li>	306	<fieldset class="rows"><h3>Cell value </h3><ol><li><label for="cellvalue1">Count holds:</label> <input type="radio" name="Cellvalue" value="1" id="cellvalue1" checked="checked" /> </li>
306	<li><label for="cellvalue2">Count unique borrowers:</label> <input type="radio" name="Cellvalue" value="2" id="cellvalue2" /> </li><li><label for="cellvalue3">Count unique items:</label> <input type="radio" name="Cellvalue" id="cellvalue3" value="3" /> </li><li><label for="cellvalue4">Count unique bibliographic records:</label> <input type="radio" name="Cellvalue" id="cellvalue4" value="4" /> </li></ol></fieldset>	307	<li><label for="cellvalue2">Count unique borrowers:</label> <input type="radio" name="Cellvalue" value="2" id="cellvalue2" /> </li><li><label for="cellvalue3">Count unique items:</label> <input type="radio" name="Cellvalue" id="cellvalue3" value="3" /> </li><li><label for="cellvalue4">Count unique bibliographic records:</label> <input type="radio" name="Cellvalue" id="cellvalue4" value="4" /> </li></ol></fieldset>
307		308
308	<fieldset class="rows">	309	<fieldset class="rows">
309	<legend>Output</legend>	310	<h3>Output</h3>
310	<ol>	311	<ol>
311	<li>	312	<li>
312	<label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" />	313	<label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" />
Lines 334-340 Link Here
334	</fieldset>	335	</fieldset>
335		336
336	<fieldset class="action">	337	<fieldset class="action">
337	<input type="submit" value="Submit" />	338	<input type="submit" class="principal" value="Submit" />
338	<input type="hidden" name="report_name" value="[% report_name \| html %]" />	339	<input type="hidden" name="report_name" value="[% report_name \| html %]" />
339	<input type="hidden" name="do_it" value="1" />	340	<input type="hidden" name="do_it" value="1" />
340	</fieldset>	341	</fieldset>