ahd/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Anpassung an Data-Attribute und Verzeichnisstrukturen

Browse Source
This commit is contained in:
Christian Steinle
2016-10-05 20:53:46 +00:00
parent c35f571b0b
commit fe8bd9016b
11 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
backend/editor/.config/editor_config.php
View File

@@ -21,9 +21,10 @@ elseif (ENVIRONMENT === 'production')
$editor['webserviceUrl'] = HOST_URL . str_replace(PATH_ROOT, '', dirname(__DIR__)) . '/remote_data.php'; $editor['webserviceUrl'] = HOST_URL . str_replace(PATH_ROOT, '', dirname(__DIR__)) . '/remote_data.php';
$editor['imageTypes'] = array('image/png', 'image/jpeg', 'image/gif'); $editor['imageTypes'] = array('image/png', 'image/jpeg', 'image/gif');
$editor['imageDimension']['small'] = array('width' => 480, 'height' => 360, 'quality' => 95); $editor['imageDimension']['image'] = array('width' => 480, 'height' => null, 'standardImage' => HTML_IMG . 'standard_upload.jpg', 'quality' => 95);
$editor['imageDimension']['keyVisual'] = array('width' => 1368, 'height' => 342, 'quality' => 95); $editor['imageDimension']['keyVisual'] = array('width' => 1368, 'height' => 342, 'standardImage' => HTML_IMG . 'standard_upload.jpg', 'quality' => 95, );
$editor['imageDimension']['orig'] = array('width' => 2560, 'height' => 2560, 'quality' => 99); $editor['imageDimension']['thumb'] = array('width' => 152, 'quality' => 90);
$editor['imageDimension']['orig'] = array('width' => 2560, 'height' => 2560, 'quality' => 97);
$editor['contentElements'] = array('subline', 'text', 'textimage'); $editor['contentElements'] = array('subline', 'text', 'textimage');
$editor['backendPrefix'] = PATH_PREFIX . '/' . str_replace(PATH_ROOT, '', dirname(__DIR__)); $editor['backendPrefix'] = PATH_PREFIX . '/' . str_replace(PATH_ROOT, '', dirname(__DIR__));

2
backend/editor/index.php
View File

@@ -9,6 +9,8 @@
session_start(); session_start();
$_SESSION['lang'] = 'de'; $_SESSION['lang'] = 'de';
$_SESSION['userID'] = 1;
$_SESSION['isLoggedIn'] = true;
$siteID = (!isset($_GET['siteID']) || empty($_GET['siteID'])) ? '1' : $_GET['siteID']; $siteID = (!isset($_GET['siteID']) || empty($_GET['siteID'])) ? '1' : $_GET['siteID'];
$pathRoot = dirname(dirname(__DIR__)) . '/'; $pathRoot = dirname(dirname(__DIR__)) . '/';

16
backend/editor/webservice/requestData.php
View File

@@ -7,5 +7,21 @@
* @copyright CS medien- & kommunikationssysteme (http://www.steinle-computer.de) * @copyright CS medien- & kommunikationssysteme (http://www.steinle-computer.de)
*/ */
if (!isset($_POST['token']) || !is_string($_POST['token']) || empty($_POST['token']))
{
die();
}
session_start($_POST['token']);
if (!isset($_SESSION['userID']) || !is_numeric($_SESSION['userID']) || $_SESSION['userID'] < 1)
{
die();
}
if (!isset($_SESSION['isLoggedIn']) || $_SESSION['isLoggedIn'] !== true)
{
die();
}
file_put_contents(__DIR__ . '/request.log', var_export($_POST, true) . "\n\n", FILE_APPEND); file_put_contents(__DIR__ . '/request.log', var_export($_POST, true) . "\n\n", FILE_APPEND);
echo json_encode(1); echo json_encode(1);

8
css/ahd.css
View File

@@ -68,7 +68,7 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
margin-top: 12px; margin-top: 12px;
width: 149px; width: 149px;
height: 25px; height: 25px;
background-image: url('../images/subaru/subaru_logo.png'); background-image: url('../images/subaru_logo.png');
} }
.daihatsu_logo { .daihatsu_logo {
@@ -76,7 +76,7 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
height: 25px; height: 25px;
margin-left: 15px; margin-left: 15px;
margin-top: 12px; margin-top: 12px;
background-image: url('../images/daihatsu/daihatsu_logo.png'); background-image: url('../images/daihatsu_logo.png');
} }
} }
@@ -106,7 +106,7 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
margin-top: 12px; margin-top: 12px;
width: 48px; width: 48px;
height: 25px; height: 25px;
background-image: url('../images/subaru/subaru_logo.png'); background-image: url('../images/subaru_logo.png');
} }
.daihatsu_logo { .daihatsu_logo {
@@ -114,7 +114,7 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
height: 25px; height: 25px;
margin-left: 15px; margin-left: 15px;
margin-top: 12px; margin-top: 12px;
background-image: url('../images/daihatsu/daihatsu_logo.png'); background-image: url('../images/daihatsu_logo.png');
} }
} }

2
css/ahd.min.css vendored
View File

@@ -1 +1 @@
body{padding:50px 0;font-family:Verdana,Arial,sans-serif;text-align:justify}li.dropdown-submenu{position:relative}li.dropdown-submenu:hover>ul.dropdown-menu{display:block}li.dropdown:hover>ul.dropdown-menu{display:block}ul.dropdown-menu.pull-left{margin-top:-6px;border-top-left-radius:0;border-bottom-left-radius:0;border-left:0;top:0;left:100%}h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{font-weight:bold}#footer h3{text-decoration:underline}#footer:hover .navbar-brand{height:auto}#footer .navbar-brand{margin-left:0}#footer .navbar-brand p{font-size:14px}.container-fluid{max-width:1600px}.container-fluid .img-responsive{margin:0 auto}.caret.rotate-left{transform:rotate(270deg)}.navbar-fixed-top .pull-right img{margin-top:15px;margin-left:30px}@media screen and (min-width:768px){.subaru_logo{margin-top:12px;width:149px;height:25px;background-image:url('../images/subaru/subaru_logo.png')}.daihatsu_logo{width:150px;height:25px;margin-left:15px;margin-top:12px;background-image:url('../images/daihatsu/daihatsu_logo.png')}}@media(max-width:767px){#main-navbar{position:absolute;left:80px}.navbar-collapse.in{overflow-y:visible}#main-navbar a.dropdown-toggle{display:block}#main-navbar ul.dropdown-menu{float:left}.container>.navbar-header{margin:0}.subaru_logo{margin-top:12px;width:48px;height:25px;background-image:url('../images/subaru/subaru_logo.png')}.daihatsu_logo{width:42px;height:25px;margin-left:15px;margin-top:12px;background-image:url('../images/daihatsu/daihatsu_logo.png')}}@media(max-width:642px){#footer .ahd{display:none}} body{padding:50px 0;font-family:Verdana,Arial,sans-serif;text-align:justify}li.dropdown-submenu{position:relative}li.dropdown-submenu:hover>ul.dropdown-menu{display:block}li.dropdown:hover>ul.dropdown-menu{display:block}ul.dropdown-menu.pull-left{margin-top:-6px;border-top-left-radius:0;border-bottom-left-radius:0;border-left:0;top:0;left:100%}h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{font-weight:bold}#footer h3{text-decoration:underline}#footer:hover .navbar-brand{height:auto}#footer .navbar-brand{margin-left:0}#footer .navbar-brand p{font-size:14px}.container-fluid{max-width:1600px}.container-fluid .img-responsive{margin:0 auto}.caret.rotate-left{transform:rotate(270deg)}.navbar-fixed-top .pull-right img{margin-top:15px;margin-left:30px}@media screen and (min-width:768px){.subaru_logo{margin-top:12px;width:149px;height:25px;background-image:url('../images/subaru/subaru_logo.png')}.daihatsu_logo{width:150px;height:25px;margin-left:15px;margin-top:12px;background-image:url('../images/daihatsu_logo.png')}}@media(max-width:767px){#main-navbar{position:absolute;left:80px} .navbar-collapse.in{overflow-y:visible} #main-navbar a.dropdown-toggle{display:block} #main-navbar ul.dropdown-menu{float:left} .container>.navbar-header{margin:0} .subaru_logo{margin-top:12px;width:48px;height:25px;background-image:url('../images/subaru/subaru_logo.png')} .daihatsu_logo{width:42px;height:25px;margin-left:15px;margin-top:12px;background-image:url('../images/daihatsu_logo.png')}}@media(max-width:642px){#footer .ahd{display:none}}

BIN
images/daihatsu_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
images/standard_upload.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 90 KiB

BIN
images/subaru_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.5 KiB

3
rendering/View/NavigationView.php
View File

@@ -101,8 +101,7 @@ class NavigationView
if ($depth === 0) if ($depth === 0)
{ {
$editableHtml = ($this->isEditable) ? ' data-editor="navigation" data-id="' . end($this->navigationPath) . '" data-element="navigation_' . end($this->navigationPath) . '"' : ''; $editableHtml = ($this->isEditable) ? ' data-editor="Navigation" data-id="' . end($this->navigationPath) . '" data-element="Navigation_' . end($this->navigationPath) . '"' : '';
//$this->navigationHtml .= '<nav class="navbar-collapse collapse" id="main-navbar" aria-expanded="false">';
$this->navigationHtml .= '<ul class="nav navbar-nav navbar-inverse navbar-collapse collapse" id="main-navbar" aria-expanded="false"' . $editableHtml . '>'; $this->navigationHtml .= '<ul class="nav navbar-nav navbar-inverse navbar-collapse collapse" id="main-navbar" aria-expanded="false"' . $editableHtml . '>';
} }
else else

2
templates/imagetext.phtml
View File

@@ -13,7 +13,7 @@
$editorData = ''; $editorData = '';
if ($this->isEditable === true) if ($this->isEditable === true)
{ {
$editorData = ' data-editor="imageText" data-id="' . $this->data['ID'] . '" data-element="imageText_' . $this->data['ID'] . '"'; $editorData = ' data-editor="ImageText" data-id="' . $this->data['ID'] . '" data-element="ImageText_' . $this->data['ID'] . '"';
} }
?> ?>

2
templates/index.phtml
View File

@@ -52,7 +52,7 @@
$editorData = ''; $editorData = '';
if ($this->isEditable === true) if ($this->isEditable === true)
{ {
$editorData = ' data-editor="headline" data-id="' . $this->data['navID'] . '" data-element="headline_' . $this->data['navID'] . '"'; $editorData = ' data-editor="Headline" data-id="' . $this->data['navID'] . '" data-element="Headline_' . $this->data['navID'] . '"';
} }
?> ?>
<div class="row"<?php echo $editorData; ?>><h1 class="col-md-12"><?php echo $this->data['headline']; ?></h1></div> <div class="row"<?php echo $editorData; ?>><h1 class="col-md-12"><?php echo $this->data['headline']; ?></h1></div>