Skip to content

Commit

Permalink
Debug v21
Browse files Browse the repository at this point in the history
  • Loading branch information
eldy committed Dec 3, 2024
1 parent 0774070 commit 2572bc1
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 6 deletions.
4 changes: 3 additions & 1 deletion htdocs/theme/eldy/global.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -6011,7 +6011,7 @@
border: none;
font-weight: normal;
}
.websitebar .button.bordertransp {
.websitebar .button.bordertransp, .websitebar .fa-plus-circle.btnTitle-icon {
color: unset;
text-decoration: unset !important;
margin: 0px 4px 0px 4px !important
Expand Down Expand Up @@ -7401,9 +7401,11 @@
}
span.select2-dropdown--below {
margin-top: -1px;
min-width: 100px;
}
span.select2-dropdown--above {
margin-bottom: -1px;
min-width: 100px;
}

.parentonrightofpage {
Expand Down
5 changes: 5 additions & 0 deletions htdocs/theme/md/style.css.php
Original file line number Diff line number Diff line change
Expand Up @@ -5966,7 +5966,12 @@
.websitebar .button.bordertransp {
color: unset;
text-decoration: unset !important;
border: unset !important;
/* margin: 0px 4px 0px 4px !important */
box-shadow: none;
}
.websitebar .fa-plus-circle.btnTitle-icon {
margin: 0px 4px 0px 4px !important;
}

.websitebar {
Expand Down
19 changes: 14 additions & 5 deletions htdocs/website/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -3071,7 +3071,10 @@

if ($websitekey && $websitekey != '-1' && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite')) {
// Edit website properties
print '<a href="'.$_SERVER["PHP_SELF"].'?website='.urlencode($object->ref).'&pageid='.((int) $pageid).'&action=editcss&token='.newToken().'" class="button bordertransp" title="'.dol_escape_htmltag($langs->trans("EditCss")).'"'.$disabled.'><span class="fa fa-cog paddingrightonly"></span><span class="hideonsmartphone">'.dol_escape_htmltag($langs->trans("EditCss")).'</span></a>';
print '<a href="'.$_SERVER["PHP_SELF"].'?website='.urlencode($object->ref).'&pageid='.((int) $pageid).'&action=editcss&token='.newToken().'" class="button bordertransp valignmiddle" title="'.dol_escape_htmltag($langs->trans("EditCss")).'"'.$disabled.'>';
print img_picto('', 'setup');
print '<span class="hideonsmartphone paddingleft">'.dol_escape_htmltag($langs->trans("EditCss")).'</span>';
print '</a>';

// Import web site
$importlabel = $langs->trans("ImportSite");
Expand Down Expand Up @@ -3435,10 +3438,16 @@
print '<span class="websiteselection">';

// Edit web page properties
print '<a href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid.'&action=editmeta&token='.newToken().'" class="button bordertransp" title="'.dol_escape_htmltag($langs->trans("EditPageMeta")).'"'.$disabled.'><span class="fa fa-cog paddingrightonly"></span><span class="hideonsmartphone">'.dol_escape_htmltag($langs->trans("EditPageMeta")).'</span></a>';
print '<a href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid.'&action=editmeta&token='.newToken().'" class="button bordertransp valignmiddle" title="'.dol_escape_htmltag($langs->trans("EditPageMeta")).'"'.$disabled.'>';
print img_picto('', 'setup');
print '<span class="hideonsmartphone paddingleft">'.dol_escape_htmltag($langs->trans("EditPageMeta")).'</span>';
print '</a>';

// Edit HTML content
print '<a href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid.'&action=editsource&token='.newToken().'" class="button bordertransp"'.$disabled.'>'.dol_escape_htmltag($langs->trans($conf->dol_optimize_smallscreen ? "HTML" : "EditHTMLSource")).'</a>';
print '<a href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid.'&action=editsource&token='.newToken().'" class="button bordertransp"'.$disabled.'>';
print img_picto('', 'code');
print '<span class="hideonsmartphone paddingleft">'.dol_escape_htmltag($langs->trans($conf->dol_optimize_smallscreen ? "HTML" : "EditHTMLSource")).'</span>';
print '</a>';

// Edit CKEditor
if (getDolGlobalInt('WEBSITE_ALLOW_CKEDITOR')) {
Expand Down Expand Up @@ -3946,7 +3955,7 @@ function switchEditorOnline(forceenable)
print $form->textwithpicto($langs->trans('OtherLanguages'), $htmltext, 1, 'help', '', 0, 2);
print '</td><td>';
print img_picto('', 'language', 'class="picotfixedwidth"');
print '<input type="text" class="flat" value="'.(GETPOSTISSET('WEBSITE_OTHERLANG') ? GETPOST('WEBSITE_OTHERLANG', 'alpha') : $object->otherlang).'" name="WEBSITE_OTHERLANG">';
print '<input type="text" class="flat maxwidth200" value="'.(GETPOSTISSET('WEBSITE_OTHERLANG') ? GETPOST('WEBSITE_OTHERLANG', 'alpha') : $object->otherlang).'" name="WEBSITE_OTHERLANG">';
print '</td>';
print '</tr>';

Expand Down Expand Up @@ -4035,7 +4044,7 @@ function switchEditorOnline(forceenable)
// .htaccess
print '<tr><td class="tdtop">';

$textwithhelp3 = $langs->trans("Example");
$textwithhelp3 = $langs->trans("Example").' :';
$textwithhelp3 .= "<br># Order allow,deny\n";
$textwithhelp3 .= "<br># Deny from all\n";
$textwithhelp3 .= "<br># Require all granted\n";
Expand Down

0 comments on commit 2572bc1

Please sign in to comment.