Index: trunk/CHANGELOG =================================================================== --- trunk/CHANGELOG (revision 1040) +++ trunk/CHANGELOG (revision 1041) @@ -12,6 +12,8 @@ ------------------------------------- 2.8.0 ------------------------------------- 07-July-2009 Matthias Gallas +# Fixed some minor bugs in argos_theme (Thanks to Argos) +# Fixed bugs in admin additons for argos_theme (Thanks to Argos) ! Updated Version Number in upgrade_script to 2.8RC1 ! Updated FCKEditor Modul Version Number to 2.89 + added in FCKEditor Advisory Relation to Links (thanks to Luisehahne) Index: trunk/wb/admin/media/browse.php =================================================================== --- trunk/wb/admin/media/browse.php (revision 1040) +++ trunk/wb/admin/media/browse.php (revision 1041) @@ -30,10 +30,11 @@ // Include the WB functions file require_once(WB_PATH.'/framework/functions.php'); +include ('parameters.php'); // Byte convert for filesize function byte_convert($bytes) { - $symbol = array('B', 'KB', 'MB', 'GB', 'TB'); + $symbol = array(' bytes', ' KB', ' MB', ' GB', ' TB'); $exp = 0; $converted_value = 0; if( $bytes > 0 ) { @@ -90,6 +91,10 @@ exit(0); } +if ($_SESSION['GROUP_ID'] != 1 && $pathsettings['global']['admin_only']) { // Only show admin the settings link + $template->set_var('DISPLAY_SETTINGS', 'hide'); +} + // Workout the parent dir link $parent_dir_link = ADMIN_URL.'/media/browse.php?dir='.$directory.'&up=1'; // Workout if the up arrow should be shown @@ -142,6 +147,7 @@ 'LINK' => "browse.php?dir=$directory/$link_name", 'LINK_TARGET' => '', 'ROW_BG_COLOR' => $row_bg_color, + 'FT_ICON' => THEME_URL.'/images/folder_16.png', 'FILETYPE_ICON' => THEME_URL.'/images/folder_16.png', 'MOUSEOVER' => '', 'IMAGEDETAIL' => '', @@ -179,13 +185,14 @@ $imgdetail = ''; $icon = THEME_URL.'/images/blank.gif'; $tooltip = ''; - $pathsettings['global']['show_thumbs'] = ''; + + if (!$pathsettings['global']['show_thumbs']) { $info = getimagesize(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$name); if ($info[0]) { - $imgdetail = fsize(filesize(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$name)).', '.$info[0].'x'.$info[1].'px'; + $imgdetail = fsize(filesize(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$name)).'
'.$info[0].' x '.$info[1].' px'; $icon = 'thumb.php?t=1&img='.$directory.'/'.$name; - $tooltip = ShowTip('thumb.php?t=2&img='.$directory.'/'.$name,$imgdetail); + $tooltip = ShowTip('thumb.php?t=2&img='.$directory.'/'.$name); } } $template->set_var(array( @@ -195,7 +202,7 @@ 'LINK' => WB_URL.MEDIA_DIRECTORY.$directory.'/'.$name, 'LINK_TARGET' => '_blank', 'ROW_BG_COLOR' => $row_bg_color, - 'ICON' => $icon, + 'FT_ICON' => $icon, 'FILETYPE_ICON' => THEME_URL.'/images/files/'.$filetypeicon.'.png', 'MOUSEOVER' => $tooltip, 'IMAGEDETAIL' => $imgdetail, @@ -255,7 +262,7 @@ function ShowTip($name,$detail='') { $ext = strtolower(end(explode(".", $name))); if (strpos('.gif.jpg.jpeg.png.bmp.',$ext) ) - return 'onmouseover="overlib(\'
'.$detail.'
\',VAUTO, WIDTH, 200)" onmouseout="nd()" ' ; + return 'onmouseover="overlib(\'\',VAUTO, WIDTH)" onmouseout="nd()" ' ; else return ''; } @@ -262,7 +269,7 @@ function fsize($size) { if($size == 0) return("0 Bytes"); - $filesizename = array(" Bytes", "kB", "MB", "GB", "TB"); + $filesizename = array(" bytes", " kB", " MB", " GB", " TB"); return round($size/pow(1024, ($i = floor(log($size, 1024)))), 1) . $filesizename[$i]; } ?> \ No newline at end of file Index: trunk/wb/admin/media/upload.php =================================================================== --- trunk/wb/admin/media/upload.php (revision 1040) +++ trunk/wb/admin/media/upload.php (revision 1041) @@ -33,6 +33,9 @@ // Print admin header require('../../config.php'); +include_once('resize_img.php'); +include_once('parameters.php'); + require_once(WB_PATH.'/framework/class.admin.php'); require_once(WB_PATH.'/include/pclzip/pclzip.lib.php'); // Required to unzip file. $admin = new admin('Media', 'media_upload'); @@ -47,6 +50,7 @@ // Create relative path of the target location for the file $relative = WB_PATH.$target.'/'; +$resizepath = str_replace('/','_',$target); // Find out whether we should replace files or give an error if($admin->get_post('overwrite') != '') { @@ -95,6 +99,15 @@ change_mode($relative.$filename); } } + + if(file_exists($relative.$filename)) { + if ($pathsettings[$resizepath]['width'] || $pathsettings[$resizepath]['height'] ) { + $rimg=new RESIZEIMAGE($relative.$filename); + $rimg->resize_limitwh($pathsettings[$resizepath]['width'],$pathsettings[$resizepath]['height'],$relative.$filename); + $rimg->close(); + } + } + // store file name of first file for possible unzip action if ($count == 1) { $filename1 = $relative . $filename; Index: trunk/wb/admin/media/overlib.js =================================================================== --- trunk/wb/admin/media/overlib.js (revision 1040) +++ trunk/wb/admin/media/overlib.js (revision 1041) @@ -36,10 +36,10 @@ // Settings you want everywhere are set here. All of this can also be // changed on your html page or through an overLIB call. //////// -if (typeof ol_fgcolor=='undefined') var ol_fgcolor="#CCCCFF"; -if (typeof ol_bgcolor=='undefined') var ol_bgcolor="#333399"; +if (typeof ol_fgcolor=='undefined') var ol_fgcolor="#ffffff"; +if (typeof ol_bgcolor=='undefined') var ol_bgcolor="#cccccc"; if (typeof ol_textcolor=='undefined') var ol_textcolor="#000000"; -if (typeof ol_capcolor=='undefined') var ol_capcolor="#FFFFFF"; +if (typeof ol_capcolor=='undefined') var ol_capcolor="#000000"; if (typeof ol_closecolor=='undefined') var ol_closecolor="#9999FF"; if (typeof ol_textfont=='undefined') var ol_textfont="Verdana,Arial,Helvetica"; if (typeof ol_captionfont=='undefined') var ol_captionfont="Verdana,Arial,Helvetica"; @@ -49,10 +49,10 @@ if (typeof ol_closesize=='undefined') var ol_closesize="1"; if (typeof ol_width=='undefined') var ol_width="200"; if (typeof ol_border=='undefined') var ol_border="1"; -if (typeof ol_cellpad=='undefined') var ol_cellpad=2; +if (typeof ol_cellpad=='undefined') var ol_cellpad=7; if (typeof ol_offsetx=='undefined') var ol_offsetx=10; if (typeof ol_offsety=='undefined') var ol_offsety=10; -if (typeof ol_text=='undefined') var ol_text="Default Text"; +if (typeof ol_text=='undefined') var ol_text=""; if (typeof ol_cap=='undefined') var ol_cap=""; if (typeof ol_sticky=='undefined') var ol_sticky=0; if (typeof ol_background=='undefined') var ol_background=""; Index: trunk/wb/templates/argos_theme/info.php =================================================================== --- trunk/wb/templates/argos_theme/info.php (revision 1040) +++ trunk/wb/templates/argos_theme/info.php (revision 1041) @@ -12,7 +12,7 @@ * @author Jurgen Nijhuis (Argos Media) & Ruud Eisinga * @copyright GNU General Public License * @license http://www.gnu.org/licenses/gpl.html - * @version 2.80 + * @version 1.1 * @platform Website Baker 2.8 * * Website Baker is free software; you can redistribute it and/or modify @@ -30,7 +30,7 @@ $template_directory = 'argos_theme'; $template_name = 'argos_theme'; $template_function = 'theme'; -$template_version = '2.80'; +$template_version = '1.1'; $template_platform = '2.8'; $template_author = 'Jurgen Nijhuis (Argos Media) & Ruud Eisinga'; $template_license = 'GNU General Public License'; Index: trunk/wb/templates/argos_theme/images/flags/index.php =================================================================== --- trunk/wb/templates/argos_theme/images/flags/index.php (revision 1040) +++ trunk/wb/templates/argos_theme/images/flags/index.php (revision 1041) @@ -12,7 +12,7 @@ * @author Jurgen Nijhuis (Argos Media) & Ruud Eisinga * @copyright GNU General Public License * @license http://www.gnu.org/licenses/gpl.html - * @version 2.80 + * @version 1.1 * @platform Website Baker 2.8 * * Website Baker is free software; you can redistribute it and/or modify Index: trunk/wb/templates/argos_theme/images/index.php =================================================================== --- trunk/wb/templates/argos_theme/images/index.php (revision 1040) +++ trunk/wb/templates/argos_theme/images/index.php (revision 1041) @@ -12,7 +12,7 @@ * @author Jurgen Nijhuis (Argos Media) & Ruud Eisinga * @copyright GNU General Public License * @license http://www.gnu.org/licenses/gpl.html - * @version 2.80 + * @version 1.1 * @platform Website Baker 2.8 * * Website Baker is free software; you can redistribute it and/or modify Index: trunk/wb/templates/argos_theme/languages/index.php =================================================================== --- trunk/wb/templates/argos_theme/languages/index.php (revision 1040) +++ trunk/wb/templates/argos_theme/languages/index.php (revision 1041) @@ -12,7 +12,7 @@ * @author Jurgen Nijhuis (Argos Media) & Ruud Eisinga * @copyright GNU General Public License * @license http://www.gnu.org/licenses/gpl.html - * @version 2.80 + * @version 1.1 * @platform Website Baker 2.8 * * Website Baker is free software; you can redistribute it and/or modify Index: trunk/wb/templates/argos_theme/theme.css =================================================================== --- trunk/wb/templates/argos_theme/theme.css (revision 1040) +++ trunk/wb/templates/argos_theme/theme.css (revision 1041) @@ -81,7 +81,7 @@ .pages_list .icon_col td img {display:block;border-style:none;float:left;padding-right:7px;} .pages_list table {width:900px;} .pages_list table td {} -.pages_list ul {margin:0;font-weight:normal;} +.pages_list ul {margin:0;font-weight:normal;padding: 0;} .pages_list ul li {list-style-type:none;margin:2px 0;} table.pages_view {width:900px;background-color:#f0f0f0;} @@ -92,8 +92,8 @@ .page_list_show li {display:block;} img.page_list_rights {border:none;float:left;margin:0;} -.header_list_page_title {width:414px;padding-left: 24px;text-align:left;} -.header_list_menu_title {width:326px;text-align:left;} +.header_list_page_title {width:396px;text-align:left;} +.header_list_menu_title {width:328px;text-align:left;} .header_list_actions {text-align:left;} .list_page_title {width:350px;text-align:left;} Index: trunk/wb/templates/argos_theme/icons/index.php =================================================================== --- trunk/wb/templates/argos_theme/icons/index.php (revision 1040) +++ trunk/wb/templates/argos_theme/icons/index.php (revision 1041) @@ -12,7 +12,7 @@ * @author Jurgen Nijhuis (Argos Media) & Ruud Eisinga * @copyright GNU General Public License * @license http://www.gnu.org/licenses/gpl.html - * @version 2.80 + * @version 1.1 * @platform Website Baker 2.8 * * Website Baker is free software; you can redistribute it and/or modify Index: trunk/wb/templates/argos_theme/index.php =================================================================== --- trunk/wb/templates/argos_theme/index.php (revision 1040) +++ trunk/wb/templates/argos_theme/index.php (revision 1041) @@ -12,7 +12,7 @@ * @author Jurgen Nijhuis (Argos Media) & Ruud Eisinga * @copyright GNU General Public License * @license http://www.gnu.org/licenses/gpl.html - * @version 2.80 + * @version 1.1 * @platform Website Baker 2.8 * * Website Baker is free software; you can redistribute it and/or modify Index: trunk/wb/templates/argos_theme/templates/header.htt =================================================================== --- trunk/wb/templates/argos_theme/templates/header.htt (revision 1040) +++ trunk/wb/templates/argos_theme/templates/header.htt (revision 1041) @@ -21,7 +21,7 @@

CMS version {VERSION}
- Admin version 1.0 + Admin version 1.1

{WEBSITE_TITLE} - {TEXT_ADMINISTRATION}

Index: trunk/wb/templates/argos_theme/templates/index.php =================================================================== --- trunk/wb/templates/argos_theme/templates/index.php (revision 1040) +++ trunk/wb/templates/argos_theme/templates/index.php (revision 1041) @@ -12,7 +12,7 @@ * @author Jurgen Nijhuis (Argos Media) & Ruud Eisinga * @copyright GNU General Public License * @license http://www.gnu.org/licenses/gpl.html - * @version 2.80 + * @version 1.1 * @platform Website Baker 2.8 * * Website Baker is free software; you can redistribute it and/or modify Index: trunk/wb/templates/argos_theme/templates/media_browse.htt =================================================================== --- trunk/wb/templates/argos_theme/templates/media_browse.htt (revision 1040) +++ trunk/wb/templates/argos_theme/templates/media_browse.htt (revision 1041) @@ -26,7 +26,7 @@ - + {NAME}
{IMAGEDETAIL} Index: trunk/wb/templates/argos_theme/templates/media.htt =================================================================== --- trunk/wb/templates/argos_theme/templates/media.htt (revision 1040) +++ trunk/wb/templates/argos_theme/templates/media.htt (revision 1041) @@ -1,10 +1,23 @@ - - - - + +
-
+

{HEADING_UPLOAD_FILES}

@@ -24,29 +37,44 @@
- + - + - + - + - + + + + - + - + - + + + + + + +
+ + + +
@@ -63,7 +91,7 @@ please set the class below to "hide", else to "show". <--->
-
+

{HEADING_CREATE_FOLDER}

@@ -94,13 +122,14 @@ - +
-

{HEADING_BROWSE_MEDIA}

+ 		  +

{HEADING_BROWSE_MEDIA}

{OPTIONS}:  {CHANGE_SETTINGS}  |  {TEXT_RELOAD} - +