Project

General

Profile

« Previous | Next » 

Revision 1799

Added by Dietmar about 12 years ago

! media iframe browser now is html XHTML 1.0 Transitional valide

View differences:

branches/2.8.x/CHANGELOG
13 13

  
14 14

  
15 15

  
16
29 Oct-2012 Build 1799 Dietmar Woellbrink (Luisehahne)
17
! media iframe browser now is html XHTML 1.0 Transitional valide
16 18
28 Oct-2012 Build 1798 Dietmar Woellbrink (Luisehahne)
17 19
! admin/media: change preview size, remove CAPTION, STICKY
18 20
27 Oct-2012 Build 1797 Dietmar Woellbrink (Luisehahne)
branches/2.8.x/wb/admin/media/browse.php
76 76
	{
77 77
        $retVal = 'onmouseover="return overlib('.
78 78
            '\'<img src=\\\''.($name).'\\\''.
79
            'alt=\\\'\\\' '.
79 80
            'maxwidth=\\\'300\\\' '.
80
            'maxheight=\\\'300\\\'>\','.
81
            'maxheight=\\\'300\\\' />\','.
81 82
//            '>\','.
82 83
//            'CAPTION,\''.basename($name).'\','.
83 84
            'FGCOLOR,\'#ffffff\','.
......
136 137
// Check to see if it contains ../
137 138
if (!check_media_path($directory)) {
138 139
	// $admin->print_header();
139
	$admin->print_error($MESSAGE['MEDIA']['DIR_DOT_DOT_SLASH']);
140
	$admin->print_error($MESSAGE['MEDIA_DIR_DOT_DOT_SLASH']);
140 141
}
141 142

  
142 143
if(!file_exists(WB_PATH.MEDIA_DIRECTORY.$directory)) {
143 144
	// $admin->print_header();
144
	$admin->print_error($MESSAGE['MEDIA']['DIR_DOES_NOT_EXIST']);
145
	$admin->print_error($MESSAGE['MEDIA_DIR_DOES_NOT_EXIST']);
145 146
}
146 147

  
147 148
// Check to see if the user wanted to go up a directory into the parent folder
......
151 152
	exit(0);
152 153
}
153 154

  
154
if ($_SESSION['GROUP_ID'] != 1 && $pathsettings['global']['admin_only']) { // Only show admin the settings link
155
if ($_SESSION['GROUP_ID'] != 1 && $pathsettings['global_admin_only']) { // Only show admin the settings link
155 156
	$template->set_var('DISPLAY_SETTINGS', 'hide');
156 157
}
157 158

  
......
267 268
			$tooltip = '';
268 269

  
269 270

  
270
			if (!$pathsettings['global']['show_thumbs']) {
271
			if (!$pathsettings['global_show_thumbs']) {
271 272
				$info = getimagesize(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$name);
272 273
				if ($info[0]) {
273 274
					$imgdetail = fsize(filesize(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$name)).'<br /> '.$info[0].' x '.$info[1].' px';
274
					$icon = 'thumbs.php?t=1&img='.$directory.'/'.$name;
275
					$tooltip = ToolTip('thumbs.php?t=2&img='.$directory.'/'.$name);
275
					$icon = 'thumbs.php?t=1&amp;img='.$directory.'/'.$name;
276
					$tooltip = ToolTip('thumbs.php?t=2&amp;img='.$directory.'/'.$name);
276 277
				}
277 278
			}
278 279

  
......
334 335
					'TEXT_NAME' => $TEXT['NAME'],
335 336
					'TEXT_TYPE' => $TEXT['TYPE'],
336 337
					'TEXT_UP' => $TEXT['UP'],
337
					'NONE_FOUND' => $MESSAGE['MEDIA']['NONE_FOUND'],
338
					'NONE_FOUND' => $MESSAGE['MEDIA_NONE_FOUND'],
338 339
					'CHANGE_SETTINGS' => $TEXT['MODIFY_SETTINGS'],
339
					'CONFIRM_DELETE' => $MESSAGE['MEDIA']['CONFIRM_DELETE']
340
					'CONFIRM_DELETE' => $MESSAGE['MEDIA_CONFIRM_DELETE']
340 341
				)
341 342
			);
342 343

  
branches/2.8.x/wb/admin/skel/themes/htt/media_browse.htt
16 16
<table summary="" cellpadding="4" cellspacing="0" border="0" width="100%" style="border-bottom: 1px solid #666; width: 100%;">
17 17
<tr style="background-color: #DDD;">
18 18
	<td width="16" align="center" style="padding-left: 10px;">
19
		<a href="{PARENT_DIR_LINK}"><img src="{THEME_URL}/images/up_folder_16.png" border="0" class="{DISPLAY_UP_ARROW}" alt="^" /></a>
19
		<a href="{PARENT_DIR_LINK}">
20
            <img src="{THEME_URL}/images/up_folder_16.png" border="0" class="{DISPLAY_UP_ARROW}" alt="^" />
21
        </a>
20 22
	</td>
21 23
	<td width="50">
22 24
		<a href="{PARENT_DIR_LINK}" class="{DISPLAY_UP_ARROW}">{TEXT_UP}</a>
......
31 33
<!-- BEGIN list_block -->
32 34
<tr style="background-color: #{ROW_BG_COLOR};" >
33 35
	<td width="18" style="padding-left: 10px;" {MOUSEOVER} >
34
		<a href="{LINK}" target="{LINK_TARGET}"><img src="{FT_ICON}" class="{DISPLAY_ICON}" border="0" alt="" /></a>
36
		<a href="{LINK}" target="{LINK_TARGET}">
37
            <img src="{FT_ICON}" class="{DISPLAY_ICON}" alt="" />
38
        </a>
35 39
	</td>
36 40
	<td {MOUSEOVER} >
37 41
		<a href="{LINK}" target="{LINK_TARGET}">{NAME}</a>
......
40 44
		<small>{IMAGEDETAIL}<br />{DATE}</small>
41 45
	</td>
42 46
	<td width="60" align="right" class="{DISPLAY_RENAME}">
43
		<a href="rename.php?dir={CURRENT_DIR}&amp;id={TEMP_ID}"><img src="{THEME_URL}/images/modify_16.png" alt="{TEXT_RENAME}" border="0" /> </a> &nbsp;&nbsp;
44
		<a href="#" onclick="javascript: confirm_link('{CONFIRM_DELETE}\n {NAME_SLASHED}', 'delete.php?dir={CURRENT_DIR}&amp;id={TEMP_ID}');"><img src="{THEME_URL}/images/delete_16.png" alt="{TEXT_DELETE}" border="0" /></a>&nbsp;&nbsp;
47
		<a title="{NAME} {TEXT_RENAME}" href="rename.php?dir={CURRENT_DIR}&amp;id={TEMP_ID}">
48
        <img src="{THEME_URL}/images/modify_16.png" alt="{NAME} {TEXT_RENAME}" /> </a> &nbsp;&nbsp;
49
		<a href="#" title="{NAME} {TEXT_DELETE}" onclick="javascript:confirm_link('{CONFIRM_DELETE}\n {NAME_SLASHED}','delete.php?dir={CURRENT_DIR}&amp;id={TEMP_ID}');">
50
        <img src="{THEME_URL}/images/delete_16.png" alt="{NAME} {TEXT_DELETE}" />
51
        </a>&nbsp;&nbsp;
45 52
	</td>
46 53
   <td width="16" align="right" class="">
47 54
	   <img src="{THEME_URL}/images/{IMAGE_EXIST}" title="{IMAGE_TITLE}" alt="{IMAGE_TITLE}" />
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', '1798');
54
if(!defined('REVISION')) define('REVISION', '1799');
55 55
if(!defined('SP')) define('SP', '');

Also available in: Unified diff