diff --git a/.gitignore b/.gitignore
index f20e5c8..572af99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,9 +5,12 @@ plugins/demo
plugins/disqus
plugins/download
plugins/finalwords
+plugins/joblistings
+plugins/mail
plugins/textadds
plugins/version
settings/settings.yaml
+settings/formdata.yaml
settings/users
system/vendor
tests
diff --git a/cache/lastCache.txt b/cache/lastCache.txt
index 5b06fad..c3a5066 100644
--- a/cache/lastCache.txt
+++ b/cache/lastCache.txt
@@ -1 +1 @@
-1544479161
\ No newline at end of file
+1546546314
\ No newline at end of file
diff --git a/content/00-Welcome/03-test.txt b/content/00-Welcome/03-test.txt
deleted file mode 100644
index c8698b1..0000000
--- a/content/00-Welcome/03-test.txt
+++ /dev/null
@@ -1 +0,0 @@
-["# Add Title","Add Content"]
\ No newline at end of file
diff --git a/content/01-stellenanzeigen/00-job-einstellen.md b/content/01-stellenanzeigen/00-job-einstellen.md
deleted file mode 100644
index f755b30..0000000
--- a/content/01-stellenanzeigen/00-job-einstellen.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Stellenangebot veröffentlichen
-
-CMSstash erreicht pro Monat mehrere tausend CMS-Experten in ganz Deutschland. Detaillierte Angaben finden sie in den [Mediadaten](/mediadaten). Unternehmen können diese Reichweite nutzen und ihre Stellenanzeigen mit CMS-Bezug auf CMSstash veröffentlichen. Wir bieten folgende Konditionen an:
-
-| Kondition | Anzeige Standard | Anzeige Pro |
-|-----------|-----------|----------|
-| Laufzeit | 8 Wochen | 8 Wochen |
-| Exklusiver Teaser auf allen Seiten | Nein | 4 Wochen |
-| Tweets | 1 Tweet | 3 Tweets |
-| __Preis__ | **59,- Euro** | **159,- Euro** |
-| _(keine Ausweisung der Mwst. nach § 19 UStG)_ | | |
-
-## Stellenanzeige aufgeben
-
-Bei Interesse schreiben Sie uns gerne über [jobs@cmsstash.de](mailto:jobs@cmsstash.de) an oder nutzen Sie das Kontaktformular. Aufgrund der inhaltlichen Ausrichtung können wir nur Stellenangebote mit einem klaren Bezug zum Thema Content Management Systeme veröffentlichen.
-
diff --git a/content/01-stellenanzeigen/index.md b/content/01-stellenanzeigen/index.md
deleted file mode 100644
index 8924756..0000000
--- a/content/01-stellenanzeigen/index.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Add Title
-
-Add Content
-
diff --git a/plugins/contactform/contactform.php b/plugins/contactform/contactform.php
index 9ef0bbf..d60617a 100644
--- a/plugins/contactform/contactform.php
+++ b/plugins/contactform/contactform.php
@@ -6,70 +6,168 @@ use \Typemill\Plugin;
class ContactForm extends Plugin
{
- protected $item;
- protected $originalHtml;
+ protected $settings;
protected $pluginSettings;
+ protected $originalHtml;
public static function getSubscribedEvents()
{
return array(
'onSessionSegmentsLoaded' => 'onSessionSegmentsLoaded',
- 'onOriginalLoaded' => 'onOriginalLoaded',
'onHtmlLoaded' => 'onHtmlLoaded',
);
}
-
- # add the path for session and csrf-protection
+
+ # add the path stored in user-settings to initiate session and csrf-protection
public function onSessionSegmentsLoaded($segments)
{
$this->pluginSettings = $this->getPluginSettings('contactform');
- if($this->getPath() == $this->pluginSettings['page'])
+ if($this->getPath() == $this->pluginSettings['page_value'])
{
- $data = $segments->getData();
- $data[] = $this->pluginSettings['page'];
+ $data = $segments->getData();
+ $data[] = $this->pluginSettings['page_value'];
+
$segments->setData($data);
}
}
-
- # get the original html without manipulations
- public function onOriginalLoaded($original)
+
+ # create the output
+ public function onHtmlLoaded($html)
{
- if(substr($this->getPath(), 0, strlen($this->pluginSettings['area'])) === $this->pluginSettings['area'])
+ if($this->getPath() == $this->pluginSettings['page_value'])
+ {
+ $content = $html->getData();
+
+ # add css
+ $this->addCSS('/contactform/css/contactform.css');
+
+ # check if form data have been stored
+ $formdata = $this->getFormdata('contactform');
+
+ if($formdata)
+ {
+ # process the form-data
+ $sendmail = $this->sendMail($formdata);
+ if($sendmail)
+ {
+ $mailresult = '' . $this->markdownToHtml($this->pluginSettings['message_success']) . '
';
+ }
+ else
+ {
+ $mailresult = '' . $this->markdownToHtml($this->pluginSettings['message_error']) . '
';
+ }
+
+ # add thank you to the content
+ $content = $content . $mailresult;
+ }
+ else
+ {
+ # get the public forms for the plugin
+ $contactform = $this->generateForm('contactform');
+
+ # add forms to the content
+ $content = $content . $contactform;
+ }
+ $html->setData($content);
+ }
+ }
+
+ private function sendMail($formdata)
+ {
+ $mailto = $this->pluginSettings['mailto'];
+ $subject = $formdata['subject'];
+ $message = wordwrap($formdata['message'],70);
+ $header = 'From: ' . $formdata['email'] . "\r\n" .
+ 'Reply-To: ' . $formdata['email'] . "\r\n" .
+ 'X-Mailer: PHP/' . phpversion();
+
+ return @mail($mailto, $subject, $message, $header);
+ }
+
+ # check if the mail-plugin is active
+ /*
+ public function onTwigLoaded()
+ {
+ $this->settings = $this->getSettings();
+
+ if(isset($this->settings['plugins']['mail']) OR !$this->settings['plugins']['mail']['active'])
+ {
+ $this->container->flash->addMessage('error', 'You have to activate the mail-plugin to use the contactform.');
+ }
+ }
+ */
+
+ # get the original html without manipulations from other plugins
+ /*
+ public function onOriginalLoaded($original)
+ {
+ if(substr($this->getPath(), 0, strlen($this->pluginSettings['area_value'])) === $this->pluginSettings['area_value'])
{
$this->originalHtml = $original->getHTML($urlrel = false);
}
}
+ */
+ # create the output
+ /*
public function onHtmlLoaded($html)
- {
- if(substr($this->getPath(), 0, strlen($this->pluginSettings['area'])) === $this->pluginSettings['area'])
+ {
+ if(substr($this->getPath(), 0, strlen($this->pluginSettings['area_value'])) === $this->pluginSettings['area_value'])
{
$content = $this->originalHtml;
- if($this->getPath() == $this->pluginSettings['page'])
- {
-
-
- $this->generateForm('contactform');
-
-
+ if($this->getPath() == $this->pluginSettings['page_value'])
+ {
# add css
- # $this->addCSS('/textadds/css/textadds.css');
-
- # get Twig Instance and add the cookieconsent template-folder to the path
- $twig = $this->getTwig();
- $loader = $twig->getLoader();
- $loader->addPath(__DIR__ . '/templates');
-
- # fetch the template and render it with twig
- $contactform = $twig->fetch('/contactform.twig', $this->pluginSettings);
+ $this->addCSS('/contactform/css/contactform.css');
+
+ # check if form data have been stored
+ $formdata = $this->getFormdata('contactform');
- $content = $this->originalHtml . $contactform;
+ if($formdata)
+ {
+ # process the form-data
+ $sendmail = $this->sendMail($formdata);
+ if($sendmail)
+ {
+ $mailresult = 'Thank you!
Your Message has been send.
Error
We could not send your message. Please send the mail manually.
-
icon-cancel0xe800
+
icon-videocam0xe800
icon-picture0xe801
-
icon-font0xe802
-
icon-cog0xe803
+
icon-cancel0xe802
+
icon-font0xe803
-
icon-off0xe804
-
icon-home0xe805
-
icon-plus0xe806
+
icon-cog0xe804
+
icon-off0xe805
+
icon-home0xe806
+
icon-plus0xe807
+
+
+
icon-video0xe808
+
icon-move0xf047
icon-link-ext0xf08e
+
icon-resize-full-alt0xf0b2
-
icon-resize-full-alt0xf0b2
icon-doc-text0xf0f6
icon-folder-empty0xf114
diff --git a/system/author/css/fontello/font/fontello.eot b/system/author/css/fontello/font/fontello.eot
index aa233f6..4576ecb 100644
Binary files a/system/author/css/fontello/font/fontello.eot and b/system/author/css/fontello/font/fontello.eot differ
diff --git a/system/author/css/fontello/font/fontello.svg b/system/author/css/fontello/font/fontello.svg
index 176ae04..5727e57 100644
--- a/system/author/css/fontello/font/fontello.svg
+++ b/system/author/css/fontello/font/fontello.svg
@@ -1,24 +1,30 @@
diff --git a/system/author/js/lazy-video.js b/system/author/js/lazy-video.js
new file mode 100644
index 0000000..7c1a8f8
--- /dev/null
+++ b/system/author/js/lazy-video.js
@@ -0,0 +1,34 @@
+( function() {
+
+ var youtube = document.querySelectorAll( ".youtube" );
+
+ for (var i = 0; i < youtube.length; i++)
+ {
+ var thisyoutube = youtube[i];
+ thisyoutube.parentNode.classList.add("video-container");
+
+ var playbutton = document.createElement("button");
+ playbutton.classList.add("play-video");
+ playbutton.value = "Play";
+
+ thisyoutube.parentNode.appendChild(playbutton);
+
+ playbutton.addEventListener( "click", function(event)
+ {
+ event.preventDefault();
+ event.stopPropagation();
+
+ var iframe = document.createElement( "iframe" );
+
+ iframe.setAttribute( "frameborder", "0" );
+ iframe.setAttribute( "allowfullscreen", "" );
+ iframe.setAttribute( "width", "560" );
+ iframe.setAttribute( "height", "315" );
+ iframe.setAttribute( "src", "https://www.youtube.com/embed/" + thisyoutube.id + "?rel=0&showinfo=0&autoplay=1" );
+
+ var videocontainer = thisyoutube.parentNode
+ videocontainer.innerHTML = "";
+ videocontainer.appendChild( iframe );
+ })(thisyoutube);
+ };
+} )();
\ No newline at end of file
diff --git a/system/author/js/vue-blox.js b/system/author/js/vue-blox.js
index 61bff2e..b181aeb 100644
--- a/system/author/js/vue-blox.js
+++ b/system/author/js/vue-blox.js
@@ -22,7 +22,7 @@ const contentComponent = Vue.component('content-block', {
this.compmarkdown = $event;
this.$nextTick(function () {
this.$refs.preview.style.minHeight = this.$refs.component.offsetHeight + 'px';
- });
+ });
},
switchToEditMode: function()
{
@@ -35,9 +35,22 @@ const contentComponent = Vue.component('content-block', {
this.edit = true; /* show the edit-mode */
this.compmarkdown = self.$root.$data.blockMarkdown; /* get markdown data */
this.componentType = self.$root.$data.blockType; /* get block-type of element */
- this.$nextTick(function () {
- this.$refs.preview.style.minHeight = this.$refs.component.offsetHeight + 'px';
- });
+ if(this.componentType == 'image-component')
+ {
+ setTimeout(function(){
+ self.$nextTick(function ()
+ {
+ self.$refs.preview.style.minHeight = self.$refs.component.offsetHeight + 'px';
+ });
+ }, 200);
+ }
+ else
+ {
+ this.$nextTick(function ()
+ {
+ this.$refs.preview.style.minHeight = self.$refs.component.offsetHeight + 'px';
+ });
+ }
},
closeComponents: function()
{
@@ -80,7 +93,7 @@ const contentComponent = Vue.component('content-block', {
if(self.$root.$data.blockType != '')
{
this.switchToEditMode();
- }
+ }
},
submitBlock: function(){
var emptyline = /^\s*$(?:\r\n?|\n)/gm;
@@ -99,8 +112,6 @@ const contentComponent = Vue.component('content-block', {
},
saveBlock: function()
{
- console.log(this.compmarkdown);
-
if(this.compmarkdown == undefined || this.compmarkdown.replace(/(\r\n|\n|\r|\s)/gm,"") == '')
{
this.switchToPreviewMode();
@@ -116,6 +127,11 @@ const contentComponent = Vue.component('content-block', {
var url = self.$root.$data.root + '/api/v1/image';
var method = 'PUT';
}
+ else if(this.componentType == 'video-component')
+ {
+ var url = self.$root.$data.root + '/api/v1/video';
+ var method = 'POST';
+ }
else
{
var url = self.$root.$data.root + '/api/v1/block';
@@ -268,7 +284,20 @@ const titleComponent = Vue.component('title-component', {
const imageComponent = Vue.component('image-component', {
props: ['compmarkdown', 'disabled'],
- template: '',
+ template: '',
data: function(){
return {
maxsize: 5, // megabyte
@@ -279,19 +308,21 @@ const imageComponent = Vue.component('image-component', {
imgtitle: '',
imgcaption: '',
imglink: '',
+ imgclass: 'center',
+ imgid: '',
imgfile: 'imgplchldr',
}
},
mounted: function(){
- // autosize(document.querySelector('textarea'));
- this.$refs.markdown.focus();
+ this.$refs.markdown.focus();
+
if(this.compmarkdown)
- {
+ {
this.imgmeta = true;
var imgmarkdown = this.compmarkdown;
-
+
var imgcaption = imgmarkdown.match(/\*.*?\*/);
if(imgcaption){
this.imgcaption = imgcaption[0].slice(1,-1);
@@ -322,6 +353,25 @@ const imageComponent = Vue.component('image-component', {
{
this.imgalt = imgalt[0].slice(1,-1);
}
+
+ var imgattr = imgmarkdown.match(/\{.*?\}/);
+ if(imgattr)
+ {
+ imgattr = imgattr[0].slice(1,-1);
+ imgattr = imgattr.split(' ');
+ for (var i = 0; i < imgattr.length; i++)
+ {
+ if(imgattr[i].charAt(0) == '.')
+ {
+ this.imgclass = imgattr[i].slice(1);
+ }
+ else if(imgattr[i].charAt(0) == '#')
+ {
+ this.imgid = imgattr[i].slice(1);
+ }
+ }
+ }
+
var imgpreview = imgmarkdown.match(/\(.*?\)/);
if(imgpreview)
{
@@ -331,13 +381,20 @@ const imageComponent = Vue.component('image-component', {
}
},
methods: {
+ isChecked: function(classname)
+ {
+ if(this.imgclass == classname)
+ {
+ return ' checked';
+ }
+ },
updatemarkdown: function(event)
{
this.$emit('updatedMarkdown', event.target.value);
},
createmarkdown: function()
{
- errors = false;
+ var errors = false;
if(this.imgalt.length < 101)
{
@@ -365,6 +422,34 @@ const imageComponent = Vue.component('image-component', {
imgmarkdown = imgmarkdown + '(' + this.imgfile + ')';
}
+ var imgattr = '';
+ if(this.imgid != '')
+ {
+ if(this.imgid.length < 100)
+ {
+ imgattr = imgattr + '#' + this.imgid + ' ';
+ }
+ else
+ {
+ errors = 'Maximum size of image id is 100 characters';
+ }
+ }
+ if(this.imgclass != '')
+ {
+ if(this.imgclass.length < 100)
+ {
+ imgattr = imgattr + '.' + this.imgclass;
+ }
+ else
+ {
+ errors = 'Maximum size of image class is 100 characters';
+ }
+ }
+ if(this.imgid != '' || this.imgclass != '')
+ {
+ imgmarkdown = imgmarkdown + '{' + imgattr + '}';
+ }
+
if(this.imglink != '')
{
if(this.imglink.length < 101)
@@ -376,7 +461,7 @@ const imageComponent = Vue.component('image-component', {
errors = 'Maximum size of image link is 100 characters';
}
}
-
+
if(this.imgcaption != '')
{
if(this.imgcaption.length < 140)
@@ -388,7 +473,7 @@ const imageComponent = Vue.component('image-component', {
errors = 'Maximum size of image caption is 140 characters';
}
}
-
+
if(errors)
{
this.$parent.freezePage();
@@ -472,6 +557,20 @@ const imageComponent = Vue.component('image-component', {
}
})
+const videoComponent = Vue.component('video-component', {
+ props: ['compmarkdown', 'disabled', 'load'],
+ template: '' +
+ '
' +
+ '
' +
+ '
table component
',
})
diff --git a/system/author/layouts/layoutBlox.twig b/system/author/layouts/layoutBlox.twig
index 709e2e5..710a246 100644
--- a/system/author/layouts/layoutBlox.twig
+++ b/system/author/layouts/layoutBlox.twig
@@ -19,7 +19,7 @@
-
+
@@ -36,13 +36,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+