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

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

Return to bug 39043