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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt (-12 / +14 lines)
Lines 14-24 Link Here
14
14
15
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Manual invoice</div>
15
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Manual invoice</div>
16
16
17
<div id="doc3" class="yui-t2">
17
<div class="main container-fluid">
18
   
18
    <div class="row">
19
   <div id="bd">
19
        <div class="col-sm-10 col-sm-push-2">
20
	<div id="yui-main">
20
            <main>
21
	<div class="yui-b">
21
22
[% INCLUDE 'members-toolbar.inc' %]
22
[% INCLUDE 'members-toolbar.inc' %]
23
23
24
<!-- The manual invoice and credit buttons -->
24
<!-- The manual invoice and credit buttons -->
Lines 65-82 Link Here
65
[% END %]
65
[% END %]
66
</div></div>
66
</div></div>
67
67
68
</div>
68
            </main>
69
</div>
69
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
70
70
71
<div class="yui-b">
71
        <div class="col-sm-2 col-sm-pull-10">
72
[% INCLUDE 'circ-menu.inc' %]
72
            <aside>
73
</div>
73
                [% INCLUDE 'circ-menu.inc' %]
74
</div>
74
            </aside>
75
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
76
     </div> <!-- /.row -->
75
77
76
[% MACRO jsinclude BLOCK %]
78
[% MACRO jsinclude BLOCK %]
77
    [% INCLUDE 'str/members-menu.inc' %]
79
    [% INCLUDE 'str/members-menu.inc' %]
78
    [% Asset.js("js/members-menu.js") | $raw %]
80
    [% Asset.js("js/members-menu.js") | $raw %]
79
    <script type="text/javascript">
81
    <script>
80
        var type_fees = {'L':'','F':'','A':'','N':'','M':''};
82
        var type_fees = {'L':'','F':'','A':'','N':'','M':''};
81
        [% FOREACH invoice_types_loo IN invoice_types_loop %]
83
        [% FOREACH invoice_types_loo IN invoice_types_loop %]
82
            type_fees['[% invoice_types_loo.authorised_value | html %]'] = "[% invoice_types_loo.lib | html %]";
84
            type_fees['[% invoice_types_loo.authorised_value | html %]'] = "[% invoice_types_loo.lib | html %]";
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt (-12 / +15 lines)
Lines 15-25 Link Here
15
15
16
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Set permissions for [% patron.surname | html %], [% patron.firstname | html %]</div>
16
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Set permissions for [% patron.surname | html %], [% patron.firstname | html %]</div>
17
17
18
<div id="doc3" class="yui-t2">
18
<div class="main container-fluid">
19
   
19
    <div class="row">
20
   <div id="bd">
20
        <div class="col-sm-10 col-sm-push-2">
21
	<div id="yui-main">
21
            <main>
22
	<div class="yui-b">
22
23
[% INCLUDE 'members-toolbar.inc' %]
23
[% INCLUDE 'members-toolbar.inc' %]
24
24
25
<form method="post" action="/cgi-bin/koha/members/member-flags.pl">
25
<form method="post" action="/cgi-bin/koha/members/member-flags.pl">
Lines 78-97 Link Here
78
<fieldset class="action"><input type="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">Cancel</a></fieldset>
78
<fieldset class="action"><input type="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">Cancel</a></fieldset>
79
79
80
</form>
80
</form>
81
</div>
82
</div>
83
81
84
<div class="yui-b">
82
            </main>
85
[% INCLUDE 'circ-menu.inc' %]
83
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
86
</div>
84
87
</div>
85
        <div class="col-sm-2 col-sm-pull-10">
86
            <aside>
87
                [% INCLUDE 'circ-menu.inc' %]
88
            </aside>
89
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
90
    </div> <!-- /.row -->
88
91
89
[% MACRO jsinclude BLOCK %]
92
[% MACRO jsinclude BLOCK %]
90
    [% INCLUDE 'str/members-menu.inc' %]
93
    [% INCLUDE 'str/members-menu.inc' %]
91
    [% Asset.js("js/members-menu.js") | $raw %]
94
    [% Asset.js("js/members-menu.js") | $raw %]
92
    [% Asset.js("lib/jquery/plugins/jquery.treeview.pack.js") | $raw %]
95
    [% Asset.js("lib/jquery/plugins/jquery.treeview.pack.js") | $raw %]
93
    <!-- set up tree -->
96
    <!-- set up tree -->
94
    <script type="text/javascript">
97
    <script>
95
        $(document).ready(function() {
98
        $(document).ready(function() {
96
            $("#permissionstree").treeview({animated: "fast", collapsed: true});
99
            $("#permissionstree").treeview({animated: "fast", collapsed: true});
97
100
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt (-13 / +16 lines)
Lines 14-24 Link Here
14
14
15
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">[% patron.firstname | html %] [% patron.surname | html %]</a> &rsaquo; [% IF ( newpassword ) %]Password Updated[% ELSE %]Change username and/or password[% END %]</div>
15
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">[% patron.firstname | html %] [% patron.surname | html %]</a> &rsaquo; [% IF ( newpassword ) %]Password Updated[% ELSE %]Change username and/or password[% END %]</div>
16
16
17
<div id="doc3" class="yui-t2">
17
<div class="main container-fluid">
18
    <div class="row">
19
        <div class="col-sm-10 col-sm-push-2">
20
            <main>
18
21
19
   <div id="bd">
20
	<div id="yui-main">
21
	<div class="yui-b">
22
[% INCLUDE 'members-toolbar.inc' %]
22
[% INCLUDE 'members-toolbar.inc' %]
23
23
24
[% IF ( newpassword ) %]
24
[% IF ( newpassword ) %]
Lines 83-101 Link Here
83
    </fieldset>
83
    </fieldset>
84
</form>[% END %]
84
</form>[% END %]
85
85
86
</div>
86
87
</div>
88
<div class="loading hide"><strong>Processing...</strong><img src="[% interface | html %]/[% theme | html %]/img/loading.gif" alt="" /></div>
87
<div class="loading hide"><strong>Processing...</strong><img src="[% interface | html %]/[% theme | html %]/img/loading.gif" alt="" /></div>
89
<div class="yui-b">
88
90
[% INCLUDE 'circ-menu.inc' %]
89
            </main>
91
</div>
90
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
92
</div>
91
92
        <div class="col-sm-2 col-sm-pull-10">
93
            <aside>
94
                [% INCLUDE 'circ-menu.inc' %]
95
            </aside>
96
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
97
    </div> <!-- /.row -->
93
98
94
[% MACRO jsinclude BLOCK %]
99
[% MACRO jsinclude BLOCK %]
95
    [% INCLUDE 'str/members-menu.inc' %]
96
    [% Asset.js("js/members-menu.js") | $raw %]
100
    [% Asset.js("js/members-menu.js") | $raw %]
97
    <script type="text/JavaScript">
101
    <script>
98
99
        function generate_password() {
102
        function generate_password() {
100
            // Always generate a strong password
103
            // Always generate a strong password
101
            var chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
104
            var chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt (-118 / +121 lines)
Lines 17-27 Link Here
17
17
18
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; [% IF ( searching ) %]<a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Search results[% ELSE %]Patrons[% END %]</div>
18
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; [% IF ( searching ) %]<a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Search results[% ELSE %]Patrons[% END %]</div>
19
19
20
<div id="doc3" class="yui-t2">
20
<div class="main container-fluid">
21
  <div id="bd">
21
    <div class="row">
22
    <div id="yui-main">
22
        <div class="col-sm-10 col-sm-push-2">
23
      <div class="yui-b">
23
            <main>
24
        <div class="yui-g">
24
25
          [% IF CAN_user_tools_manage_patron_lists %]
25
          [% IF CAN_user_tools_manage_patron_lists %]
26
            <div id="patron_list_dialog" class="dialog alert">
26
            <div id="patron_list_dialog" class="dialog alert">
27
              Added <span class="patrons-length"></span> patrons to <a></a>.
27
              Added <span class="patrons-length"></span> patrons to <a></a>.
Lines 110-236 Link Here
110
              <tbody></tbody>
110
              <tbody></tbody>
111
            </table>
111
            </table>
112
          </div>
112
          </div>
113
        </div>
113
114
      </div>
114
            </main>
115
    </div>
115
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
116
    <div class="yui-b">
116
117
      <form method="get" id="searchform">
117
        <div class="col-sm-2 col-sm-pull-10">
118
        <input type="hidden" id="firstletter_filter" value="" />
118
            <aside>
119
        <fieldset class="brief">
119
                <form method="get" id="searchform">
120
          <h3>Filters</h3>
120
                  <input type="hidden" id="firstletter_filter" value="" />
121
          <ol>
121
                  <fieldset class="brief">
122
            <li>
122
                    <h3>Filters</h3>
123
              <label for="searchmember_filter">Search:</label>
123
                    <ol>
124
              <input type="text" id="searchmember_filter" value="[% searchmember | html %]"/>
124
                      <li>
125
            </li>
125
                        <label for="searchmember_filter">Search:</label>
126
            <li>
126
                        <input type="text" id="searchmember_filter" value="[% searchmember | html %]"/>
127
              <label for="searchfieldstype_filter">Search fields:</label>
127
                      </li>
128
              <select name="searchfieldstype" id="searchfieldstype_filter">
128
                      <li>
129
                [% IF searchfieldstype == "standard" %]
129
                        <label for="searchfieldstype_filter">Search fields:</label>
130
                  <option selected="selected" value='standard'>Standard</option>
130
                        <select name="searchfieldstype" id="searchfieldstype_filter">
131
                [% ELSE %]
131
                          [% IF searchfieldstype == "standard" %]
132
                  <option value='standard'>Standard</option>
132
                            <option selected="selected" value='standard'>Standard</option>
133
                [% END %]
133
                          [% ELSE %]
134
                [% IF searchfieldstype == "surname" %]
134
                            <option value='standard'>Standard</option>
135
                  <option selected="selected" value='surname'>Surname</option>
135
                          [% END %]
136
                [% ELSE %]
136
                          [% IF searchfieldstype == "surname" %]
137
                  <option value='surname'>Surname</option>
137
                            <option selected="selected" value='surname'>Surname</option>
138
                [% END %]
138
                          [% ELSE %]
139
                [% IF searchfieldstype == "email" %]
139
                            <option value='surname'>Surname</option>
140
                  <option selected="selected" value='email'>Email</option>
140
                          [% END %]
141
                [% ELSE %]
141
                          [% IF searchfieldstype == "email" %]
142
                  <option value='email'>Email</option>
142
                            <option selected="selected" value='email'>Email</option>
143
                [% END %]
143
                          [% ELSE %]
144
                [% IF searchfieldstype == "borrowernumber" %]
144
                            <option value='email'>Email</option>
145
                  <option selected="selected" value='borrowernumber'>Borrower number</option>
145
                          [% END %]
146
                [% ELSE %]
146
                          [% IF searchfieldstype == "borrowernumber" %]
147
                  <option value='borrowernumber'>Borrower number</option>
147
                            <option selected="selected" value='borrowernumber'>Borrower number</option>
148
                [% END %]
148
                          [% ELSE %]
149
                [% IF searchfieldstype == "userid" %]
149
                            <option value='borrowernumber'>Borrower number</option>
150
                  <option selected="selected" value='userid'>Username</option>
150
                          [% END %]
151
                [% ELSE %]
151
                          [% IF searchfieldstype == "userid" %]
152
                  <option value='userid'>Username</option>
152
                            <option selected="selected" value='userid'>Username</option>
153
                [% END %]
153
                          [% ELSE %]
154
                [% IF searchfieldstype == "phone" %]
154
                            <option value='userid'>Username</option>
155
                  <option selected="selected" value='phone'>Phone number</option>
155
                          [% END %]
156
                [% ELSE %]
156
                          [% IF searchfieldstype == "phone" %]
157
                  <option value='phone'>Phone number</option>
157
                            <option selected="selected" value='phone'>Phone number</option>
158
                [% END %]
158
                          [% ELSE %]
159
                [% IF searchfieldstype == "address" %]
159
                            <option value='phone'>Phone number</option>
160
                  <option selected="selected" value='address'>Street address</option>
160
                          [% END %]
161
                [% ELSE %]
161
                          [% IF searchfieldstype == "address" %]
162
                  <option value='address'>Street address</option>
162
                            <option selected="selected" value='address'>Street address</option>
163
                [% END %]
163
                          [% ELSE %]
164
                [% IF searchfieldstype == "dateofbirth" %]
164
                            <option value='address'>Street address</option>
165
                  <option selected="selected" value='dateofbirth'>Date of birth</option>
165
                          [% END %]
166
                [% ELSE %]
166
                          [% IF searchfieldstype == "dateofbirth" %]
167
                  <option value='dateofbirth'>Date of birth</option>
167
                            <option selected="selected" value='dateofbirth'>Date of birth</option>
168
                [% END %]
168
                          [% ELSE %]
169
                [% IF searchfieldstype == "sort1" %]
169
                            <option value='dateofbirth'>Date of birth</option>
170
                  <option selected="selected" value='sort1'>Sort field 1</option>
170
                          [% END %]
171
                [% ELSE %]
171
                          [% IF searchfieldstype == "sort1" %]
172
                  <option value='sort1'>Sort field 1</option>
172
                            <option selected="selected" value='sort1'>Sort field 1</option>
173
                [% END %]
173
                          [% ELSE %]
174
                [% IF searchfieldstype == "sort2" %]
174
                            <option value='sort1'>Sort field 1</option>
175
                  <option selected="selected" value='sort2'>Sort field 2</option>
175
                          [% END %]
176
                [% ELSE %]
176
                          [% IF searchfieldstype == "sort2" %]
177
                  <option value='sort2'>Sort field 2</option>
177
                            <option selected="selected" value='sort2'>Sort field 2</option>
178
                [% END %]
178
                          [% ELSE %]
179
              </select>
179
                            <option value='sort2'>Sort field 2</option>
180
            </li>
180
                          [% END %]
181
            <li>
181
                        </select>
182
              <label for="searchtype_filter">Search type:</label>
182
                      </li>
183
              <select name="searchtype" id="searchtype_filter">
183
                      <li>
184
                [% IF searchtype == "start_with" %]
184
                        <label for="searchtype_filter">Search type:</label>
185
                  <option value='start_with' selected="selected">Starts with</option>
185
                        <select name="searchtype" id="searchtype_filter">
186
                  <option value="contain">Contains</option>
186
                          [% IF searchtype == "start_with" %]
187
                [% ELSE %]
187
                            <option value='start_with' selected="selected">Starts with</option>
188
                  <option value='start_with'>Starts with</option>
188
                            <option value="contain">Contains</option>
189
                  <option value="contain" selected="selected">Contains</option>
189
                          [% ELSE %]
190
                [% END %]
190
                            <option value='start_with'>Starts with</option>
191
              </select>
191
                            <option value="contain" selected="selected">Contains</option>
192
            </li>
192
                          [% END %]
193
            <li>
193
                        </select>
194
              <label for="categorycode_filter">Category:</label>
194
                      </li>
195
              [% SET categories = Categories.all() %]
195
                      <li>
196
              <select id="categorycode_filter">
196
                        <label for="categorycode_filter">Category:</label>
197
                <option value="">Any</option>
197
                        [% SET categories = Categories.all() %]
198
                [% FOREACH cat IN categories %]
198
                        <select id="categorycode_filter">
199
                  [% IF cat.categorycode == categorycode_filter %]
199
                          <option value="">Any</option>
200
                          [% FOREACH cat IN categories %]
201
                            [% IF cat.categorycode == categorycode_filter %]
200
                    <option selected="selected" value="[% cat.categorycode | html %]">[% cat.description | html %]</option>
202
                    <option selected="selected" value="[% cat.categorycode | html %]">[% cat.description | html %]</option>
201
                  [% ELSE %]
203
                            [% ELSE %]
202
                    <option value="[% cat.categorycode | html %]">[% cat.description | html %]</option>
204
                    <option value="[% cat.categorycode | html %]">[% cat.description | html %]</option>
203
                  [% END %]
205
204
                [% END %]
206
                            [% END %]
205
              </select>
207
                          [% END %]
206
            </li>
208
                        </select>
207
            <li>
209
                      </li>
208
              <label for="branchcode_filter">Library:</label>
210
                      <li>
209
              [% SET branches = Branches.all( selected => branchcode_filter, only_from_group => 1 ) %]
211
                        <label for="branchcode_filter">Library:</label>
210
              <select id="branchcode_filter">
212
                        [% SET branches = Branches.all( selected => branchcode_filter, only_from_group => 1 ) %]
211
                [% IF branches.size != 1 %]
213
                        <select id="branchcode_filter">
212
                  <option value="">Any</option>
214
                          [% IF branches.size != 1 %]
213
                [% END %]
215
                            <option value="">Any</option>
214
                [% PROCESS options_for_libraries libraries => branches %]
216
                          [% END %]
215
              </select>
217
                          [% PROCESS options_for_libraries libraries => branches %]
216
            </li>
218
                        </select>
217
          </ol>
219
                      </li>
218
          <fieldset class="action">
220
                    </ol>
219
            <input type="submit" value="Search" />
221
                    <fieldset class="action">
220
            <input type="button" value="Clear" id="clear_search" />
222
                      <input type="submit" value="Search" />
221
          </fieldset>
223
                      <input type="button" value="Clear" id="clear_search" />
222
        </fieldset>
224
                    </fieldset>
223
      </form>
225
                  </fieldset>
224
    </div>
226
                </form>
225
  </div>
227
            </aside>
226
</div>
228
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
229
    </div> <!-- /.row -->
227
230
228
[% MACRO jsinclude BLOCK %]
231
[% MACRO jsinclude BLOCK %]
229
    [% INCLUDE 'datatables.inc' %]
232
    [% INCLUDE 'datatables.inc' %]
230
    [% INCLUDE 'columns_settings.inc' %]
233
    [% INCLUDE 'columns_settings.inc' %]
231
    [% INCLUDE 'str/members-menu.inc' %]
234
    [% INCLUDE 'str/members-menu.inc' %]
232
    [% Asset.js("js/members-menu.js") | $raw %]
235
    [% Asset.js("js/members-menu.js") | $raw %]
233
    <script type="text/javascript">
236
    <script>
234
        $(document).ready(function() {
237
        $(document).ready(function() {
235
            $('#merge-patrons').prop('disabled', true);
238
            $('#merge-patrons').prop('disabled', true);
236
            $('#memberresultst').on('change', 'input.selection', function() {
239
            $('#memberresultst').on('change', 'input.selection', function() {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-17 / +25 lines)
Lines 30-41 Link Here
30
<strong>[% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] patron ([%IF ( categoryname ) %][% categoryname | html %][% ELSE %][% IF ( I ) %]Organization[% END %][% IF ( A ) %]Adult[% END %][% IF ( C ) %]Child[% END %][% IF ( P ) %]Professional[% END %][% IF ( S ) %]Staff[% END %][% END %])</strong>
30
<strong>[% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] patron ([%IF ( categoryname ) %][% categoryname | html %][% ELSE %][% IF ( I ) %]Organization[% END %][% IF ( A ) %]Adult[% END %][% IF ( C ) %]Child[% END %][% IF ( P ) %]Professional[% END %][% IF ( S ) %]Staff[% END %][% END %])</strong>
31
    [% END %]
31
    [% END %]
32
</div>
32
</div>
33
[% IF ( opadd ) %]<div id="doc" class="yui-t7">[% ELSE %]<div id="doc3" class="yui-t2">[% END %]
34
33
35
   <div id="bd">
34
<div class="main container-fluid">
36
	<div id="yui-main">
35
    <div class="row">
37
	<div class="yui-b">
36
        [% IF ( opadd ) %]
38
    [% INCLUDE 'blocking_errors.inc' %]
37
            <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
38
        [% ELSE %]
39
            <div class="col-sm-10 col-sm-push-2">
40
        [% END %]
41
            <main>
42
                [% INCLUDE 'blocking_errors.inc' %]
43
39
    [% IF error_alert %]
44
    [% IF error_alert %]
40
        [% IF ( error_alert == "no_email" ) %]
45
        [% IF ( error_alert == "no_email" ) %]
41
            <div class="dialog alert">This member has no email</div>
46
            <div class="dialog alert">This member has no email</div>
Lines 1087-1093 Link Here
1087
    <!-- handle changing prefs if creating new patron and changing
1092
    <!-- handle changing prefs if creating new patron and changing
1088
         the patron category
1093
         the patron category
1089
    -->
1094
    -->
1090
    <script type="text/javascript">//<![CDATA[
1095
    <script>
1091
       $(document).ready(function(){
1096
       $(document).ready(function(){
1092
            var message_prefs_dirty = false;
1097
            var message_prefs_dirty = false;
1093
            $('#memberentry_messaging_prefs > *').change(function() {
1098
            $('#memberentry_messaging_prefs > *').change(function() {
Lines 1126-1132 Link Here
1126
                );
1131
                );
1127
            });
1132
            });
1128
        });
1133
        });
1129
    //]]>
1130
    </script>
1134
    </script>
1131
    [% END %]
1135
    [% END %]
1132
    <input type="hidden" name="setting_messaging_prefs" value="1" />
1136
    <input type="hidden" name="setting_messaging_prefs" value="1" />
Lines 1164-1184 Link Here
1164
        </fieldset>
1168
        </fieldset>
1165
    </form>
1169
    </form>
1166
[% END %]
1170
[% END %]
1167
</div>
1168
</div>
1169
1171
1170
[% UNLESS ( opadd ) %]<div class="yui-b">
1171
[% INCLUDE 'circ-menu.inc' %]
1172
</div>[% END %]
1173
[% END %]
1172
[% END %]
1174
</div>
1173
            </main>
1174
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
1175
1176
        [% UNLESS ( opadd ) %]
1177
            <div class="col-sm-2 col-sm-pull-10">
1178
                <aside>
1179
                    [% INCLUDE 'circ-menu.inc' %]
1180
                </aside>
1181
            </div> <!-- /.col-sm-2.col-sm-pull-10 -->
1182
        [% END %]
1183
     </div> <!-- /.row -->
1175
1184
1176
[% MACRO jsinclude BLOCK %]
1185
[% MACRO jsinclude BLOCK %]
1177
    [% Asset.js("lib/jquery/plugins/jquery.fixFloat.js") | $raw %]
1186
    [% Asset.js("lib/jquery/plugins/jquery.fixFloat.js") | $raw %]
1178
    [% INCLUDE 'calendar.inc' %]
1187
    [% INCLUDE 'calendar.inc' %]
1179
    [% INCLUDE 'str/members-menu.inc' %]
1188
    [% INCLUDE 'str/members-menu.inc' %]
1180
    [% Asset.js("js/members-menu.js") | $raw %]
1189
    [% Asset.js("js/members-menu.js") | $raw %]
1181
    <script type="text/javascript">
1190
    <script>
1182
        $(document).ready(function() {
1191
        $(document).ready(function() {
1183
1192
1184
                $("#saverecord").css({ 'margin-left': 0 });
1193
                $("#saverecord").css({ 'margin-left': 0 });
Lines 1336-1343 Link Here
1336
    </script>
1345
    </script>
1337
    [% Asset.js("js/members.js") | $raw %]
1346
    [% Asset.js("js/members.js") | $raw %]
1338
    [% Asset.js("js/messaging-preference-form.js") | $raw %]
1347
    [% Asset.js("js/messaging-preference-form.js") | $raw %]
1348
    [% PROCESS 'password_check.inc' %]
1349
    [% PROCESS 'add_password_check' new_password => 'password' %]
1339
[% END %]
1350
[% END %]
1340
1351
1341
[% INCLUDE 'intranet-bottom.inc' %]
1352
[% INCLUDE 'intranet-bottom.inc' %]
1342
[% PROCESS 'password_check.inc' %]
1343
[% PROCESS 'add_password_check' new_password => 'password' %]
1344
- 

Return to bug 21964