diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 060f1d387c7..aab33fa56d2 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -857,9 +857,16 @@ class FormFile { if (image_format_supported($file['name']) > 0) { - // TODO Add link from photo page here - + $permtoedit=0; + if ($user->rights->produit->creer && $object->type == Product::TYPE_PRODUCT) $permtoedit=1; + if ($user->rights->service->creer && $object->type == Product::TYPE_SERVICE) $permtoedit=1; + if (empty($conf->global->MAIN_UPLOAD_DOC)) $permtoedit=0; + if ($permtoedit) + { + // Link to resize + print ''.img_picto($langs->trans("Resize"),DOL_URL_ROOT.'/theme/common/transform-crop-and-resize','',1).'   '; + } } } if ($permtodelete) diff --git a/htdocs/core/js/lib_photosresize.js b/htdocs/core/js/lib_photosresize.js index 6847de0bd54..3463b82931f 100644 --- a/htdocs/core/js/lib_photosresize.js +++ b/htdocs/core/js/lib_photosresize.js @@ -40,11 +40,3 @@ function updateCoords(c) jQuery('#w').val(Math.ceil(c.w * ratio)); jQuery('#h').val(Math.ceil(c.h * ratio)); }; - -/* checkCoords */ -function checkCoords() -{ - if (parseInt(jQuery('#w').val())) return true; - alert('Please select a crop region then press submit.'); - return false; -}; diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php index e6a84657d87..ff2e9c14dbe 100644 --- a/htdocs/core/lib/product.lib.php +++ b/htdocs/core/lib/product.lib.php @@ -114,10 +114,12 @@ function product_prepare_head($object) // $this->tabs = array('entity:-tabname); to remove a tab complete_head_from_modules($conf,$langs,$object,$head,$h,'product'); + /* Merged into the Join files tab $head[$h][0] = DOL_URL_ROOT."/product/photos.php?id=".$object->id; $head[$h][1] = $langs->trans("Photos"); $head[$h][2] = 'photos'; $h++; + */ // Attachments require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php index 80f849a0494..9a3f69ac6c1 100644 --- a/htdocs/core/photos_resize.php +++ b/htdocs/core/photos_resize.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2010-2015 Laurent Destailleur * Copyright (C) 2009 Meos * Copyright (C) 2012 Regis Houssin * @@ -46,6 +46,8 @@ $id=GETPOST('id','int'); $action=GETPOST('action','alpha'); $modulepart=GETPOST('modulepart','alpha')?GETPOST('modulepart','alpha'):'produit|service'; $original_file = isset($_REQUEST["file"])?urldecode($_REQUEST["file"]):''; +$backtourl=GETPOST('backtourl'); +$cancel=GETPOST("cancel"); // Security check if (empty($modulepart)) accessforbidden('Bad value for modulepart'); @@ -78,6 +80,20 @@ if ($id > 0) * Actions */ +if ($cancel) +{ + if ($backtourl) + { + header("Location: ".$backtourl); + exit; + } + else + { + header("Location: ".DOL_URL_ROOT."/product/document.php?id=".$id.'&file='.urldecode($_POST["file"])); + exit; + } +} + if ($action == 'confirm_resize' && (isset($_POST["file"]) != "") && (isset($_POST["sizex"]) != "") && (isset($_POST["sizey"]) != "")) { $fullpath=$dir."/".$original_file; @@ -85,13 +101,24 @@ if ($action == 'confirm_resize' && (isset($_POST["file"]) != "") && (isset($_POS if ($result == $fullpath) { - header("Location: ".DOL_URL_ROOT."/product/photos.php?id=".$id.'&action=addthumb&file='.urldecode($_POST["file"])); - exit; + $object->add_thumb($fullpath); + + if ($backtourl) + { + header("Location: ".$backtourl); + exit; + } + else + { + header("Location: ".DOL_URL_ROOT."/product/document.php?id=".$id.'&file='.urldecode($_POST["file"])); + exit; + } } else { - $mesg=$result; + setEventMessage($result, 'errors'); $_GET['file']=$_POST["file"]; + $action=''; } } @@ -103,13 +130,24 @@ if ($action == 'confirm_crop') if ($result == $fullpath) { - header("Location: ".DOL_URL_ROOT."/product/photos.php?id=".$id.'&action=addthumb&file='.urldecode($_POST["file"])); - exit; + $object->add_thumb($fullpath); + + if ($backtourl) + { + header("Location: ".$backtourl); + exit; + } + else + { + header("Location: ".DOL_URL_ROOT."/product/document.php?id=".$id.'&file='.urldecode($_POST["file"])); + exit; + } } else { - $mesg=$result; + setEventMessage($result, 'errors'); $_GET['file']=$_POST["file"]; + $action=''; } } @@ -123,8 +161,6 @@ llxHeader($head, $langs->trans("Image"), '', '', 0, 0, array('/includes/jquery/p print_fiche_titre($langs->trans("ImageEditor")); -if ($mesg) print '
'.$mesg.'
'; - $infoarray=dol_getImageSize($dir."/".urldecode($_GET["file"])); $height=$infoarray['height']; $width=$infoarray['width']; @@ -133,6 +169,11 @@ print $langs->trans("Width").': '.$width.' x '.$langs->trans("H print '
'."\n"; + +/* + * Resize image + */ + print ''."\n"; print '
'; @@ -145,11 +186,15 @@ print ''; print ''; print ''; print ''; -print '
'; +print '
'; +print ''; +print ' '; +print ''; print ''."\n"; print '
'; print '
'."\n"; + /* * Crop image */ @@ -168,7 +213,7 @@ if (! empty($conf->use_javascript_ajax)) $refsizeforcrop='screenwidth'; $ratioforcrop=2; } - + print ''."\n"; print '
'; print ''.$langs->trans("Recenter").''; @@ -178,7 +223,7 @@ if (! empty($conf->use_javascript_ajax)) print ''; print ''; print '
'; - print '
+ print '
'.$langs->trans("NewSizeAfterCropping").': @@ -188,19 +233,33 @@ if (! empty($conf->use_javascript_ajax))
- + -
+
+ +   +
'."\n"; print '
'."\n"; print '
'; } +/* Check that mandatory fields are filled */ +print ''; llxFooter(); $db->close(); diff --git a/htdocs/product/photos.php b/htdocs/product/photos.php deleted file mode 100644 index f1fd687890d..00000000000 --- a/htdocs/product/photos.php +++ /dev/null @@ -1,215 +0,0 @@ - - * Copyright (C) 2004-2014 Laurent Destailleur - * Copyright (C) 2005 Eric Seigne - * Copyright (C) 2005-2012 Regis Houssin - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * \file htdocs/product/photos.php - * \ingroup product - * \brief Onglet photos de la fiche produit - */ - -require '../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; - -$langs->load("products"); -$langs->load("bills"); - -$id = GETPOST('id', 'int'); -$ref = GETPOST('ref', 'alpha'); -$action = GETPOST('action', 'alpha'); -$confirm = GETPOST('confirm', 'alpha'); - -// Security check -$fieldvalue = (! empty($id) ? $id : (! empty($ref) ? $ref : '')); -$fieldtype = (! empty($ref) ? 'ref' : 'rowid'); -if ($user->societe_id) $socid=$user->societe_id; -$result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype); - -$mesg = ''; - -$object = new Product($db); -if ($id > 0 || ! empty($ref)) -{ - $result = $object->fetch($id, $ref); - $dir = (! empty($conf->product->multidir_output[$object->entity])?$conf->product->multidir_output[$object->entity]:$conf->service->multidir_output[$object->entity]); -} - - -/* - * Actions - */ - -if (isset($_FILES['userfile']) && $_FILES['userfile']['size'] > 0 && GETPOST('sendit') && ! empty($conf->global->MAIN_UPLOAD_DOC)) -{ - if ($object->id) - { - if (image_format_supported($_FILES['userfile']['name']) >= 1) - { - $result = $object->add_photo($dir, $_FILES['userfile']); - if ($result > 0) setEventMessage($langs->trans("FileUploaded")); - else setEventMessage($langs->trans("FileNotUploaded"), 'errors'); - } - else - { - $langs->load("errors"); - setEventMessage($langs->trans("ErrorBadImageFormat"), 'errors'); - } - } -} - -if ($action == 'confirm_delete' && $_GET["file"] && $confirm == 'yes' && ($user->rights->produit->creer || $user->rights->service->creer)) -{ - $object->delete_photo($dir."/".$_GET["file"]); -} - -if ($action == 'addthumb' && $_GET["file"]) -{ - $object->add_thumb($dir."/".$_GET["file"]); -} - - -/* - * View - */ - -$form = new Form($db); - -if ($object->id) -{ - llxHeader("","",$langs->trans("CardProduct".$object->type)); - - /* - * En mode visu - */ - $head=product_prepare_head($object); - $titre=$langs->trans("CardProduct".$object->type); - $picto=($object->type== Product::TYPE_SERVICE?'service':'product'); - dol_fiche_head($head, 'photos', $titre, 0, $picto); - - /* - * Confirmation de la suppression de photo - */ - if ($action == 'delete') - { - print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&file='.$_GET["file"], $langs->trans('DeletePicture'), $langs->trans('ConfirmDeletePicture'), 'confirm_delete', '', 0, 1); - - } - - print($mesg); - - print ''; - - // Reference - print ''; - print ''; - print ''; - - // Libelle - print ''; - print ''; - - // Status (to sell) - print ''; - - // Status (to buy) - print ''; - - print "
'.$langs->trans("Ref").''; - print $form->showrefnav($object,'ref','',1,'ref'); - print '
'.$langs->trans("Label").''.$object->label.'
'.$langs->trans("Status").' ('.$langs->trans("Sell").')'; - print $object->getLibStatut(2,0); - print '
'.$langs->trans("Status").' ('.$langs->trans("Buy").')'; - print $object->getLibStatut(2,1); - print '
\n"; - - print "\n"; - - - $permtoedit=0; - if ($user->rights->produit->creer && $object->type == Product::TYPE_PRODUCT) $permtoedit=1; - if ($user->rights->service->creer && $object->type == Product::TYPE_SERVICE) $permtoedit=1; - if (empty($conf->global->MAIN_UPLOAD_DOC)) $permtoedit=0; - - /* ************************************************************************** */ - /* */ - /* Barre d'action */ - /* */ - /* ************************************************************************** */ -/* - print "\n
\n"; - - if ($action != 'ajout_photo' && ($user->rights->produit->creer || $user->rights->service->creer)) - { - if (! empty($conf->global->MAIN_UPLOAD_DOC)) - { - print 'id.'">'; - print $langs->trans("AddPhoto").''; - } - else - { - print 'e'; - print $langs->trans("AddPhoto").''; - } - } - - print "\n
\n"; -*/ - /* - * Add a photo - */ - if ($permtoedit) - { - // Show upload form - $formfile=new FormFile($db); - $formfile->form_attach_new_file($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans("AddPhoto"), 1, 0, $permtoedit, 50, $object, '', false, '', 0); // ajax=false for the moment. true may not work. - } - //else print $langs->trans("NoPermissionToAddOrEditPhoto").'

'; // TODO Add this - - // Affiche photos - if ($action != 'ajout_photo') - { - $nbphoto=0; - $nbbyrow=5; - - $maxWidth = 160; - $maxHeight = 120; - - print $object->show_photos($dir,1,1000,$nbbyrow,1,($permtoedit?1:0)); - - if ($object->nbphoto < 1) - { - print ''; - print ''; - print '
'; - print "
".$langs->trans("NoPhotoYet")."

"; - print '
'; - } - } -} -else -{ - print $langs->trans("ErrorUnknown"); -} - - -llxFooter(); -$db->close(); diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 94a5b0f9dd1..85153272e40 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -2043,6 +2043,16 @@ div.pagination li.pagination span { line-height: 1.42857143; color: #000; text-decoration: none; + + border-color: #ccc; + + background-color: #f5f5f5; + background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6)); + background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); + background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); + background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); + background-repeat: repeat-x; } div.pagination li.pagination span.inactive { cursor: default; @@ -2086,7 +2096,15 @@ div.pagination li a:focus, div.pagination li span:focus { color: #000; background-color: #eee; - border-color: #ddd; + border-color: #ccc; + + background-image: -moz-linear-gradient(top, #eee, #ddd); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#eee), to(#ddd)); + background-image: -webkit-linear-gradient(top, #eee, #ddd); + background-image: -o-linear-gradient(top, #eee, #ddd); + background-image: linear-gradient(to bottom, #eee, #ddd); + background-repeat: repeat-x; + } div.pagination li .active a, div.pagination li .active span,