Index: trunk/themes/default2007/platform/designs/side_boxes.tpl =================================================================== diff -u -N -r8496 -r8693 --- trunk/themes/default2007/platform/designs/side_boxes.tpl (.../side_boxes.tpl) (revision 8496) +++ trunk/themes/default2007/platform/designs/side_boxes.tpl (.../side_boxes.tpl) (revision 8693) @@ -1,12 +1,12 @@ - - Index: trunk/themes/default2007/platform/elements/side_boxes/login.tpl =================================================================== diff -u -N -r8599 -r8693 --- trunk/themes/default2007/platform/elements/side_boxes/login.tpl (.../login.tpl) (revision 8599) +++ trunk/themes/default2007/platform/elements/side_boxes/login.tpl (.../login.tpl) (revision 8693) @@ -85,7 +85,7 @@ img/s.gif" alt="" width="5" height="5" border="0" />
-
+
Index: trunk/core/kernel/utility/formatters/upload_formatter.php =================================================================== diff -u -N -r8686 -r8693 --- trunk/core/kernel/utility/formatters/upload_formatter.php (.../upload_formatter.php) (revision 8686) +++ trunk/core/kernel/utility/formatters/upload_formatter.php (.../upload_formatter.php) (revision 8693) @@ -84,43 +84,34 @@ return getArrayValue($value, 'upload'); } - if ( is_array($value) && $value['size'] ) - { - if ( is_array($value) && $value['error'] === UPLOAD_ERR_OK ) - { - if ( getArrayValue($options, 'allowed_types') && !in_array($value['type'], $options['allowed_types']) ) - { + if (is_array($value) && count($value) > 1 && $value['size']) { + if (is_array($value) && $value['error'] === UPLOAD_ERR_OK) { + $max_filesize = isset($options['max_size']) ? $options['max_size'] : MAX_UPLOAD_SIZE; + + if (getArrayValue($options, 'allowed_types') && !in_array($value['type'], $options['allowed_types'])) { $object->FieldErrors[$field_name]['pseudo'] = 'bad_file_format'; } - elseif ( $value['size'] > ($options['max_size'] ? $options['max_size'] : MAX_UPLOAD_SIZE) ) - { + elseif ($value['size'] > $max_filesize) { $object->FieldErrors[$field_name]['pseudo'] = 'bad_file_size'; } - elseif ( !is_writable($this->FullPath) ) - { + elseif (!is_writable($this->FullPath)) { $object->FieldErrors[$field_name]['pseudo'] = 'cant_save_file'; } - else - { + else { $real_name = $this->ValidateFileName($this->FullPath, $value['name']); $file_name = $this->FullPath.$real_name; - if ( !move_uploaded_file($value['tmp_name'], $file_name) ) - { + if (!move_uploaded_file($value['tmp_name'], $file_name)) { $object->FieldErrors[$field_name]['pseudo'] = 'cant_save_file'; } - else - { + else { @chmod($file_name, 0666); - if(getArrayValue($options, 'size_field')) - { + if (getArrayValue($options, 'size_field')) { $object->SetDBField($options['size_field'], $value['size']); } - if(getArrayValue($options, 'orig_name_field')) - { + if (getArrayValue($options, 'orig_name_field')) { $object->SetDBField($options['orig_name_field'], $value['name']); } - if(getArrayValue($options, 'content_type_field')) - { + if (getArrayValue($options, 'content_type_field')) { $object->SetDBField($options['content_type_field'], $value['type']); } $ret = getArrayValue($options, 'upload_dir') ? $real_name : $this->DestinationPath.$real_name; @@ -133,21 +124,17 @@ } } } - else - { + else { $object->FieldErrors[$field_name]['pseudo'] = 'cant_save_file'; } } - else - { - if(getArrayValue($options, 'required')) - { + else { + if (getArrayValue($options, 'required')) { $object->FieldErrors[$field_name]['pseudo'] = 'required'; } } - if ($value['error'] && !( $value['error'] == UPLOAD_ERR_NO_FILE ) && !$object->FieldErrors[$field_name]['pseudo']) - { + if ((count($value) > 1) && $value['error'] && ($value['error'] != UPLOAD_ERR_NO_FILE) && !$object->FieldErrors[$field_name]['pseudo']) { $object->FieldErrors[$field_name]['pseudo'] = 'cant_save_file'; } Index: trunk/themes/default2007/platform/inc/styles_old.css =================================================================== diff -u -N --- trunk/themes/default2007/platform/inc/styles_old.css (revision 8632) +++ trunk/themes/default2007/platform/inc/styles_old.css (revision 0) @@ -1,501 +0,0 @@ -html, body { - margin:0px; - padding:0px; - height:100%; - border:none; - font: 9pt arial; - color: #000000; -} - -.fullwidth - { - width:100%; - } - -/*----------------------------------------------------------------------------------------------------*/ -/* ------------------------------------------- Site Styles -------------------------------------------*/ - -TD { font: 11px arial, serif; color: #000; margin: 0px; padding: 0px; /* border: 1px solid #000000; */ } - -table { margin: 0px; padding: 0px; /*border: 0px;*/ border-collapse:collapse; } - - -IMG, IMG A {border: 0px} - -A:hover {text-decoration: underline; color: #FF9900} -A {color: #315faa; text-decoration: underline} - - -.hor-line - { - background:url(../img/dashed_line.gif) bottom repeat-x; - } - - -table.markup_table { - border-collapse: collapse; - width: 100%; -} - -table.markup_table td { - /*border: 1px solid #000000;*/ -} - -.error { - color: #FF0000; -} - -form { - display: inline; -} - - -.top-background - { - background:url(../img/top_background.gif) right repeat-y; - } - -.top-menu - { - background:url(../img/menu_background.gif) top repeat-x #1865ac; - } - -.languages-paddings - { - padding:0px 15px; - } - -.side-boxes-title - { - background:url(../img/side_boxes_background.gif) bottom repeat-x #83afd6; - height:29px; - padding:0px 8px 0px 20px; - font-size:12px; - color:#FFFFFF; - } - -.side-boxes-title A - { - font-size:12px; - color:#FFFFFF; - text-decoration:underline; - } - -.side-boxes-title A:hover - { - font-size:12px; - color:#ffdc0e; - } - -.input-text - { - background: url(../img/input_text_background.gif) top repeat-x #FFFFFF; - border:1px solid #7091b9; - font-family:Arial, Helvetica, sans-serif; - font-size:10px; - } -<<<<<<< styles.css - -.input-textarea - { - background: url(../img/input_text_background.gif) top repeat-x #FFFFFF; - border:1px solid #7091b9; - font-family:Arial, Helvetica, sans-serif; - font-size:10px; - overflow:auto; - } - -.field-name - { - padding:5px 15px; - } - -.field-value - { - padding:6px 5px; - } - -.field-required - { - color:#FF0000; - } - -.field-error - { - color:#CC0000; - font-size:10px; - } - -.warning-cell TD - { - padding:5px; - background:#ffe5e6; - font-size:16px; - } - -.field-caption - { - color:#2e5679; - font-weight:bold; - font-size:11px; - } - -======= - ->>>>>>> 1.7 -.button - { - background:url(../img/input_button_background.gif) bottom repeat-x #efefef; - border: 1px solid #688bac; - padding:0px; - font-size:11px; - padding:0px 5px; - /* - width: auto; - overflow: visible; - */ - } - -a.blue-small-link - { - font-size:10px; - color:#197aca; - text-decoration:underline; - } - -a.blue-small-link:hover - { - font-size:10px; - color: #005ca8; - text-decoration:none; - } - -.remember-login - { - color:#000000; - font-size:9px; - } - -.paddnig-right - { - padding-right:8px; - } - -.side-title - { - font-size:12px; - color:#FFFFFF; - } - -.login-text - { - font-size:10px; - color:#FFFFFF; - } - -.login-text A - { - color:#FFFFFF; - text-decoration:underline; - } - -.login-text A:hover - { - color:#FFFFFF; - text-decoration: none; - } - -.vertical-dashed-line - { - background:url(../img/vertical_dashed_line.gif) top center repeat-y; - } - -.side-boxes-content - { - background:url(../img/side_boxes_content.gif) top repeat-x; - padding:20px 20px; - } - -.content-boxes-title - { - background:#f0f5fa; - height:29px; - padding:0px 20px; - font-size:15px; - color:#000000; - } - -.navigation-bar - { - background:url(../img/side_boxes_background.gif) bottom repeat-x #83afd6; - height:29px; - padding:0px 20px; - font-size:12px; - color:#FFFFFF; - } - -.navigation-bar A - { - text-decoration:underline; - color:#FFFFFF; - } - -.navigation-bar A:hover - { - text-decoration: none; - color: #CCCCCC; - } - -.content-boxes-content - { - background: #FFFFFF; - padding:20px 20px 0px 20px; - } - - - -.menu-top-active-icon - { - background:url(../img/top_menu_select.gif); - height:37px; - padding:0px 5px 0px 13px; - } - -.menu-top-active-text - { - background:url(../img/top_menu_select.gif); - height:37px; - padding:0px 13px 0px 3px; - white-space:nowrap; - } - - -.menu-top-noactive-icon - { - height:37px; - padding:0px 5px 0px 13px; - white-space:nowrap - } -<<<<<<< styles.css - -.menu-top-noactive-text -======= - -.menu-top-noactive ->>>>>>> 1.7 - { - height:37px; -<<<<<<< styles.css - padding:0px 13px 0px 3px; -======= - padding:0px 13px; ->>>>>>> 1.7 - white-space:nowrap - } -<<<<<<< styles.css - - -.menu-top-active-text A -======= - -.menu-top-active A ->>>>>>> 1.7 - { - font-size:11px; - color:#FFFFFF; - text-decoration:none; -<<<<<<< styles.css - } - -.menu-top-active-text A:hover -======= - } - -.menu-top-active A:hover ->>>>>>> 1.7 - { - font-size:11px; - color: #CCCCCC; - text-decoration:none; -<<<<<<< styles.css - } - -.menu-top-noactive-text A -======= - } - -.menu-top-noactive A ->>>>>>> 1.7 - { - font-size:11px; - color:#FFFFFF; - text-decoration:none; -<<<<<<< styles.css - } - -.menu-top-noactive-text A:hover -======= - } - -.menu-top-noactive A:hover ->>>>>>> 1.7 - { - font-size:11px; - color: #CCCCCC; - text-decoration:none; - } - -.footer-blue - { - background:url(../img/footer_blue.gif) top repeat-x; - height:26px; - color:#f7eee4; - font-size:10px; - padding:0px 10px; - } - -.footer-links - { - text-align:right; - padding:5px 10px; - } - -.padding-reg - { - padding:10px; - } - - -.footer-links A - { - color:#333333; - font-size:10px; - text-decoration:underline; - } - -.footer-links A:hover - { - color: #666666; - text-decoration: none; - } - -a.details_grey - { - font-size:9px; - color:#666666; - text-decoration:none; - } - -a.details_grey:hover - { - color:#000000; - text-decoration:none; - } - -.directory-icon - { - width:22px; - vertical-align:top; - padding:5px; - } - -.directory-text - { - padding:5px 20px 5px 5px; - } - -.gradient-background - { - background:url(../img/gradient_background.gif) top repeat-x #FFFFFF; - } - -.pagenation-select - { - background: #5b97cb; - color:#FFFFFF; - padding:1px 2px; - } - -a.pagenation-noselect - { - color:#000000; - text-decoration:none; - } - -.link-picture-padding - { - padding:20px 5px 20px 20px; - vertical-align:top; - width:120px; - } - -.link-text-padding - { - padding:20px 5px; - } - - -.articles-icon-cell - { - width:22px; - padding-top:5px; - vertical-align:top; - padding-right:7px; - } - -.small-black - { - font-size:10px; - } - -a.text-title - { - font-size:12px; - font-weight:bold; - color:#1769b5; - text-decoration:underline; - } - -a.text-title:hover - { - color: #005695; - text-decoration:underline; - } - -.text-title - { - font-size:12px; - font-weight:bold; - color:#1769b5; - } - -.text-grey - { - font-size:10px; - color:#666666; - } - - - -.article-picture-padding - { - padding:0px 20px 0px 30px; - width:120px; - vertical-align:top - } - - - - - - - - - - - - -.not-dynamic - { - color:#00CC66; - } \ No newline at end of file Index: trunk/themes/default2007/phrases_edit.tpl =================================================================== diff -u -N -r8599 -r8693 --- trunk/themes/default2007/phrases_edit.tpl (.../phrases_edit.tpl) (revision 8599) +++ trunk/themes/default2007/phrases_edit.tpl (.../phrases_edit.tpl) (revision 8693) @@ -17,10 +17,10 @@ -
+
- *
+ *
+
+
Index: trunk/themes/default2007/platform/my_account/my_profile.tpl =================================================================== diff -u -N -r8639 -r8693 --- trunk/themes/default2007/platform/my_account/my_profile.tpl (.../my_profile.tpl) (revision 8639) +++ trunk/themes/default2007/platform/my_account/my_profile.tpl (.../my_profile.tpl) (revision 8693) @@ -16,7 +16,7 @@ - *

+ *

Index: trunk/themes/default2007/platform/inc/styles.css =================================================================== diff -u -N -r8668 -r8693 --- trunk/themes/default2007/platform/inc/styles.css (.../styles.css) (revision 8668) +++ trunk/themes/default2007/platform/inc/styles.css (.../styles.css) (revision 8693) @@ -1,159 +1,152 @@ +/* --- Golbal Usage Styles --- */ html, body { - margin:0px; - padding:0px; - height:100%; - border:none; - font: 9pt arial; + margin: 0px; + padding: 0px; + height: 100%; + border: none; + font: 9pt Arial; color: #000000; } -.fullwidth - { - width:100%; - } +.fullwidth { + width: 100%; +} -/*----------------------------------------------------------------------------------------------------*/ -/* ------------------------------------------- Site Styles -------------------------------------------*/ +table { + margin: 0px; + padding: 0px; + border-collapse: collapse; +} -TD { font: 11px arial, serif; color: #000; margin: 0px; padding: 0px; /* border: 1px solid #000000; */ } +td { + font: 11px Arial, serif; + color: #000000; + margin: 0px; + padding: 0px; +} -table { margin: 0px; padding: 0px; /*border: 0px;*/ border-collapse:collapse; } +img, img A { + border: 0px; +} +A:hover { + color: #FF9900; +} -IMG, IMG A {border: 0px} +A { + color: #315FAA; +} -A:hover {text-decoration: underline; color: #FF9900} -A {color: #315faa; text-decoration: underline} +.hor-line { + background: url(../img/dashed_line.gif) bottom repeat-x; +} -.input-select - { - color: #333333; - font-size:11px; - } - - - -.hor-line - { - background:url(../img/dashed_line.gif) bottom repeat-x; - } - - table.markup_table { border-collapse: collapse; width: 100%; } -table.markup_table td { - /*border: 1px solid #000000;*/ -} - .error { - color: #FF0000; + color: magenta; } form { display: inline; } -.top-background - { - background:url(../img/top_background.gif) right repeat-y; - } +.top-background { + background: url(../img/top_background.gif) right repeat-y; +} -.top-menu - { - background:url(../img/menu_background.gif) top repeat-x #1865ac; +.top-menu { + background: url(../img/menu_background.gif) top repeat-x #1865AC; width: 100%; - } +} -.languages-paddings - { - padding:0px 15px; - } +.languages-paddings { + padding: 0px 15px; +} -.side-boxes-title - { - background:url(../img/side_boxes_background.gif) bottom repeat-x #83afd6; - height:29px; - padding:0px 8px 0px 20px; - font-size:12px; - color:#FFFFFF; - } -.side-boxes-title A - { - font-size:12px; - color:#FFFFFF; - text-decoration:underline; - } +/* --- Side Box Styles --- */ +.side-box-title { + background: url(../img/side_boxes_background.gif) bottom repeat-x #83AFD6; + height: 29px; + padding: 0px 8px 0px 20px; + font-size: 12px; + color: #FFFFFF; +} -.side-boxes-title A:hover - { - font-size:12px; - color:#ffdc0e; - } +.side-box-title A { + font-size: 12px; + color: #FFFFFF; + text-decoration: underline; +} -.input-text - { - background: url(../img/input_text_background.gif) top repeat-x #FFFFFF; - border:1px solid #7091b9; - font-family:Arial, Helvetica, sans-serif; - font-size:11px; - } +.side-box-title A:hover { + font-size: 12px; + color: #FFDC0E; +} -.input-textarea - { +.side-box-content { + background: url(../img/side_boxes_content.gif) top repeat-x; + padding: 20px 20px; +} + +/* --- Form Control Styles --- */ +.input-text, .input-textarea { background: url(../img/input_text_background.gif) top repeat-x #FFFFFF; - border:1px solid #7091b9; - font-family:Arial, Helvetica, sans-serif; - font-size:10px; - overflow:auto; - } + border: 1px solid #7091B9; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; +} +.input-textarea { + overflow: auto; +} -.blue-table-header TD - { - padding:6px; - color:#21619e; - } +.input-select { + color: #333333; + font-size: 11px; +} -.field-name - { - padding:5px 15px; - } +/* --- Form Field Styles --- */ +.field-name { + padding: 5px 15px; -.field-value - { - padding:6px 5px; - } + color: #2E5679; + font-weight: bold; + font-size: 11px; +} -.field-required - { - color:#FF0000; - } +.field-required { + color: #FF0000; +} -.field-error - { - color:#CC0000; - font-size:10px; - } +.field-hint { + color: #000000; + font-size: 10px; +} -.warning-cell TD - { - padding:5px; - background:#ffe5e6; - font-size:16px; - } +.field-error { + color: #CC0000; + font-size: 10px; +} -.field-caption - { - color:#2e5679; - font-weight:bold; - font-size:11px; - } +.field-value { + padding: 6px 5px; +} +.warning-message td { + padding: 5px; + background: #FFE5E6; + font-size: 16px; +} + + + + .button { background:url(../img/input_button_background.gif) bottom repeat-x #efefef; @@ -221,12 +214,6 @@ background:url(../img/vertical_dashed_line.gif) top center repeat-y; } -.side-boxes-content - { - background:url(../img/side_boxes_content.gif) top repeat-x; - padding:20px 20px; - } - .content-boxes-title { background:#f0f5fa; @@ -462,8 +449,8 @@ width:120px; vertical-align:top } - + .forums-icon-description TD { padding:10px; @@ -489,8 +476,8 @@ .not-dynamic { color:#00CC66; } - - + + /* ---- Calendar ---- */ .calendar { @@ -587,5 +574,10 @@ margin: 0px; } -/* ---- /Calendar ---- */ - \ No newline at end of file +/* ---- /Calendar ---- */ + +.blue-table-header TD + { + padding:6px; + color:#21619E; + } Index: trunk/themes/default2007/platform/categories/suggest_category.tpl =================================================================== diff -u -N -r8599 -r8693 --- trunk/themes/default2007/platform/categories/suggest_category.tpl (.../suggest_category.tpl) (revision 8599) +++ trunk/themes/default2007/platform/categories/suggest_category.tpl (.../suggest_category.tpl) (revision 8693) @@ -18,11 +18,11 @@ + *

+ -
+ - - *
Index: trunk/themes/default2007/platform/elements/forms.tpl =================================================================== diff -u -N -r8686 -r8693 --- trunk/themes/default2007/platform/elements/forms.tpl (.../forms.tpl) (revision 8686) +++ trunk/themes/default2007/platform/elements/forms.tpl (.../forms.tpl) (revision 8693) @@ -1,10 +1,10 @@ -
+
- @@ -27,7 +27,7 @@ @@ -43,6 +43,17 @@ + + "> + + + + + + "> @@ -121,7 +132,7 @@ " id="" value="" tabindex="" size="" style="" datepickerIcon="img/calendar_icon.gif"> () " id="" value="" /> @@ -155,7 +166,7 @@ " id="" value="" tabindex="" size="" style="" datepickerIcon="core/admin_templates/img/calendar_icon.gif"> ()  " id="" value="" tabindex="" size="" style=""> () Index: trunk/themes/default2007/platform/login/register.tpl =================================================================== diff -u -N -r8599 -r8693 --- trunk/themes/default2007/platform/login/register.tpl (.../register.tpl) (revision 8599) +++ trunk/themes/default2007/platform/login/register.tpl (.../register.tpl) (revision 8693) @@ -13,7 +13,7 @@ - *

+ *

img/warning_icon.gif" width="21" height="18" alt=""/> +
+ + " value="" /> +