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

(-)a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss (-15 / +1 lines)
Lines 1420-1439 dd { Link Here
1420
    display: inline-block;
1420
    display: inline-block;
1421
}
1421
}
1422
1422
1423
#addColumn,
1424
#delColumn {
1425
    background-color: transparent;
1426
    border: none;
1427
    box-shadow: none;
1428
    color: $green-text-color;
1429
    font-size: 100%;
1430
    padding: .3em;
1431
1432
    &:hover {
1433
        text-decoration: underline;
1434
    }
1435
}
1436
1437
.patronviews {
1423
.patronviews {
1438
    border-right: 1px solid #000;
1424
    border-right: 1px solid #000;
1439
    border-top: 1px solid #000;
1425
    border-top: 1px solid #000;
Lines 4895-4898 div .suggestion_note { Link Here
4895
            display: block;
4881
            display: block;
4896
        }
4882
        }
4897
    }
4883
    }
4898
}
4884
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt (-64 / +81 lines)
Lines 74-104 Link Here
74
74
75
[% INCLUDE 'doc-head-close.inc' %]
75
[% INCLUDE 'doc-head-close.inc' %]
76
[% Asset.css("lib/codemirror/codemirror.min.css") | $raw %]
76
[% Asset.css("lib/codemirror/codemirror.min.css") | $raw %]
77
<style>
77
[% FILTER collapse %]
78
    .CodeMirror {
78
    <style>
79
        resize: vertical;
79
        .CodeMirror {
80
    }
80
            resize: vertical;
81
    .cm-sqlParams {
81
        }
82
        color: #11917b;
82
        .cm-sqlParams {
83
    }
83
            color: #11917b;
84
    .cm-columnPlaceholder {
84
        }
85
        color: #bf2d5d;
85
        .cm-columnPlaceholder {
86
    }
86
            color: #bf2d5d;
87
    #mana_search_errortext {
87
        }
88
        font-family: monospace;
88
        #mana_search_errortext {
89
        font-weight: bold;
89
            font-family: monospace;
90
    }
90
            font-weight: bold;
91
    .data-plain {
91
        }
92
        display: none;
92
        .data-plain {
93
    }
93
            display: none;
94
    div.radio label {
94
        }
95
        font-weight: bold;
95
        div.radio label {
96
        margin: 0;
96
            font-weight: bold;
97
    }
97
            margin: 0;
98
    #tabs .tab-pane {
98
        }
99
        display: block;
99
        #tabs .tab-pane {
100
    }
100
            display: block;
101
</style>
101
        }
102
103
        #column_selection {
104
            display: flex;
105
            flex-direction: row;
106
            flex-wrap: nowrap;
107
        }
108
109
        #column_options {
110
            flex-shrink: 1;
111
        }
112
113
        #column_controls {
114
            flex-shrink: 1;
115
            display: flex;
116
            flex-direction: column;
117
            justify-content: center;
118
        }
119
120
        #selected_columns {
121
            flex-grow: 1;
122
        }
123
    </style>
124
[% END %]
102
[% Asset.css("css/reports.css") | $raw %]
125
[% Asset.css("css/reports.css") | $raw %]
103
[% Asset.css("lib/d3c3/c3.min.css") | $raw %]
126
[% Asset.css("lib/d3c3/c3.min.css") | $raw %]
104
</head>
127
</head>
Lines 525-531 Link Here
525
                        <!-- /.rows -->
548
                        <!-- /.rows -->
526
                        <fieldset class="action">
549
                        <fieldset class="action">
527
                            <input type="hidden" name="op" value="cud-report" />
550
                            <input type="hidden" name="op" value="cud-report" />
528
                            <button type="submit" class="btn btn-primary">Next &gt;&gt;</button>
551
                            <button type="submit" class="btn btn-primary">Next <i class="fa fa-right-long" aria-hidden="true"></i></button>
529
                        </fieldset>
552
                        </fieldset>
530
                    </form>
553
                    </form>
531
                [% END # /build1 %]
554
                [% END # /build1 %]
Lines 553-560 Link Here
553
576
554
                        <fieldset class="action">
577
                        <fieldset class="action">
555
                            <input type="hidden" name="op" value="cud-choose_type" />
578
                            <input type="hidden" name="op" value="cud-choose_type" />
556
                            <button type="submit" class="btn btn-default goback" name="back">&lt;&lt; Back</button>
579
                            <button type="submit" class="btn btn-default goback" name="back"><i class="fa fa-left-long" aria-hidden="true"></i> Back</button>
557
                            <button type="submit" class="btn btn-primary">Next &gt;&gt;</button>
580
                            <button type="submit" class="btn btn-primary">Next <i class="fa fa-right-long" aria-hidden="true"></i></button>
558
                        </fieldset>
581
                        </fieldset>
559
                    </form>
582
                    </form>
560
                [% END # /IF (build2 ) %]
583
                [% END # /IF (build2 ) %]
Lines 571-613 Link Here
571
                        <input type="hidden" name="public" value="[% public | html %]" />
594
                        <input type="hidden" name="public" value="[% public | html %]" />
572
                        <input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" />
595
                        <input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" />
573
                        <fieldset>
596
                        <fieldset>
574
                            <div class="row">
597
                            <div id="column_selection">
575
                                <div class="col-sm-6">
598
                                <div id="column_options">
576
                                    <div style="float: left;">
599
                                    <select id="availableColumns" name="oldcolumns2" multiple="multiple" size="25" style="min-width: 200px;height:300px;">
577
                                        <select id="availableColumns" name="oldcolumns2" multiple="multiple" size="25" style="min-width:200px; height:300px;">
600
                                        [% FOREACH table IN columns.keys.sort %]
578
                                            [% FOREACH table IN columns.keys.sort %]
601
                                            <optgroup label="[% table | html %]">
579
                                                <optgroup label="[% table | html %]">
602
                                                [% FOREACH column IN columns.item(table) %]
580
                                                    [% FOREACH column IN columns.item(table) %]
603
                                                    <option value="[% column.name | html %]">
581
                                                        <option value="[% column.name | html %]">
604
                                                        [% IF ( column.description ) %]
582
                                                            [% IF ( column.description ) %]
605
                                                            [% column.description | html %]
583
                                                                [% column.description | html %]
606
                                                            &nbsp; / &nbsp; [% column.name | html %]
584
                                                                &nbsp; / &nbsp; [% column.name | html %]
607
                                                        [% ELSE %]
585
                                                            [% ELSE %]
608
                                                            [% column.name | html %]
586
                                                                [% column.name | html %]
609
                                                        [% END %]
587
                                                            [% END %]
610
                                                    </option>
588
                                                        </option>
611
                                                [% END %]
589
                                                    [% END %]
612
                                            </optgroup>
590
                                                </optgroup>
613
                                        [% END %]
591
                                            [% END %]
614
                                    </select>
592
                                        </select>
593
                                    </div>
594
                                    <div style="width: 6.3em; float: right; margin-top: 100px">
595
                                        <input type="button" name="Add" value="Add" class="button" style="width:6em;" id="addColumn" /><br />
596
                                        <input type="button" name="delete" value="&lt;&lt; Delete" class="button" style="width: 6em; margin: 1em 0;" id="delColumn" />
597
                                    </div>
598
                                </div>
615
                                </div>
599
                                <!-- /.col-sm-6 -->
616
                                <div id="column_controls">
600
617
                                    <button type="button" class="btn btn-default m-3" id="addColumn">Add <i class="fa fa-right-long" aria-hidden="true"></i></button>
601
                                <div class="col-sm-6">
618
                                    <button type="button" class="btn btn-default m-3" id="delColumn"><i class="fa fa-left-long" aria-hidden="true"></i> Delete</button>
602
                                    <select id="selectedColumns" name="columns" multiple="multiple" size="25" style="width:200px; height:300px;"> </select>
619
                                </div>
620
                                <div id="selected_columns">
621
                                    <select id="selectedColumns" name="columns" multiple="multiple" size="25" style="min-width:200px; height:300px;"> </select>
603
                                </div>
622
                                </div>
604
                            </div>
623
                            </div>
605
                            <!-- /.row -->
606
                        </fieldset>
624
                        </fieldset>
607
                        <fieldset class="action">
625
                        <fieldset class="action">
608
                            <input type="hidden" name="op" value="cud-choose_columns" />
626
                            <input type="hidden" name="op" value="cud-choose_columns" />
609
                            <button type="submit" class="btn btn-default goback" name="back">&lt;&lt; Back</button>
627
                            <button type="submit" class="btn btn-default goback" name="back"> <i class="fa fa-left-long" aria-hidden="true"></i> Back</button>
610
                            <button type="submit" class="btn btn-primary">Next &gt;&gt;</button>
628
                            <button type="submit" class="btn btn-primary">Next <i class="fa fa-right-long" aria-hidden="true"></i></button>
611
                        </fieldset>
629
                        </fieldset>
612
                    </form>
630
                    </form>
613
                    <!-- /#column_submit -->
631
                    <!-- /#column_submit -->
Lines 700-707 Link Here
700
718
701
                        <fieldset class="action">
719
                        <fieldset class="action">
702
                            <input type="hidden" name="op" value="cud-choose_criteria" />
720
                            <input type="hidden" name="op" value="cud-choose_criteria" />
703
                            <button type="submit" class="btn btn-default goback" name="back">&lt;&lt; Back</button>
721
                            <button type="submit" class="btn btn-default goback" name="back"> <i class="fa fa-left-long" aria-hidden="true"></i> Back</button>
704
                            <button type="submit" class="btn btn-primary">Next &gt;&gt;</button>
722
                            <button type="submit" class="btn btn-primary">Next <i class="fa fa-right-long" aria-hidden="true"></i></button>
705
                        </fieldset>
723
                        </fieldset>
706
                    </form>
724
                    </form>
707
                [% END # /IF ( build4 ) %]
725
                [% END # /IF ( build4 ) %]
Lines 740-747 Link Here
740
758
741
                        <fieldset class="action"
759
                        <fieldset class="action"
742
                            ><input type="hidden" name="op" value="cud-choose_operations" />
760
                            ><input type="hidden" name="op" value="cud-choose_operations" />
743
                            <button type="submit" class="btn btn-default goback" name="back">&lt;&lt; Back</button>
761
                            <button type="submit" class="btn btn-default goback" name="back"> <i class="fa fa-left-long" aria-hidden="true"></i> Back</button>
744
                            <button type="submit" class="btn btn-primary">Next &gt;&gt;</button>
762
                            <button type="submit" class="btn btn-primary">Next <i class="fa fa-right-long" aria-hidden="true"></i></button>
745
                        </fieldset>
763
                        </fieldset>
746
                    </form>
764
                    </form>
747
                [% END # /IF ( build5 ) %]
765
                [% END # /IF ( build5 ) %]
748
- 

Return to bug 39043