lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NEW Can disable, from edit page, the whole web site

Browse Source 
FIX position of a cloned website
This commit is contained in:
Laurent Destailleur 2020-08-04 02:50:56 +02:00
parent 063b63d348
commit bf1f295602
3 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/theme/eldy/global.inc.php
View File

@ -3984,7 +3984,7 @@ div.boximport {
.product_line_stock_ok { color: #002200; } .product_line_stock_ok { color: #002200; }
.product_line_stock_too_low { color: #884400; } .product_line_stock_too_low { color: #884400; }
.fieldrequired { font-weight: bold; color: var(--fieldrequiredcolor); } .fieldrequired { font-weight: bold; color: var(--fieldrequiredcolor) !important; }
td.widthpictotitle { width: 26px; text-align: <?php echo $left; ?>; } td.widthpictotitle { width: 26px; text-align: <?php echo $left; ?>; }
span.widthpictotitle { font-size: 1.7em; } span.widthpictotitle { font-size: 1.7em; }

5
htdocs/website/class/website.class.php
View File

@ -290,6 +290,7 @@ class Website extends CommonObject
$sql .= ' t.rowid,'; $sql .= ' t.rowid,';
$sql .= " t.entity,"; $sql .= " t.entity,";
$sql .= " t.ref,"; $sql .= " t.ref,";
$sql .= " t.position,";
$sql .= " t.description,"; $sql .= " t.description,";
$sql .= " t.lang,"; $sql .= " t.lang,";
$sql .= " t.otherlang,"; $sql .= " t.otherlang,";
@ -319,6 +320,7 @@ class Website extends CommonObject
$this->entity = $obj->entity; $this->entity = $obj->entity;
$this->ref = $obj->ref; $this->ref = $obj->ref;
$this->position = $obj->position;
$this->description = $obj->description; $this->description = $obj->description;
$this->lang = $obj->lang; $this->lang = $obj->lang;
$this->otherlang = $obj->otherlang; $this->otherlang = $obj->otherlang;
@ -670,7 +672,8 @@ class Website extends CommonObject
$object->virtualhost = ''; $object->virtualhost = '';
$object->date_creation = $now; $object->date_creation = $now;
$object->fk_user_creat = $user->id; $object->fk_user_creat = $user->id;
$object->position = $object->position + 1; $object->position = ((int) $object->position) + 1;
$object->status = self::STATUS_DRAFT;
if (empty($object->lang)) $object->lang = substr($langs->defaultlang, 0, 2); // Should not happen. Protection for corrupted site with no languages if (empty($object->lang)) $object->lang = substr($langs->defaultlang, 0, 2); // Should not happen. Protection for corrupted site with no languages
// Create clone // Create clone

50
htdocs/website/index.php
View File

@ -2594,11 +2594,11 @@ if (!GETPOST('hide_websitemenu'))
$textifempty = 1; $textifempty = 1;
$formquestion = array( $formquestion = array(
array('type' => 'hidden', 'name' => 'sourcepageurl', 'value'=> $objectpage->pageurl), array('type' => 'hidden', 'name' => 'sourcepageurl', 'value'=> $objectpage->pageurl),
array('type' => 'checkbox', 'tdclass'=>'maxwidth200', 'name' => 'is_a_translation', 'label' => $langs->trans("PageIsANewTranslation"), 'value' => 0), array('type' => 'other', 'tdclass'=>'fieldrequired', 'name' => 'newwebsite', 'label' => $langs->trans("WebSite"), 'value' => $formwebsite->selectWebsite($object->id, 'newwebsite', 0)),
array('type' => 'other', 'name' => 'newlang', 'label' => $form->textwithpicto($langs->trans("Language"), $langs->trans("DefineListOfAltLanguagesInWebsiteProperties")), 'value' => $formadmin->select_language($preselectedlanguage, 'newlang', 0, null, $textifempty, 0, 0, 'minwidth200', 0, 1, 0, $onlylang, 1)),
array('type' => 'other', 'name' => 'newwebsite', 'label' => $langs->trans("WebSite"), 'value' => $formwebsite->selectWebsite($object->id, 'newwebsite', 0)),
array('type' => 'text', 'tdclass'=>'maxwidth200 fieldrequired', 'name' => 'newtitle', 'label'=> $langs->trans("WEBSITE_TITLE"), 'value'=> $langs->trans("CopyOf").' '.$objectpage->title), array('type' => 'text', 'tdclass'=>'maxwidth200 fieldrequired', 'name' => 'newtitle', 'label'=> $langs->trans("WEBSITE_TITLE"), 'value'=> $langs->trans("CopyOf").' '.$objectpage->title),
array('type' => 'text', 'tdclass'=>'maxwidth200', 'name' => 'newpageurl', 'label'=> $langs->trans("WEBSITE_PAGENAME"), 'value'=> ''), array('type' => 'text', 'tdclass'=>'maxwidth200', 'name' => 'newpageurl', 'label'=> $langs->trans("WEBSITE_PAGENAME"), 'value'=> ''),
array('type' => 'checkbox', 'tdclass'=>'maxwidth200', 'name' => 'is_a_translation', 'label' => $langs->trans("PageIsANewTranslation"), 'value' => 0, 'morecss'=>'margintoponly'),
array('type' => 'other', 'name' => 'newlang', 'label' => $form->textwithpicto($langs->trans("Language"), $langs->trans("DefineListOfAltLanguagesInWebsiteProperties")), 'value' => $formadmin->select_language($preselectedlanguage, 'newlang', 0, null, $textifempty, 0, 0, 'minwidth200', 0, 1, 0, $onlylang, 1)),
); );
$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid, $langs->trans('ClonePage'), '', 'confirm_createpagefromclone', $formquestion, 0, 1, 300, 550); $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid, $langs->trans('ClonePage'), '', 'confirm_createpagefromclone', $formquestion, 0, 1, 300, 550);
@ -2972,6 +2972,15 @@ if ($action == 'editcss')
print $websitekey; print $websitekey;
print '</td></tr>'; print '</td></tr>';
// Status of web site
print '<!-- Status of website -->'."\n";
print '<tr><td class="fieldrequired">';
print $langs->trans('Status');
print '</td><td>';
print ajax_object_onoff($object, 'status', 'status', 'Enabled', 'Disabled');
//print dol_print_date($pagedatecreation, 'dayhour');
print '</td></tr>';
// Main language // Main language
print '<tr><td class="tdtop fieldrequired">'; print '<tr><td class="tdtop fieldrequired">';
$htmltext = ''; $htmltext = '';
@ -3288,15 +3297,16 @@ if ($action == 'editmeta' || $action == 'createcontainer')
if ($action != 'createcontainer') if ($action != 'createcontainer')
{ {
print '<tr><td class="titlefield">'; print '<tr><td class="titlefield fieldrequired">';
print $langs->trans('IDOfPage'); print $langs->trans('IDOfPage').' - '.$langs->trans('InternalURLOfPage');
print '</td><td>'; print '</td><td>';
print $pageid; print $pageid;
print '</td></tr>'; //print '</td></tr>';
print '<tr><td class="titlefield">'; //print '<tr><td class="titlefield fieldrequired">';
print $langs->trans('InternalURLOfPage'); //print $langs->trans('InternalURLOfPage');
print '</td><td>'; //print '</td><td>';
print ' &nbsp; - &nbsp; ';
print '/public/website/index.php?website='.urlencode($websitekey).'&pageid='.urlencode($pageid); print '/public/website/index.php?website='.urlencode($websitekey).'&pageid='.urlencode($pageid);
//if ($objectpage->grabbed_from) print ' - <span class="opacitymedium">'.$langs->trans('InitiallyGrabbedFrom').' '.$objectpage->grabbed_from.'</span>'; //if ($objectpage->grabbed_from) print ' - <span class="opacitymedium">'.$langs->trans('InitiallyGrabbedFrom').' '.$objectpage->grabbed_from.'</span>';
print '</td></tr>'; print '</td></tr>';
@ -3334,6 +3344,17 @@ if ($action == 'editmeta' || $action == 'createcontainer')
if (GETPOST('WEBSITE_LANG', 'aZ09')) $pagelang = GETPOST('WEBSITE_LANG', 'aZ09'); if (GETPOST('WEBSITE_LANG', 'aZ09')) $pagelang = GETPOST('WEBSITE_LANG', 'aZ09');
if (GETPOST('htmlheader', 'none')) $pagehtmlheader = GETPOST('htmlheader', 'none'); if (GETPOST('htmlheader', 'none')) $pagehtmlheader = GETPOST('htmlheader', 'none');
if ($action != 'createcontainer')
{
print '<!-- Status of page -->'."\n";
print '<tr><td class="fieldrequired">';
print $langs->trans('Status');
print '</td><td>';
print ajax_object_onoff($objectpage, 'status', 'status', 'Enabled', 'Disabled');
//print dol_print_date($pagedatecreation, 'dayhour');
print '</td></tr>';
}
// Type of container // Type of container
print '<tr><td class="titlefield fieldrequired">'; print '<tr><td class="titlefield fieldrequired">';
print $langs->trans('WEBSITE_TYPE_CONTAINER'); print $langs->trans('WEBSITE_TYPE_CONTAINER');
@ -3555,17 +3576,6 @@ if ($action == 'editmeta' || $action == 'createcontainer')
print $doleditor->Create(1, '', true, 'HTML Header', 'html'); print $doleditor->Create(1, '', true, 'HTML Header', 'html');
print '</td></tr>'; print '</td></tr>';
if ($action != 'createcontainer')
{
print '<!-- Status of page -->'."\n";
print '<tr><td>';
print $langs->trans('Status');
print '</td><td>';
print ajax_object_onoff($objectpage, 'status', 'status', 'Enabled', 'Disabled');
//print dol_print_date($pagedatecreation, 'dayhour');
print '</td></tr>';
}
print '</table>'; print '</table>';
if ($action == 'createcontainer') if ($action == 'createcontainer')
{ {