Project

General

Profile

« Previous | Next » 

Revision 1933

Added by darkviper over 11 years ago

modified layout of admin/groups for better usability

View differences:

branches/2.8.x/CHANGELOG
11 11
! = Update/Change
12 12
===============================================================================
13 13

  
14
16 Jul-2013 Build 1933 Werner v.d.Decken(DarkViper)
15
! modified layout of admin/groups for better usability
14 16
13 Jul-2013 Build 1932 Werner v.d.Decken(DarkViper)
15 17
! modified class Password for use with different hashing classes
16 18
09 Jul-2013 Build 1931 Werner v.d.Decken(DarkViper)
branches/2.8.x/wb/admin/groups/groups_mask.inc.php
182 182
//		$tpl->parse('hidden_permission_list', '');
183 183
// Check and set system permissions boxes in main_block
184 184

  
185
		if ( true == (isset( $_POST['advanced_action']) && (( $_POST['advanced_action'] == 'no') || strpos( $_POST['advanced_action'], ">>") > 0 ) ) )
186
		{
187
			$tpl->parse('hidden_permission_list', '');
188
			$tpl->set_block('show_cmd_advanced_permission_block', 'show_cmd_hidden_advanced_permission_list_block', 'hidden_advanced_permission_list');
189
			setSystemCheckboxes( $tpl, $admin, isset($_POST['system_permissions']) ? $_POST['system_permissions'] : $rec_group['system_permissions'] );
190
			$tpl->set_var('DISPLAY_ADVANCED', '');
191
			$tpl->set_var('DISPLAY_BASIC', 'display:none;');
192
			$tpl->set_var('ADVANCED', 'yes');
193
			$tpl->set_var('ADVANCED_ACTION', 'advance_action');
194
			$tpl->set_var('ADVANCED_BUTTON',  ($admin->get_permission('groups') == true) ? '<< '.$mLang->TEXT_HIDE_ADVANCED : '<< '.$mLang->TEXT_HIDE_ADVANCED);
195
			$tpl->set_var('FILESYSTEM_PERMISSIONS', $mLang->TEXT_FILESYSTEM_PERMISSIONS);
196

  
197
			$tpl->parse('advanced_permission_block', 'show_cmd_advanced_permission_block', true);
198
			$tpl->parse('permission_block', '');
199
		} else {
200 185
			$tpl->parse('hidden_advanced_permission_list', '');
201 186
			$tpl->set_block('show_cmd_manage_permission_block', 'show_cmd_hidden_permission_list_block', 'hidden_permission_list');
202 187
			setSystemCheckboxes( $tpl, $admin, isset($_POST['system_permissions']) ? $_POST['system_permissions'] : $rec_group['system_permissions'] );
203 188
			$tpl->set_var('DISPLAY_ADVANCED', '');
204 189
			$tpl->set_var('DISPLAY_BASIC', '');
205
			$tpl->set_var('ADVANCED', 'no');
206
			$tpl->set_var('ADVANCED_ACTION', 'advance_action');
207
			$tpl->set_var('ADVANCED_BUTTON',  ($admin->get_permission('groups_add') == true) ? $mLang->TEXT_SHOW_ADVANCED.' >>' : $mLang->TEXT_SHOW_ADVANCED.' >>');
208 190
			$tpl->set_var('FILESYSTEM_PERMISSIONS', $mLang->TEXT_FILESYSTEM_PERMISSIONS.' ');
209 191

  
210
			$tpl->parse('advanced_permission_block', '');
192
			$tpl->parse('advanced_permission_block', 'show_cmd_advanced_permission_block', true);
211 193
			$tpl->parse('permission_block', 'show_cmd_manage_permission_block', true);
212
		}
213 194

  
214 195
// ------------------------
215 196

  
......
321 302
		$output = $tpl->finish($tpl->parse('output', 'page'));
322 303
		unset($tpl);
323 304
		return $output;
324
	}
305
	}
branches/2.8.x/wb/admin/skel/themes/htt/groups_form.htt
2 2
		<div class="content_box">
3 3
			<form name="group" action="{GROUP_ACTION_URL}" method="post" class="access {DISPLAY_ADD}">
4 4
			<input type="hidden" name="group_id" value="{GROUP_ID}" />
5
			<input type="hidden" name="advance_action" value="{ADVANCED}" />
6 5
			<input type="hidden" name="{FORM_NAME_GROUPMASK}" value="1" />
7 6
			<input type="hidden" name="group_name" maxlength="120" value="{GROUP_NAME}" />
8 7
			<input type="hidden" name="{ACTION_HIDDEN}" value="{SUBMIT_TITLE}" />
......
16 15
					<input type="submit" name="{ACTION_HANDLE}" value="{SUBMIT_TITLE}" />
17 16
					<input type="submit" name="action_cancel" value="{TEXT_CANCEL}" />
18 17
					<input type="reset" name="reset" value="{TEXT_RESET}" />
19
		 	        <input class="cright" type="submit" name="advanced_action" style="{DISPLAY_ADVANCED}" value="{ADVANCED_BUTTON}" />
20 18
				</div>
21 19
				<br class="clear ie-clearing none" />
22 20
		<!-- BEGIN show_cmd_manage_permission_block -->
......
73 71
				</div>
74 72
		<!-- END show_cmd_manage_permission_block -->
75 73
		<!-- BEGIN show_cmd_advanced_permission_block -->
76
				<div class="cleft col_width33">
74
				<div id="JQPageView" class="cleft col_width33">
77 75
					<div class="col_content aBlock">
78 76
			<!-- BEGIN show_cmd_hidden_advanced_permission_list_block -->
79 77
						<input name="{SYS_NAME}" type="hidden" value="{SYS_VALUE}" />
......
82 80
							<h6>{FILESYSTEM_PERMISSIONS} {MENU_PAGES}</h6>
83 81
							<ul>
84 82
								<li class="c100">
85
									<input name="system_permissions[pages_view]" id="pages_view" type="checkbox" value="{VALUE}" {pages_view_checked} />
86
									<label for="pages_view">{TEXT_VIEW}</label>
83
									<input name="system_permissions[pages_view]" id="pages_view_detail" type="checkbox" value="{VALUE}" {pages_view_checked} />
84
									<label for="pages_view_detail">{TEXT_VIEW}</label>
87 85
								</li>
88 86
								<li class="c100">
89 87
									<input name="system_permissions[pages_add_l0]" id="pages_add_l0" type="checkbox" value="{VALUE}" {pages_add_l0_checked} />
......
113 111
						</div>
114 112
					</div>
115 113
				</div>
116
				<div class="cleft col_width33">
114
				<div id="JQMediaView"class="cleft col_width33">
117 115
					<div class="col_content">
118 116
						<div class="mbox curved min_h100 floatbox" style="height: 180px;">
119 117
							<h6>{TEXT_FILESYSTEM_PERMISSIONS} {MENU_MEDIA}</h6>
120 118
							<ul>
121 119
								<li class="c100">
122
								<input name="system_permissions[media_view]" id="media_view" type="checkbox" value="1" {media_view_checked} />
123
								<label for="media_view">{TEXT_VIEW}</label>
120
								<input name="system_permissions[media_view]" id="media_view_detail" type="checkbox" value="1" {media_view_checked} />
121
								<label for="media_view_detail">{TEXT_VIEW}</label>
124 122
								</li>
125 123
								<li class="c100">
126 124
								<input name="system_permissions[media_upload]" id="media_upload" type="checkbox" value="1" {media_upload_checked} />
......
145 143
						</div>
146 144
					</div>
147 145
				</div>
148
				<div class="cleft col_width33">
146
				<div id="JQModulesView" class="cleft col_width33">
149 147
					<div class="col_content">
150 148
						<div class="mbox curved min_h100 floatbox" style="height: 180px;">
151
							<h6>{FILESYSTEM_PERMISSIONS} {MENU_SETTINGS}</h6>
152
							<ul>
153
								<li class="c100">
154
									<input name="system_permissions[settings_view]" id="settings_view" type="checkbox" value="1" {settings_view_checked} />
155
									<label for="settings_view">{TEXT_BASIC}</label>
156
								</li>
157
								<li class="c100">
158
									<input name="system_permissions[settings_advanced]" id="settings_advanced" type="checkbox" value="1" {settings_advanced_checked} />
159
									<label for="settings_advanced">{TEXT_ADVANCED}</label>
160
								</li>
161
							</ul><br />
162
							<h6>{FILESYSTEM_PERMISSIONS} {MENU_ADMINTOOLS}</h6>
163
							<ul>
164
								<li class="c100">
165
									<input name="system_permissions[admintools_view]" id="admintools_view" type="checkbox" value="1" {admintools_view_checked} />
166
									<label for="admintools_view">{TEXT_MODIFY}</label>
167
								</li>
168
							</ul><br />
169
							<h6>{FILESYSTEM_PERMISSIONS} {MENU_USER_PREFERENCES}</h6>
170
							<ul>
171
								<li class="c100">
172
									<input name="system_permissions[preferences_view]" id="preferences_view" type="checkbox" value="1" {preferences_view_checked} />
173
									<label for="preferences_view">{TEXT_MODIFY}</label>
174
								</li>
175
							</ul>
176
						</div>
177
					</div>
178
				</div>
179
				<br class="clear ie-clearing none" />
180
				<div class="cleft col_width33">
181
					<div class="col_content">
182
						<div class="mbox curved min_h100 floatbox">
183 149
							<h6>{FILESYSTEM_PERMISSIONS} {MENU_MODULES}</h6>
184 150
							<ul>
185 151
								<li class="c100">
186
								<input name="system_permissions[modules_view]" id="modules_view" type="checkbox" value="1" {modules_view_checked} />
187
								<label for="modules_view">{TEXT_VIEW}</label>
152
								<input name="system_permissions[modules_view]" id="modules_view_detail" type="checkbox" value="1" {modules_view_checked} />
153
								<label for="modules_view_detail">{TEXT_VIEW}</label>
188 154
								</li>
189 155
								<li class="c100">
190 156
								<input name="system_permissions[modules_install]" id="modules_install" type="checkbox" value="1" {modules_install_checked} />
......
202 168
						</div>
203 169
					</div>
204 170
				</div>
205
				<div class="cleft col_width33">
171
				<br class="clear ie-clearing none" />
172
				<div id="JQTemplateView" class="cleft col_width33">
206 173
					<div class="col_content">
207
						<div class="mbox curved min_h100 floatbox">
174
						<div class="mbox curved min_h100 floatbox" style="height: 180px;">
208 175
							<h6>{FILESYSTEM_PERMISSIONS} {MENU_TEMPLATES}</h6>
209 176
							<ul>
210 177
								<li class="c100">
211
									<input name="system_permissions[templates_view]" id="templates_view" type="checkbox" value="1" {templates_view_checked} />
212
									<label for="templates_view">{TEXT_VIEW}</label>
178
									<input name="system_permissions[templates_view]" id="templates_view_detail" type="checkbox" value="1" {templates_view_checked} />
179
									<label for="templates_view_detail">{TEXT_VIEW}</label>
213 180
								</li>
214 181
								<li class="c100">
215 182
									<input name="system_permissions[templates_install]" id="templates_install" type="checkbox" value="1" {templates_install_checked} />
......
224 191
						</div>
225 192
					</div>
226 193
				</div>
227
				<div class="cleft col_width33">
194
				<div id="JQLanguagesView" class="cleft col_width33">
228 195
					<div class="col_content">
229
						<div class="mbox curved min_h100 floatbox">
196
						<div class="mbox curved min_h100 floatbox" style="height: 180px;">
230 197
							<h6>{FILESYSTEM_PERMISSIONS} {MENU_LANGUAGES}</h6>
231 198
							<ul>
232 199
								<li class="c100">
233
									<input name="system_permissions[languages_view]" id="languages_view" type="checkbox" value="1" {languages_view_checked} />
234
									<label for="languages_view">{TEXT_VIEW}</label>
200
									<input name="system_permissions[languages_view]" id="languages_view_detail" type="checkbox" value="1" {languages_view_checked} />
201
									<label for="languages_view_detail">{TEXT_VIEW}</label>
235 202
								</li>
236 203
								<li class="c100">
237 204
									<input name="system_permissions[languages_install]" id="languages_install" type="checkbox" value="1" {languages_install_checked} />
......
246 213
						</div>
247 214
					</div>
248 215
				</div>
216
				<div id="JQSettingsView" class="cleft col_width33">
217
					<div class="col_content">
218
						<div class="mbox curved min_h100 floatbox" style="height: 180px;">
219
							<h6>{FILESYSTEM_PERMISSIONS} {MENU_SETTINGS}</h6>
220
							<ul>
221
								<li class="c100">
222
									<input name="system_permissions[settings_view]" id="settings_view_detail" type="checkbox" value="1" {settings_view_checked} />
223
									<label for="settings_view_detail">{TEXT_BASIC}</label>
224
								</li>
225
								<li class="c100">
226
									<input name="system_permissions[settings_advanced]" id="settings_advanced" type="checkbox" value="1" {settings_advanced_checked} />
227
									<label for="settings_advanced">{TEXT_ADVANCED}</label>
228
								</li>
229
							</ul>
230
						</div>
231
					</div>
232
				</div>
249 233
				<br class="clear ie-clearing none" />
250
				<div class="cleft col_width33">
234
				<div id="JQAToolsView" class="cleft col_width33">
251 235
					<div class="col_content">
252
						<div class="mbox curved min_h100 floatbox">
236
						<div class="mbox curved min_h100 floatbox" style="height: 180px;">
237
							<h6>{FILESYSTEM_PERMISSIONS} {MENU_ADMINTOOLS}</h6>
238
							<ul>
239
								<li class="c100">
240
									<input name="system_permissions[admintools_view]" id="admintools_view_detail" type="checkbox" value="1" {admintools_view_checked} />
241
									<label for="admintools_view_detail">{TEXT_MODIFY}</label>
242
								</li>
243
							</ul>
244
						</div>
245
					</div>
246
				</div>
247
				<div id="JQUsersView" class="cleft col_width33">
248
					<div class="col_content">
249
						<div class="mbox curved min_h100 floatbox" style="height: 180px;">
253 250
							<h6>{FILESYSTEM_PERMISSIONS} {MENU_USERS}</h6>
254 251
							<ul>
255 252
								<li class="c100">
256
									<input name="system_permissions[users_view]" id="users_view" type="checkbox" value="1" {users_view_checked} />
257
									<label for="users_view">{TEXT_VIEW}</label>
253
									<input name="system_permissions[users_view]" id="users_view_detail" type="checkbox" value="1" {users_view_checked} />
254
									<label for="users_view_detail">{TEXT_VIEW}</label>
258 255
								</li>
259 256
								<li class="c100">
260 257
									<input name="system_permissions[users_add]" id="users_add" type="checkbox" value="1" {users_add_checked} />
......
272 269
						</div>
273 270
					</div>
274 271
				</div>
275
				<div class="cleft col_width33">
272
				<div id="JQGroupsView" class="cleft col_width33">
276 273
					<div class="col_content">
277
						<div class="mbox curved min_h100 floatbox">
274
						<div class="mbox curved min_h100 floatbox" style="height: 180px;">
278 275
							<h6>{FILESYSTEM_PERMISSIONS} {MENU_GROUPS}</h6>
279 276
							<ul>
280 277
								<li class="c100">
281
									<input name="system_permissions[groups_view]" id="groups_view" type="checkbox" value="1" {groups_view_checked} />
282
									<label for="groups_view">{TEXT_VIEW}</label>
278
									<input name="system_permissions[groups_view]" id="groups_view_detail" type="checkbox" value="1" {groups_view_checked} />
279
									<label for="groups_view_detail">{TEXT_VIEW}</label>
283 280
								</li>
284 281
								<li class="c100">
285 282
									<input name="system_permissions[groups_add]" id="groups_add" type="checkbox" value="1" {groups_add_checked} />
......
297 294
						</div>
298 295
					</div>
299 296
				</div>
297
				<br class="clear ie-clearing none">
298
				<div id="JQUSettingsView" class="cleft col_width33">
299
					<div class="col_content">
300
						<div class="mbox curved min_h100 floatbox" style="height: 180px;">
301
							<h6>{FILESYSTEM_PERMISSIONS} {MENU_USER_PREFERENCES}</h6>
302
							<ul>
303
								<li class="c100">
304
									<input name="system_permissions[preferences_view]" id="preferences_view_detail" type="checkbox" value="1" {preferences_view_checked} />
305
									<label for="preferences_view_detail">{TEXT_MODIFY}</label>
306
								</li>
307
							</ul>
308
						</div>
309
					</div>
310
				</div>
300 311
		<!-- END show_cmd_advanced_permission_block -->
301 312
				<hr class="clear" />
302 313
				<div class="cleft col_width33">
......
362 373
					<input type="submit" name="{ACTION_HANDLE}" value="{SUBMIT_TITLE}" />
363 374
					<input type="submit" name="action_cancel" value="{TEXT_CANCEL}" />
364 375
					<input type="reset" name="reset" value="{TEXT_RESET}" />
365
		 	        <input class="cright" type="submit" name="advanced_action" style="{DISPLAY_ADVANCED}" value="{ADVANCED_BUTTON}" />
366 376
				</div>
367 377
				<br class="clear ie-clearing none" />
368 378
	<!-- END show_cmd_permission_block -->
branches/2.8.x/wb/admin/interface/version.php
51 51

  
52 52
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
53 53
if(!defined('VERSION')) define('VERSION', '2.8.3');
54
if(!defined('REVISION')) define('REVISION', '1932');
54
if(!defined('REVISION')) define('REVISION', '1933');
55 55
if(!defined('SP')) define('SP', '');
branches/2.8.x/wb/templates/wb_theme/jquery/jquery-plugins.js
44 44
	  }).addClass("internal");
45 45

  
46 46
	$('form').attr('autocomplete', 'off');
47
function include_file(filename, filetype) {
47 48

  
49
	if(!filetype)
50
		var filetype = 'js'; //js default filetype
51

  
52
	var th = document.getElementsByTagName('head')[0];
53
	var s = document.createElement((filetype == "js") ? 'script' : 'link');
54

  
55
	s.setAttribute('type',(filetype == "js") ? 'text/javascript' : 'text/css');
56

  
57
	if (filetype == "css")
58
		s.setAttribute('rel','stylesheet');
59

  
60
	s.setAttribute((filetype == "js") ? 'src' : 'href', filename);
61
	th.appendChild(s);
62

  
63
}
64

  
65
function redirect_to_page (url, timer) {
66
	setTimeout('self.location.href="'+url+'"', timer);
67
}
68

  
69
$(document).ready(function()
70
{
71

  
72
        if($(".jcalendar").length) {
73
            $.insert(WB_URL+"/include/jscalendar/calendar-system.css");
74
          }
75

  
76
        if($(".jsadmin").length) {
77
            $.insert(WB_URL+"/modules/jsadmin/backend.css");
78
          }
79

  
80
	//Add external link class to external links -
81
	$('a[href^="http://"]').filter(function() {
82
		//Compare the anchor tag's host name with location's host name
83
	    return this.hostname && this.hostname !== location.hostname;
84
	  }).addClass("external").attr("target", "_blank");
85

  
86
	/* Add internal link class to external links -   */
87
	$('a[href^="http://"]').filter(function() {
88
		//Compare the anchor tag's host name with location's host name
89
	    return this.hostname && this.hostname == location.hostname;
90
	  }).addClass("internal");
91

  
92
	$('form').attr('autocomplete', 'off');
93

  
94
/* toggler for group permissions */
95
    if($('form[name="group"]').length) {
96

  
97
		function toggleBox(checkbox, toggleID){
98
			var $checkbox = checkbox;
99
			if( $checkbox.attr('checked')){
100
				$(toggleID).removeClass("hide");
101
			} else {
102
				$(toggleID).addClass("hide");
103
			}
104
		}
105

  
106

  
107
		var $ischecked = false;
108
		/* check toggler on pageload */
109
		if($ischecked == false) {
110
			if(!$('#pages_view').attr('checked')){
111
				toggleBox($(this), "#JQPageView");
112
			}
113
			if(!$('#media_view').attr('checked')){
114
				toggleBox($(this), "#JQMediaView");
115
			}
116
			if(!$('#modules_view').attr('checked')){
117
				toggleBox($(this), "#JQModulesView");
118
			}
119
			if(!$('#templates_view').attr('checked')){
120
				toggleBox($(this), "#JQTemplateView");
121
			}
122
			if(!$('#languages_view').attr('checked')){
123
				toggleBox($(this), "#JQLanguagesView");
124
			}
125
			if(!$('#settings_view').attr('checked')){
126
				toggleBox($(this), "#JQSettingsView");
127
			}
128
			if(!$('#admintools_view').attr('checked')){
129
				toggleBox($(this), "#JQAToolsView");
130
			}
131
			if(!$('#users_view').attr('checked')){
132
				toggleBox($(this), "#JQUsersView");
133
			}
134
			if(!$('#groups_view').attr('checked')){
135
				toggleBox($(this), "#JQGroupsView");
136
			}
137
			var $ischecked = true;
138
		}
139

  
140

  
141
        $('#pages_view').click(function(){
142
            toggleBox($(this), "#JQPageView");
143
        });
144
        $('#media_view').click(function(){
145
            toggleBox($(this), "#JQMediaView");
146
        });
147
        $('#modules_view').click(function(){
148
            toggleBox($(this), "#JQModulesView");
149
        });
150
        $('#templates_view').click(function(){
151
            toggleBox($(this), "#JQTemplateView");
152
        });
153
        $('#languages_view').click(function(){
154
            toggleBox($(this), "#JQLanguagesView");
155
        });
156
        $('#settings_view').click(function(){
157
            toggleBox($(this), "#JQSettingsView");
158
        });
159
        $('#admintools_view').click(function(){
160
            toggleBox($(this), "#JQAToolsView");
161
        });
162
        $('#users_view').click(function(){
163
            toggleBox($(this), "#JQUsersView");
164
        });
165
        $('#groups_view').click(function(){
166
            toggleBox($(this), "#JQGroupsView");
167
        });
168
        $('#preferences_view').click(function(){
169
            toggleBox($(this), "#JQUSettingsView");
170
        });
171
      }
172

  
173

  
174
});
48 175
});

Also available in: Unified diff