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 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;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt (-64 / +84 lines)
Lines 59-88 Link Here
59
59
60
[% INCLUDE 'doc-head-close.inc' %]
60
[% INCLUDE 'doc-head-close.inc' %]
61
[% Asset.css("lib/codemirror/codemirror.min.css") | $raw %]
61
[% Asset.css("lib/codemirror/codemirror.min.css") | $raw %]
62
<style>
62
[% FILTER collapse %]
63
    .CodeMirror {
63
    <style>
64
        resize:  vertical;
64
        .CodeMirror {
65
    }
65
            resize: vertical;
66
    .cm-sqlParams {
66
        }
67
        color: #11917B;
67
        .cm-sqlParams {
68
    }
68
            color: #11917b;
69
    .cm-columnPlaceholder {
69
        }
70
        color: #BF2D5D;
70
        .cm-columnPlaceholder {
71
    }
71
            color: #bf2d5d;
72
    #mana_search_errortext {
72
        }
73
        font-family: monospace; font-weight: bold;
73
        #mana_search_errortext {
74
    }
74
            font-family: monospace;
75
    .data-plain {
75
            font-weight: bold;
76
        display: none;
76
        }
77
    }
77
        .data-plain {
78
    div.radio label {
78
            display: none;
79
        font-weight: bold;
79
        }
80
        margin: 0;
80
        div.radio label {
81
    }
81
            font-weight: bold;
82
    #tabs .tab-pane {
82
            margin: 0;
83
        display: block;
83
        }
84
    }
84
        #tabs .tab-pane {
85
</style>
85
            display: block;
86
        }
87
88
        #column_selection {
89
            display: flex;
90
            flex-direction: row;
91
            flex-wrap: nowrap;
92
        }
93
94
        #column_options {
95
            flex-shrink: 1;
96
        }
97
98
        #column_controls {
99
            flex-shrink: 1;
100
            display: flex;
101
            flex-direction: column;
102
            justify-content: center;
103
        }
104
105
        #selected_columns {
106
            flex-grow: 1;
107
        }
108
    </style>
109
[% END %]
86
[% Asset.css("css/reports.css") | $raw %]
110
[% Asset.css("css/reports.css") | $raw %]
87
[% Asset.css("lib/d3c3/c3.min.css") | $raw %]
111
[% Asset.css("lib/d3c3/c3.min.css") | $raw %]
88
</head>
112
</head>
Lines 497-503 Link Here
497
                        </fieldset> <!-- /.rows -->
521
                        </fieldset> <!-- /.rows -->
498
                        <fieldset class="action">
522
                        <fieldset class="action">
499
                            <input type="hidden" name="op" value="cud-report" />
523
                            <input type="hidden" name="op" value="cud-report" />
500
                            <button type="submit" class="btn btn-primary">Next &gt;&gt;</button>
524
                            <button type="submit" class="btn btn-primary">Next  <i class="fa fa-arrow-right" aria-hidden="true"></i></button>
501
                        </fieldset>
525
                        </fieldset>
502
                    </form>
526
                    </form>
503
                [% END # /build1 %]
527
                [% END # /build1 %]
Lines 525-532 Link Here
525
549
526
                        <fieldset class="action">
550
                        <fieldset class="action">
527
                            <input type="hidden" name="op" value="cud-choose_type" />
551
                            <input type="hidden" name="op" value="cud-choose_type" />
528
                            <button type="submit" class="btn btn-default goback" name="back">&lt;&lt; Back</button>
552
                            <button type="submit" class="btn btn-default goback" name="back"><i class="fa fa-arrow-left" aria-hidden="true"></i> Back</button>
529
                            <button type="submit" class="btn btn-primary">Next &gt;&gt;</button>
553
                            <button type="submit" class="btn btn-primary">Next <i class="fa fa-arrow-right" aria-hidden="true"></i></button>
530
                        </fieldset>
554
                        </fieldset>
531
                    </form>
555
                    </form>
532
                [% END # /IF (build2 ) %]
556
                [% END # /IF (build2 ) %]
Lines 543-588 Link Here
543
                        <input type="hidden" name="public" value="[% public | html %]" />
567
                        <input type="hidden" name="public" value="[% public | html %]" />
544
                        <input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" />
568
                        <input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" />
545
                        <fieldset>
569
                        <fieldset>
546
                            <div class="row">
570
                            <div id="column_selection">
547
                                <div class="col-sm-6">
571
                                <div id="column_options">
548
                                    <div style="float: left;">
572
                                    <select id="availableColumns" name="oldcolumns2" multiple="multiple" size="25" style="min-width: 200px;height:300px;">
549
                                        <select id="availableColumns" name="oldcolumns2" multiple="multiple" size="25" style="min-width: 200px;height:300px;">
573
                                        [% FOREACH column IN columns %]
550
                                            [% FOREACH column IN columns %]
574
                                            [% IF ( column.table ) %]
551
                                                [% IF ( column.table ) %]
575
                                                [% IF ( loop.first ) %]
552
                                                    [% IF ( loop.first ) %]
553
                                                    [% ELSE %]
554
                                                        </optgroup>
555
                                                    [% END %]
556
                                                    <optgroup label="[% column.table | html %]">
557
                                                [% ELSE %]
576
                                                [% ELSE %]
558
                                                    <option value="[% column.name | html %]">
577
                                                    </optgroup>
559
                                                        [% IF ( column.description ) %]
560
                                                            [% column.description | html %] &nbsp; / &nbsp; [% column.name | html %]
561
                                                        [% ELSE %]
562
                                                            [% column.name | html %]
563
                                                        [% END %]
564
                                                    </option>
565
                                                [% END %]
578
                                                [% END %]
579
                                                <optgroup label="[% column.table | html %]">
580
                                            [% ELSE %]
581
                                                <option value="[% column.name | html %]">
582
                                                    [% IF ( column.description ) %]
583
                                                        [% column.description | html %] &nbsp; / &nbsp; [% column.name | html %]
584
                                                    [% ELSE %]
585
                                                        [% column.name | html %]
586
                                                    [% END %]
587
                                                </option>
566
                                            [% END %]
588
                                            [% END %]
567
                                            </optgroup>
589
                                        [% END %]
568
                                        </select>
590
                                        </optgroup>
569
                                    </div>
570
                                    <div style="width: 6.3em; float: right; margin-top: 100px">
571
                                        <input type="button" name="Add" value="Add" class="button" style="width:6em;" id="addColumn" /><br />
572
                                        <input type="button" name="delete" value="&lt;&lt; Delete" class="button" style="width: 6em; margin: 1em 0;" id="delColumn" />
573
                                    </div>
574
                                </div> <!-- /.col-sm-6 -->
575
576
                                <div class="col-sm-6">
577
                                    <select id="selectedColumns" name="columns" multiple="multiple" size="25" style="width:200px; height:300px;">
578
                                    </select>
591
                                    </select>
579
                                </div>
592
                                </div>
580
                            </div> <!-- /.row -->
593
                                <div id="column_controls">
594
                                    <button type="button" class="btn btn-default m-3" id="addColumn">Add <i class="fa fa-arrow-right" aria-hidden="true"></i></button>
595
                                    <button type="button" class="btn btn-default m-3" id="delColumn"><i class="fa fa-arrow-left" aria-hidden="true"></i> Delete</button>
596
                                </div>
597
                                <div id="selected_columns">
598
                                    <select id="selectedColumns" name="columns" multiple="multiple" size="25" style="min-width:200px; height:300px;">
599
                                    </select>
600
                                </div>
601
                            </div>
581
                        </fieldset>
602
                        </fieldset>
582
                        <fieldset class="action">
603
                        <fieldset class="action">
583
                            <input type="hidden" name="op" value="cud-choose_columns" />
604
                            <input type="hidden" name="op" value="cud-choose_columns" />
584
                            <button type="submit" class="btn btn-default goback" name="back">&lt;&lt; Back</button>
605
                            <button type="submit" class="btn btn-default goback" name="back"> <i class="fa fa-arrow-left" aria-hidden="true"></i> Back</button>
585
                            <button type="submit" class="btn btn-primary">Next &gt;&gt;</button>
606
                            <button type="submit" class="btn btn-primary">Next  <i class="fa fa-arrow-right" aria-hidden="true"></i></button>
586
                        </fieldset>
607
                        </fieldset>
587
                    </form> <!-- /#column_submit -->
608
                    </form> <!-- /#column_submit -->
588
                [% END # /IF ( build3 ) %]
609
                [% END # /IF ( build3 ) %]
Lines 669-676 Link Here
669
690
670
                        <fieldset class="action">
691
                        <fieldset class="action">
671
                            <input type="hidden" name="op" value="cud-choose_criteria" />
692
                            <input type="hidden" name="op" value="cud-choose_criteria" />
672
                            <button type="submit" class="btn btn-default goback" name="back">&lt;&lt; Back</button>
693
                            <button type="submit" class="btn btn-default goback" name="back"> <i class="fa fa-arrow-left" aria-hidden="true"></i> Back</button>
673
                            <button type="submit" class="btn btn-primary">Next &gt;&gt;</button>
694
                            <button type="submit" class="btn btn-primary">Next  <i class="fa fa-arrow-right" aria-hidden="true"></i></button>
674
                        </fieldset>
695
                        </fieldset>
675
                    </form>
696
                    </form>
676
                [% END # /IF ( build4 ) %]
697
                [% END # /IF ( build4 ) %]
Lines 708-715 Link Here
708
                        </fieldset>
729
                        </fieldset>
709
730
710
                        <fieldset class="action"><input type="hidden" name="op" value="cud-choose_operations" />
731
                        <fieldset class="action"><input type="hidden" name="op" value="cud-choose_operations" />
711
                            <button type="submit" class="btn btn-default goback" name="back">&lt;&lt; Back</button>
732
                            <button type="submit" class="btn btn-default goback" name="back"> <i class="fa fa-arrow-left" aria-hidden="true"></i> Back</button>
712
                            <button type="submit" class="btn btn-primary">Next &gt;&gt;</button>
733
                            <button type="submit" class="btn btn-primary">Next  <i class="fa fa-arrow-right" aria-hidden="true"></i></button>
713
                        </fieldset>
734
                        </fieldset>
714
                    </form>
735
                    </form>
715
                [% END # /IF ( build5 ) %]
736
                [% END # /IF ( build5 ) %]
716
- 

Return to bug 39043