Project

General

Profile

« Previous | Next » 

Revision 1041

Added by Matthias almost 15 years ago

- Fixed some minor bugs in argos_theme (Thanks to Argos)

- Fixed bugs in admin additons for argos_theme (Thanks to Argos)

View differences:

trunk/CHANGELOG
12 12

  
13 13
------------------------------------- 2.8.0 -------------------------------------
14 14
07-July-2009 Matthias Gallas
15
#	Fixed some minor bugs in argos_theme (Thanks to Argos)
16
#	Fixed bugs in admin additons for argos_theme (Thanks to Argos)
15 17
!	Updated Version Number in upgrade_script to 2.8RC1
16 18
!	Updated FCKEditor Modul Version Number to 2.89
17 19
+	added in FCKEditor Advisory Relation to Links (thanks to Luisehahne)
trunk/wb/admin/media/browse.php
30 30

  
31 31
// Include the WB functions file
32 32
require_once(WB_PATH.'/framework/functions.php');
33
include ('parameters.php');
33 34

  
34 35
// Byte convert for filesize
35 36
function byte_convert($bytes) {
36
	$symbol = array('B', 'KB', 'MB', 'GB', 'TB');
37
	$symbol = array(' bytes', ' KB', ' MB', ' GB', ' TB');
37 38
	$exp = 0;
38 39
	$converted_value = 0;
39 40
	if( $bytes > 0 ) {
......
90 91
	exit(0);
91 92
}
92 93

  
94
if ($_SESSION['GROUP_ID'] != 1 && $pathsettings['global']['admin_only']) { // Only show admin the settings link
95
	$template->set_var('DISPLAY_SETTINGS', 'hide');
96
}
97

  
93 98
// Workout the parent dir link
94 99
$parent_dir_link = ADMIN_URL.'/media/browse.php?dir='.$directory.'&up=1';
95 100
// Workout if the up arrow should be shown
......
142 147
											'LINK' => "browse.php?dir=$directory/$link_name",
143 148
											'LINK_TARGET' => '',
144 149
											'ROW_BG_COLOR' => $row_bg_color,
150
											'FT_ICON' => THEME_URL.'/images/folder_16.png',
145 151
											'FILETYPE_ICON' => THEME_URL.'/images/folder_16.png',
146 152
											'MOUSEOVER' => '',
147 153
											'IMAGEDETAIL' => '',
......
179 185
			$imgdetail = '';
180 186
			$icon = THEME_URL.'/images/blank.gif';
181 187
			$tooltip = '';
182
			$pathsettings['global']['show_thumbs'] = '';
188
			
189
			
183 190
			if (!$pathsettings['global']['show_thumbs']) {
184 191
				$info = getimagesize(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$name);
185 192
				if ($info[0]) {
186
					$imgdetail = fsize(filesize(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$name)).', '.$info[0].'x'.$info[1].'px';
193
					$imgdetail = fsize(filesize(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$name)).'<br /> '.$info[0].' x '.$info[1].' px';
187 194
					$icon = 'thumb.php?t=1&img='.$directory.'/'.$name;
188
					$tooltip = ShowTip('thumb.php?t=2&img='.$directory.'/'.$name,$imgdetail);
195
					$tooltip = ShowTip('thumb.php?t=2&img='.$directory.'/'.$name);
189 196
				}
190 197
			}
191 198
			$template->set_var(array(
......
195 202
											'LINK' => WB_URL.MEDIA_DIRECTORY.$directory.'/'.$name,
196 203
											'LINK_TARGET' => '_blank',
197 204
											'ROW_BG_COLOR' => $row_bg_color,
198
											'ICON' => $icon,
205
											'FT_ICON' => $icon,
199 206
											'FILETYPE_ICON' => THEME_URL.'/images/files/'.$filetypeicon.'.png',
200 207
											'MOUSEOVER' => $tooltip, 
201 208
											'IMAGEDETAIL' => $imgdetail,
......
255 262
function ShowTip($name,$detail='') {
256 263
$ext = strtolower(end(explode(".", $name)));
257 264
if (strpos('.gif.jpg.jpeg.png.bmp.',$ext) )
258
	return 'onmouseover="overlib(\'<img src=\\\''.$name.'\\\' width=\\\'200\\\'><br/><center>'.$detail.'</center>\',VAUTO, WIDTH, 200)" onmouseout="nd()" ' ;
265
	return 'onmouseover="overlib(\'<img src=\\\''.$name.'\\\' maxwidth=\\\'200\\\' maxheight=\\\'200\\\'>\',VAUTO, WIDTH)" onmouseout="nd()" ' ;
259 266
else
260 267
	return '';
261 268
}
262 269

  
263 270
function fsize($size) {
264 271
   if($size == 0) return("0 Bytes");
265
   $filesizename = array(" Bytes", "kB", "MB", "GB", "TB");
272
   $filesizename = array(" bytes", " kB", " MB", " GB", " TB");
266 273
   return round($size/pow(1024, ($i = floor(log($size, 1024)))), 1) . $filesizename[$i];
267 274
}
268 275
?>
trunk/wb/admin/media/upload.php
33 33

  
34 34
// Print admin header
35 35
require('../../config.php');
36
include_once('resize_img.php');
37
include_once('parameters.php');
38

  
36 39
require_once(WB_PATH.'/framework/class.admin.php');
37 40
require_once(WB_PATH.'/include/pclzip/pclzip.lib.php');	// Required to unzip file.
38 41
$admin = new admin('Media', 'media_upload');
......
47 50

  
48 51
// Create relative path of the target location for the file
49 52
$relative = WB_PATH.$target.'/';
53
$resizepath = str_replace('/','_',$target);
50 54

  
51 55
// Find out whether we should replace files or give an error
52 56
if($admin->get_post('overwrite') != '') {
......
95 99
					change_mode($relative.$filename);
96 100
				}
97 101
			}
102
			
103
			if(file_exists($relative.$filename)) {
104
				if ($pathsettings[$resizepath]['width'] || $pathsettings[$resizepath]['height'] ) {
105
					$rimg=new RESIZEIMAGE($relative.$filename);
106
					$rimg->resize_limitwh($pathsettings[$resizepath]['width'],$pathsettings[$resizepath]['height'],$relative.$filename);
107
					$rimg->close();
108
				}
109
			}
110
				
98 111
			// store file name of first file for possible unzip action
99 112
			if ($count == 1) {
100 113
				$filename1 = $relative . $filename;
trunk/wb/admin/media/overlib.js
36 36
// Settings you want everywhere are set here. All of this can also be
37 37
// changed on your html page or through an overLIB call.
38 38
////////
39
if (typeof ol_fgcolor=='undefined') var ol_fgcolor="#CCCCFF";
40
if (typeof ol_bgcolor=='undefined') var ol_bgcolor="#333399";
39
if (typeof ol_fgcolor=='undefined') var ol_fgcolor="#ffffff";
40
if (typeof ol_bgcolor=='undefined') var ol_bgcolor="#cccccc";
41 41
if (typeof ol_textcolor=='undefined') var ol_textcolor="#000000";
42
if (typeof ol_capcolor=='undefined') var ol_capcolor="#FFFFFF";
42
if (typeof ol_capcolor=='undefined') var ol_capcolor="#000000";
43 43
if (typeof ol_closecolor=='undefined') var ol_closecolor="#9999FF";
44 44
if (typeof ol_textfont=='undefined') var ol_textfont="Verdana,Arial,Helvetica";
45 45
if (typeof ol_captionfont=='undefined') var ol_captionfont="Verdana,Arial,Helvetica";
......
49 49
if (typeof ol_closesize=='undefined') var ol_closesize="1";
50 50
if (typeof ol_width=='undefined') var ol_width="200";
51 51
if (typeof ol_border=='undefined') var ol_border="1";
52
if (typeof ol_cellpad=='undefined') var ol_cellpad=2;
52
if (typeof ol_cellpad=='undefined') var ol_cellpad=7;
53 53
if (typeof ol_offsetx=='undefined') var ol_offsetx=10;
54 54
if (typeof ol_offsety=='undefined') var ol_offsety=10;
55
if (typeof ol_text=='undefined') var ol_text="Default Text";
55
if (typeof ol_text=='undefined') var ol_text="";
56 56
if (typeof ol_cap=='undefined') var ol_cap="";
57 57
if (typeof ol_sticky=='undefined') var ol_sticky=0;
58 58
if (typeof ol_background=='undefined') var ol_background="";
trunk/wb/templates/argos_theme/info.php
12 12
 * @author     Jurgen Nijhuis (Argos Media) & Ruud Eisinga
13 13
 * @copyright  GNU General Public License
14 14
 * @license    http://www.gnu.org/licenses/gpl.html
15
 * @version    2.80
15
 * @version    1.1
16 16
 * @platform   Website Baker 2.8
17 17
 *
18 18
 * Website Baker is free software; you can redistribute it and/or modify
......
30 30
$template_directory			= 'argos_theme';
31 31
$template_name				= 'argos_theme';
32 32
$template_function			= 'theme';
33
$template_version			= '2.80';
33
$template_version			= '1.1';
34 34
$template_platform			= '2.8';
35 35
$template_author			= 'Jurgen Nijhuis (Argos Media) & Ruud Eisinga';
36 36
$template_license			= '<a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License</a>';
trunk/wb/templates/argos_theme/images/flags/index.php
12 12
 * @author     Jurgen Nijhuis (Argos Media) & Ruud Eisinga
13 13
 * @copyright  GNU General Public License
14 14
 * @license    http://www.gnu.org/licenses/gpl.html
15
 * @version    2.80
15
 * @version    1.1
16 16
 * @platform   Website Baker 2.8
17 17
 *
18 18
 * Website Baker is free software; you can redistribute it and/or modify
trunk/wb/templates/argos_theme/images/index.php
12 12
 * @author     Jurgen Nijhuis (Argos Media) & Ruud Eisinga
13 13
 * @copyright  GNU General Public License
14 14
 * @license    http://www.gnu.org/licenses/gpl.html
15
 * @version    2.80
15
 * @version    1.1
16 16
 * @platform   Website Baker 2.8
17 17
 *
18 18
 * Website Baker is free software; you can redistribute it and/or modify
trunk/wb/templates/argos_theme/languages/index.php
12 12
 * @author     Jurgen Nijhuis (Argos Media) & Ruud Eisinga
13 13
 * @copyright  GNU General Public License
14 14
 * @license    http://www.gnu.org/licenses/gpl.html
15
 * @version    2.80
15
 * @version    1.1
16 16
 * @platform   Website Baker 2.8
17 17
 *
18 18
 * Website Baker is free software; you can redistribute it and/or modify
trunk/wb/templates/argos_theme/theme.css
81 81
.pages_list .icon_col td img {display:block;border-style:none;float:left;padding-right:7px;}
82 82
.pages_list table {width:900px;}
83 83
.pages_list table td {}
84
.pages_list ul {margin:0;font-weight:normal;}
84
.pages_list ul {margin:0;font-weight:normal;padding: 0;}
85 85
.pages_list ul li {list-style-type:none;margin:2px 0;}
86 86

  
87 87
table.pages_view {width:900px;background-color:#f0f0f0;}
......
92 92
.page_list_show li {display:block;}
93 93
img.page_list_rights {border:none;float:left;margin:0;}
94 94

  
95
.header_list_page_title {width:414px;padding-left: 24px;text-align:left;}
96
.header_list_menu_title {width:326px;text-align:left;}
95
.header_list_page_title {width:396px;text-align:left;}
96
.header_list_menu_title {width:328px;text-align:left;}
97 97
.header_list_actions {text-align:left;}
98 98

  
99 99
.list_page_title {width:350px;text-align:left;}
trunk/wb/templates/argos_theme/icons/index.php
12 12
 * @author     Jurgen Nijhuis (Argos Media) & Ruud Eisinga
13 13
 * @copyright  GNU General Public License
14 14
 * @license    http://www.gnu.org/licenses/gpl.html
15
 * @version    2.80
15
 * @version    1.1
16 16
 * @platform   Website Baker 2.8
17 17
 *
18 18
 * Website Baker is free software; you can redistribute it and/or modify
trunk/wb/templates/argos_theme/index.php
12 12
 * @author     Jurgen Nijhuis (Argos Media) & Ruud Eisinga
13 13
 * @copyright  GNU General Public License
14 14
 * @license    http://www.gnu.org/licenses/gpl.html
15
 * @version    2.80
15
 * @version    1.1
16 16
 * @platform   Website Baker 2.8
17 17
 *
18 18
 * Website Baker is free software; you can redistribute it and/or modify
trunk/wb/templates/argos_theme/templates/header.htt
21 21
	  <br />
22 22
      <br />
23 23
      <span class="version">CMS version {VERSION}</span><br/>
24
      <span class="version">Admin version 1.0</span>
24
      <span class="version">Admin version 1.1</span>
25 25
	 </div>
26 26
    <a href="{ADMIN_URL}" title="{TITLE_START}">
27 27
    <h1>{WEBSITE_TITLE} - {TEXT_ADMINISTRATION}</h1>
trunk/wb/templates/argos_theme/templates/index.php
12 12
 * @author     Jurgen Nijhuis (Argos Media) & Ruud Eisinga
13 13
 * @copyright  GNU General Public License
14 14
 * @license    http://www.gnu.org/licenses/gpl.html
15
 * @version    2.80
15
 * @version    1.1
16 16
 * @platform   Website Baker 2.8
17 17
 *
18 18
 * Website Baker is free software; you can redistribute it and/or modify
trunk/wb/templates/argos_theme/templates/media_browse.htt
26 26
<tr style="background-color: #{ROW_BG_COLOR};">
27 27
	<td width="18" style="padding-left: 10px;">
28 28
		<a href="{LINK}" target="{LINK_TARGET}">
29
			<img {MOUSEOVER} src="{ICON}" class="{DISPLAY_ICON}" border="0" alt="" />
29
			<img {MOUSEOVER} src="{FT_ICON}" class="{DISPLAY_ICON}" border="0" alt="" />
30 30
		</a>
31 31
	</td>
32 32
	<td><a {MOUSEOVER} href="{LINK}" target="{LINK_TARGET}">{NAME}</a><br /><small>{IMAGEDETAIL}</small></td>
trunk/wb/templates/argos_theme/templates/media.htt
1
<!-- Adapted by Jurgen Nijhuis / Argos Media - 2009/05/25 -->
2

  
3 1
<!-- BEGIN main_block -->
4

  
5
<table>
2
<script language="javascript" type="text/javascript">
3
function toggle() {
4
	var check = document.getElementById("file2");
5
	if (check.style.visibility == "visible") {
6
		for (i=2; i<=10; i++) {
7
			document.getElementById("file" + i).style.visibility = "hidden";
8
		}
9
		document.getElementById("delzip").style.display = "inline";
10
	} else {
11
		for (i=2; i<=10; i++) {
12
			document.getElementById("file" + i).style.visibility = "visible";
13
		}
14
		document.getElementById("delzip").style.display = "none";
15
	}
16
}
17
</script>
18
<table cellpadding="0" cellspacing="0" border="0">
6 19
  <tr>
7
    <td width="400" valign="top">
20
    <td width="300" valign="top" align="left">
8 21
	<h2>{HEADING_UPLOAD_FILES}</h2>
9 22
      <form name="upload" action="upload.php" method="post" enctype="multipart/form-data" class="{DISPLAY_UPLOAD}">
10 23
        <table cellpadding="3" cellspacing="0" border="0" width="100%">
......
24 37
        </table>
25 38
        <table cellpadding="3" cellspacing="0" border="0" width="100%">
26 39
          <tr>
27
            <td width="50%" align="left"><input type="file" size="49" name="file1" /> </td>
40
		  	<td valign="top">
41
				<input type="checkbox" name="unzip" id="unzip"  onClick="toggle();" />
42
				<label for="unzip">{TEXT_UNZIP_FILE}</label>
43
				<span id="delzip" style="display: none;"><br />
44
				<input type="checkbox" name="delzip" id="deletezip" />
45
				<label for="deletezip">{TEXT_DELETE_ZIP}</label></span>
46
			</td>
28 47
          </tr>
29 48
          <tr>
30
            <td width="50%" align="left"><input type="file" size="49" name="file2" /> </td>
49
            <td width="50%" align="left"><input type="file" size="33" name="file1" /> </td>
31 50
          </tr>
32 51
          <tr>
33
            <td width="50%" align="left"><input type="file" size="49" name="file3" /> </td>
52
            <td width="50%" align="left"><input type="file" size="33" name="file2" id="file2" style="visibility: visible;" /> </td>
34 53
          </tr>
35 54
          <tr>
36
            <td width="50%" align="left"><input type="file" size="49" name="file4" /> </td>
55
            <td width="50%" align="left"><input type="file" size="33" name="file3" id="file3" style="visibility: visible;" /> </td>
37 56
          </tr>
38 57
          <tr>
39
            <td width="50%" align="left"><input type="file" size="49" name="file5" /> </td>
58
            <td width="50%" align="left"><input type="file" size="33" name="file4" id="file4" style="visibility: visible;" /> </td>
40 59
          </tr>
60
          <tr>
61
            <td width="50%" align="left"><input type="file" size="33" name="file5" id="file5" style="visibility: visible;" /> </td>
62
          </tr>
41 63
		  <tr>
42
            <td width="50%" align="left"><input type="file" size="49" name="file6" /> </td>
64
            <td width="50%" align="left"><input type="file" size="33" name="file6" id="file6" style="visibility: visible;" /> </td>
43 65
          </tr>
44 66
          <tr>
45
            <td width="50%" align="left"><input type="file" size="49" name="file7" /> </td>
67
            <td width="50%" align="left"><input type="file" size="33" name="file7" id="file7" style="visibility: visible;" /> </td>
46 68
          </tr>
47 69
          <tr>
48
            <td width="50%" align="left"><input type="file" size="49" name="file8" /> </td>
70
            <td width="50%" align="left"><input type="file" size="33" name="file8" id="file8" style="visibility: visible;" /> </td>
49 71
          </tr>
72
		  <tr>
73
            <td width="50%" align="left"><input type="file" size="33" name="file9" id="file9" style="visibility: visible;" /> </td>
74
          </tr>
75
          <tr>
76
            <td width="50%" align="left"><input type="file" size="33" name="file10" id="file10" style="visibility: visible;" /> </td>
77
          </tr>
50 78
        </table>
51 79

  
52 80
        <table cellpadding="3" cellspacing="0" border="0" width="100%">
......
63 91
please set the class below to "hide", else to "show".
64 92
<--->
65 93
      <div class="show">
66
	  	<hr>
94
	  <br /><br />
67 95
        <form name="create" action="create.php" method="post" class="{DISPLAY_CREATE}">
68 96
          <h2>{HEADING_CREATE_FOLDER}</h2>
69 97
          <table cellpadding="3" cellspacing="0" border="0" width="100%">
......
94 122
      </div>
95 123
      <!-- END main_block -->
96 124
    </td>
97
    <td width="480" valign="top" align="right">
98
	<h2>{HEADING_BROWSE_MEDIA}</h2>
125
	<td width="10">&nbsp;</td>
126
    <td width="580" valign="top" align="right">
127
	<h2 style="padding-left:3px;">{HEADING_BROWSE_MEDIA}</h2>
99 128
	<span class="{DISPLAY_SETTINGS}" style="margin-bottom:2px;">{OPTIONS}:&nbsp;
100 129
	<a href="setparameter.php" target="browse">{CHANGE_SETTINGS}</a>&nbsp;&nbsp;|&nbsp;
101 130
	<a href="browse.php?dir={CURRENT_DIR}" target="browse">{TEXT_RELOAD}</a>
102 131
	</span>
103
	<iframe name="browse" width="100%" height="500" src="browse.php" scrolling="yes" frameborder="0" style="border:1px solid #333;"></iframe>
132
	<iframe name="browse" width="99%" height="550" src="browse.php" scrolling="yes" frameborder="0" style="border:1px solid #333;"></iframe>
104 133
    </td>
105 134
  </tr>
106 135
</table>

Also available in: Unified diff