From 5e88ce11ae6f01b75c1c29354aec2fa9429ac5c2 Mon Sep 17 00:00:00 2001 From: gseilheimer Date: Thu, 21 Mar 2013 13:04:01 +0100 Subject: [PATCH] fixes... - einfacher - ohne rxids - ohne DB --- config.inc.php | 105 ++++++++------ files/jquery.markitup.init.js | 22 +++ help.inc.php | 105 +++++++------- install.inc.php | 105 ++++++++++---- install.sql | 30 ---- lang/de_de.lang | 45 ------ lang/de_de_utf8.lang | 96 +++++++------ pages/index.inc.php | 117 +++++++++++----- pages/modul.inc.php | 78 ++++++----- pages/readme.inc.php | 248 +++++++++++++++++----------------- uninstall.inc.php | 32 +++-- uninstall.sql | 20 --- 12 files changed, 532 insertions(+), 471 deletions(-) create mode 100644 files/jquery.markitup.init.js delete mode 100644 install.sql delete mode 100644 lang/de_de.lang delete mode 100644 uninstall.sql diff --git a/config.inc.php b/config.inc.php index 93a9381..77fb485 100644 --- a/config.inc.php +++ b/config.inc.php @@ -1,13 +1,19 @@ www.contic.de * * @package redaxo4 * @version svn:$Id$ */ +/** + * MarkitUp Lib + * @link https://github.com/markitup/1.x + * @version 1.1.4 + */ // AddOn-MARKITUP @@ -16,47 +22,64 @@ ////////////////////////////////////////////////////////////////////////////////// // VARs - $addon_name = "gs_markitup"; + $page = "gs_markitup"; + $page_root = $REX['INCLUDE_PATH'].'/addons/'.$page.'/'; - // Sprachdateien anhaengen - if(TRUE == $REX['REDAXO']) - { - $I18N->appendFile($REX['INCLUDE_PATH'].'/addons/'.$addon_name.'/lang/'); - } - - $REX['ADDON']['rxid'][$addon_name] = '711'; - $REX['ADDON']['page'][$addon_name] = "markitup"; - - if(TRUE == $REX['REDAXO']) - { - $REX['ADDON']['name'][$addon_name] = $I18N->msg("addon_name"); - } - - // Recht um das AddOn zu aendern - #$REX['ADDON']['perm'][$addon_name] = 'markitup[1]'; - - // Credits - $REX['ADDON']['version'][$addon_name] = '1.1.14'; - $REX['ADDON']['author'][$addon_name] = 'Gilbert Seilheimer'; - $REX['ADDON']['supportpage'][$addon_name] = 'forum.redaxo.org'; - - // ************* - #$REX['PERM'][] = 'markitup[1]'; - #$REX['PERM'][] = 'markitup[2]'; - - // Fuer die Benutzervewaltung - #$REX['EXTPERM'][] = 'markitup[3]'; + // VARs - ADDON + $REX['ADDON']['name'][$page] = 'MarkitUp'; + $REX['ADDON']['rxid'][$page] = '711'; + $REX['ADDON']['page'][$page] = $page; + $REX['ADDON']['version'][$page] = '1.0.5'; + $REX['ADDON']['author'][$page] = 'Gilbert Seilheimer'; + $REX['ADDON']['supportpage'][$page] = 'forum.redaxo.org'; + $REX['ADDON']['perm'][$page] = $page.'[]'; + $REX['PERM'][] = $page.'[]'; - ////////////////////////////////////////////////////////////////////////////////// - // SUBPAGES - ////////////////////////////////////////////////////////////////////////////////// - - if(TRUE == $REX['REDAXO']) + if($REX['REDAXO'] && $REX['USER']) { - $REX['ADDON'][$addon_name]['SUBPAGES'] = - array( - array('readme', $I18N->msg('addon_subpage_readme')), - array('modul', $I18N->msg('addon_subpage_modul')) - ); + ////////////////////////////////////////////////////////////////////////////////// + // SUBPAGES + ////////////////////////////////////////////////////////////////////////////////// + + // Sprachdateien anhaengen + $I18N->appendFile($REX['INCLUDE_PATH'].'/addons/'.$page.'/lang/'); + + $REX['ADDON'][$page]['SUBPAGES'] = + // subpage, label, perm, params, attributes + array( + array('', $I18N->msg($page.'_subpage_index'), '', '', ''), + array('readme', $I18N->msg($page.'_subpage_readme'), '', '', ''), + array('modul', $I18N->msg($page.'_subpage_modul'), '', '', ''), + ); + + ////////////////////////////////////////////////////////////////////////////////// + // INCLUDES + ////////////////////////////////////////////////////////////////////////////////// + #require_once $addon_root.'functions/function.a1056_commons.inc.php'; + + + ////////////////////////////////////////////////////////////////////////////////// + // FUNCTIONS + ////////////////////////////////////////////////////////////////////////////////// + + function gs_markitup_header( $params ) + { + global $REX; + + if( TRUE == $REX["REDAXO"] ) + { + $params['subject'] .= "\n ".''; + $params['subject'] .= "\n ".''; + $params['subject'] .= "\n ".''; + $params['subject'] .= "\n ".''; + $params['subject'] .= "\n ".''; + $params['subject'] .= "\n ".''; + $params['subject'] .= "\n ".''; + } + return $params['subject']; + } + + rex_register_extension('PAGE_HEADER', 'gs_markitup_header'); } + ?> \ No newline at end of file diff --git a/files/jquery.markitup.init.js b/files/jquery.markitup.init.js new file mode 100644 index 0000000..9c1d981 --- /dev/null +++ b/files/jquery.markitup.init.js @@ -0,0 +1,22 @@ +/** + * User: Gilbert + * Date: 21.03.13 + * Time: 11:57 + */ + jQuery(function($) + { + // Add markItUp! to your textarea in one line + $('#markItUp').markItUp(mySettings); + + // And you can add/remove markItUp! whenever you want + $('.toggle').click(function() { + if ($("#markItUp.markItUpEditor").length === 1) { + $("#markItUp").markItUpRemove(); + $("span", this).text("get markItUp! back"); + } else { + $('#markItUp').markItUp(mySettings); + $("span", this).text("remove markItUp!"); + } + return false; + }); + }); \ No newline at end of file diff --git a/help.inc.php b/help.inc.php index a762e84..590e26d 100644 --- a/help.inc.php +++ b/help.inc.php @@ -1,65 +1,74 @@ www.contic.de * * @package redaxo4 * @version svn:$Id$ */ +/** + * MarkitUp Lib + * @link https://github.com/markitup/1.x + * @version 1.1.4 + */ // AddOn-MARKITUP -?> -

Funktionen:

-

- Addon zum Ausgaben von TEXTILE-MarkUp in Verbindung mit dem Addon TEXTILE. -

+ ////////////////////////////////////////////////////////////////////////////////// + // SUBPAGES + ////////////////////////////////////////////////////////////////////////////////// -
-

Benutzung:

-

- Das Standard-Textile-Modul wird einfach durch das mit MarkItUp ersetzt...
- Damit die Werte nicht verloren gehen ist in diesem zugehoerigen Modul eventuell noch der REX_VALUE[XY] anzupassen. -

+?> -
-

Anpassungen: SET.JS

-

- .\addons\gs_markitup\files\sets\set.js
- Hier werden die Bedienelemente definiert.
-
- Codebeispiel:
- Suchen Sie nach der folgenden Zeile...
- mySettings = {
- ...
- markupSet:
- [
- {name:'Heading 1', className:'h1', key:'1', openWith:'\nh1(!(([![Class]!]))!). ', placeHolder:'Ihr Titel hier...'},
- {...}
- ]
- }
-

+

Funktionen:

+

+ Addon zum Ausgaben von TEXTILE-MarkUp in Verbindung mit dem Addon TEXTILE. +

+
+

Benutzung:

+

+ Das Standard-Textile-Modul wird einfach durch das mit MarkItUp ersetzt...
+ Damit die Werte nicht verloren gehen ist in diesem zugehoerigen Modul eventuell noch der REX_VALUE[XY] anzupassen. +

-
-

Anpassungen: STYLE.CSS

-

- .\addons\gs_markitup\files\sets\style.css
- Hier werden die Grafigen definiert.
-
- Codebeispiel:
- Suchen Sie nach der folgenden Zeile...
- .markItUp .h1 a {
- background-image:url(images/h1.png);
- }
-

+
+

Anpassungen: SET.JS

+

+ .\addons\gs_markitup\files\sets\set.js
+ Hier werden die Bedienelemente definiert.
+
+ Codebeispiel:
+ Suchen Sie nach der folgenden Zeile...
+ mySettings = {
+ ...
+ markupSet:
+ [
+ {name:'Heading 1', className:'h1', key:'1', openWith:'\nh1(!(([![Class]!]))!). ', placeHolder:'Ihr Titel hier...'},
+ {...}
+ ]
+ }
+

+
+

Anpassungen: STYLE.CSS

+

+ .\addons\gs_markitup\files\sets\style.css
+ Hier werden die Grafigen definiert.
+
+ Codebeispiel:
+ Suchen Sie nach der folgenden Zeile...
+ .markItUp .h1 a {
+ background-image:url(images/h1.png);
+ }
+

-
-

Weitere Info zum Orginal:

-

- Ausfuehrliche Beschreibungen und Moeglichkeiten des Orginals von Jay Salvat finden Sie auf seiner Website:
- Link zum Autor von MarkItUp -

+
+

Weitere Info zum Orginal:

+

+ Ausfuehrliche Beschreibungen und Moeglichkeiten des Orginals von Jay Salvat finden Sie auf seiner Website:
+ Link zum Autor von MarkItUp +

diff --git a/install.inc.php b/install.inc.php index b453df7..95fae6b 100644 --- a/install.inc.php +++ b/install.inc.php @@ -1,43 +1,88 @@ www.contic.de * * @package redaxo4 * @version svn:$Id$ */ +/** + * MarkitUp Lib + * @link https://github.com/markitup/1.x + * @version 1.1.4 + */ // AddOn-MARKITUP - ////////////////////////////////////////////////////////////////////////////////// - // CONFIG - ////////////////////////////////////////////////////////////////////////////////// - - // VARs - $addon_name = "gs_markitup"; - $error = ''; - - ////////////////////////////////////////////////////////////////////////////////// - // DUMP - ////////////////////////////////////////////////////////////////////////////////// - - # $uninstall = dirname(__FILE__) . '/uninstall.sql'; - - # rex_install_dump($uninstall); - - ////////////////////////////////////////////////////////////////////////////////// - // INSTALL - ////////////////////////////////////////////////////////////////////////////////// - - if ('' != $error) - { - $REX['ADDON']['install'][$addon_name] = $error; - } - else - { - $REX['ADDON']['install'][$addon_name] = true; - } + ////////////////////////////////////////////////////////////////////////////////// + // CONFIG + ////////////////////////////////////////////////////////////////////////////////// + + // VARs + $page = "gs_markitup"; + + // Installationsbedingungen pruefen + $page_check_rex = '4.4.1'; + $page_check_php = 5; + $page_check_addons = array('textile'); + $check_ok = true; + + ////////////////////////////////////////////////////////////////////////////////// + // CHECKS + ////////////////////////////////////////////////////////////////////////////////// + + // REX VERSION + $this_rex = $REX['VERSION'].'.'.$REX['SUBVERSION'].'.'.$REX['MINORVERSION'] = "1"; + if(version_compare($this_rex, $page_check_rex, '<')) + { + $REX['ADDON']['installmsg'][$page] = 'Dieses Addon benötigt Redaxo Version '.$page_check_rex.' oder höher.'; + $REX['ADDON']['install'][$page] = 0; + $check_ok = false; + } + + // PHP VERSION + if (intval(PHP_VERSION) < $page_check_php) + { + $REX['ADDON']['installmsg'][$page] = 'Dieses Addon benötigt mind. PHP '.$page_check_php.'!'; + $REX['ADDON']['install'][$page] = 0; + $check_ok = false; + } + + // CHECK ADDONS + foreach($page_check_addons as $a) + { + if (!OOAddon::isInstalled($a)) + { + $REX['ADDON']['installmsg'][$page] = '
Addon "'.$a.'" ist nicht installiert. >>> jetzt installieren <<<'; + $check_ok = false; + } + else + { + if (!OOAddon::isAvailable($a)) + { + $REX['ADDON']['installmsg'][$page] = '
Addon "'.$a.'" ist nicht aktiviert. >>> jetzt aktivieren <<<'; + $check_ok = false; + } + } + } + + ////////////////////////////////////////////////////////////////////////////////// + // DUMP + ////////////////////////////////////////////////////////////////////////////////// + + # $uninstall = dirname(__FILE__) . '/uninstall.sql'; + + # rex_install_dump($uninstall); + + ////////////////////////////////////////////////////////////////////////////////// + // INSTALL + ////////////////////////////////////////////////////////////////////////////////// + if ($check_ok) + { + $REX['ADDON']['install'][$page] = TRUE; + } ?> \ No newline at end of file diff --git a/install.sql b/install.sql deleted file mode 100644 index 427173d..0000000 --- a/install.sql +++ /dev/null @@ -1,30 +0,0 @@ -#********************************************* -# -# INSTALLATION -# -# Autor: G.Seilheimer -# Company: contic.de -# Version: 1.1.14 -# Update: 2013-03-09 -# CMS: Redaxo 4.5 -# -#********************************************* - - -#********************************************* -# -# insert values into rex_template -# -#********************************************* - -INSERT IGNORE INTO `%TABLE_PREFIX%template` (`id`, `label`, `name`, `content`, `active`, `createuser`, `updateuser`, `createdate`, `updatedate`, `attributes`, `revision`) -VALUES (711, '', 'gs : markitup (jquery)', '\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n', 0, 'gseilheimer', 'gseilheimer', 1291155881, 1291155881, 'a:3:{s:10:"categories";a:1:{s:3:"all";s:1:"1";}s:5:"ctype";a:0:{}s:7:"modules";a:1:{i:1;a:1:{s:3:"all";s:1:"1";}}}', 0); - - -#********************************************* -# -# alter values into rex_template -# -#********************************************* - -ALTER TABLE `%TABLE_PREFIX%template` AUTO_INCREMENT=20; \ No newline at end of file diff --git a/lang/de_de.lang b/lang/de_de.lang deleted file mode 100644 index 65b6d06..0000000 --- a/lang/de_de.lang +++ /dev/null @@ -1,45 +0,0 @@ -# addon:markitup de_de | de_de_utf8 - -addon_name = MarkItUp - -addon_subpage_readme = Lies mich - -addon_subpage_readme_txt_01 = MarkItUp - eingebundene Dateien -addon_subpage_readme_txt_01_01 = Enthält alle wichtigen Komponenten in den aktuellen Versionen: -addon_subpage_readme_txt_01_02 = - ./sets/ [enthält das SETUP und die ICONS für den EDITOR] -addon_subpage_readme_txt_01_03 = - ./skins/ [enthält die IMAGES und CSS für den EDITOR] -addon_subpage_readme_txt_01_04 = - jquery.markitup.js -addon_subpage_readme_txt_01_05 = - jquery.markitup.pack.js -addon_subpage_readme_txt_01_06 = Alle Dateien sind in .\files\addons\markitup\ - -addon_subpage_readme_txt_02 = MarkItUp - Bedienelemente definieren (sets.js) -addon_subpage_readme_txt_02_01 = mySettings = { -addon_subpage_readme_txt_02_02 = previewParserPath: '', // path to your Textile parser -addon_subpage_readme_txt_02_03 = onShiftEnter: {keepDefault:false, replaceWith:'\n\n'}, -addon_subpage_readme_txt_02_04 = markupSet: [ -addon_subpage_readme_txt_02_05 = {name:'...', className:'...', key:'1', openWith:'...', placeHolder:'...' }, //Template -addon_subpage_readme_txt_02_06 = {name:'Heading 1', className:'h1', key:'1', openWith:'\nh1(!(([![Class]!]))!). ', placeHolder:'Ihr Titel hier...'}, //Beispiel -addon_subpage_readme_txt_02_07 = ]} - -addon_subpage_readme_txt_03 = MarkItUp - Grafiken definieren (style.css) -addon_subpage_readme_txt_03_01 = .markItUp .h1 a { -addon_subpage_readme_txt_03_02 = background-image:url(images/h1.png); -addon_subpage_readme_txt_03_03 = } - -addon_subpage_readme_txt_04 = Hinweise: Konfiguration anpassen -addon_subpage_readme_txt_04_01 = Ändern Sie bitte einfach nur die Effekte im Image-Manager, damit Ihnen weitere Systemanpassungen erspart bleiben... -addon_subpage_readme_txt_04_02 = Sollten Sie die Konfiguration dennoch ändern wollen, nachfolgend die notwendigen Schritte: -addon_subpage_readme_txt_04_03 = a) Ändern der "Bildtypen bearbeiten" und der zugehörigen "Effekte bearbeiten" -addon_subpage_readme_txt_04_04 = b) Alle Anpassungen und Namensänderungen müssen im Modul berücksichtigt werden! - -addon_subpage_readme_txt_05 = Hinweise: Löschen des Templates -addon_subpage_readme_txt_05_01 = Das Löschen des Templates mit der ID=711 sollte nur durch die DEINSTALLATION des AddOns erfolgen, da das Modul für die Texteingabe anderenfalls nicht mehr funktioniert. - -addon_subpage_readme_txt_06 = Hinweise: Installation/Einbindung des REX_TEMPLATE[711] -addon_subpage_readme_txt_06_01 = Das Template ist bereits im zugehörigen Orginalmodul hinterlegt, weshalb keine weitere Konfiguration notwendig ist. - -addon_subpage_modul = Module (MarkItUp) - -addon_subpage_modul_txt_01 = Eingabe/Ausgabe (MarkItUp-Beispiel) -addon_subpage_modul_txt_01_01 = Das aktuelle Beispiel-Modul für dieses Addon finden Sie unter der nachfolgenden Adresse: -addon_subpage_modul_txt_01_02 = http://www.redaxo.org/165-0-moduldetails.html?module_id=463 diff --git a/lang/de_de_utf8.lang b/lang/de_de_utf8.lang index ccbf0a5..dab63cb 100644 --- a/lang/de_de_utf8.lang +++ b/lang/de_de_utf8.lang @@ -1,45 +1,51 @@ -# addon:markitup de_de | de_de_utf8 - -addon_name = MarkItUp - -addon_subpage_readme = Lies mich - -addon_subpage_readme_txt_01 = MarkItUp - eingebundene Dateien -addon_subpage_readme_txt_01_01 = Enthält alle wichtigen Komponenten in den aktuellen Versionen: -addon_subpage_readme_txt_01_02 = - ./sets/ [enthält das SETUP und die ICONS für den EDITOR] -addon_subpage_readme_txt_01_03 = - ./skins/ [enthält die IMAGES und CSS für den EDITOR] -addon_subpage_readme_txt_01_04 = - jquery.markitup.js -addon_subpage_readme_txt_01_05 = - jquery.markitup.pack.js -addon_subpage_readme_txt_01_06 = Alle Dateien sind in .\files\addons\markitup\ - -addon_subpage_readme_txt_02 = MarkItUp - Bedienelemente definieren (sets.js) -addon_subpage_readme_txt_02_01 = mySettings = { -addon_subpage_readme_txt_02_02 = previewParserPath: '', // path to your Textile parser -addon_subpage_readme_txt_02_03 = onShiftEnter: {keepDefault:false, replaceWith:'\n\n'}, -addon_subpage_readme_txt_02_04 = markupSet: [ -addon_subpage_readme_txt_02_05 = {name:'...', className:'...', key:'1', openWith:'...', placeHolder:'...' }, //Template -addon_subpage_readme_txt_02_06 = {name:'Heading 1', className:'h1', key:'1', openWith:'\nh1(!(([![Class]!]))!). ', placeHolder:'Ihr Titel hier...'}, //Beispiel -addon_subpage_readme_txt_02_07 = ]} - -addon_subpage_readme_txt_03 = MarkItUp - Grafiken definieren (style.css) -addon_subpage_readme_txt_03_01 = .markItUp .h1 a { -addon_subpage_readme_txt_03_02 = background-image:url(images/h1.png); -addon_subpage_readme_txt_03_03 = } - -addon_subpage_readme_txt_04 = Hinweise: Konfiguration anpassen -addon_subpage_readme_txt_04_01 = Ändern Sie bitte einfach nur die Effekte im Image-Manager, damit Ihnen weitere Systemanpassungen erspart bleiben... -addon_subpage_readme_txt_04_02 = Sollten Sie die Konfiguration dennoch ändern wollen, nachfolgend die notwendigen Schritte: -addon_subpage_readme_txt_04_03 = a) Ändern der "Bildtypen bearbeiten" und der zugehörigen "Effekte bearbeiten" -addon_subpage_readme_txt_04_04 = b) Alle Anpassungen und Namensänderungen müssen im Modul berücksichtigt werden! - -addon_subpage_readme_txt_05 = Hinweise: Löschen des Templates -addon_subpage_readme_txt_05_01 = Das Löschen des Templates mit der ID=711 sollte nur durch die DEINSTALLATION des AddOns erfolgen, da das Modul für die Texteingabe anderenfalls nicht mehr funktioniert. - -addon_subpage_readme_txt_06 = Hinweise: Installation/Einbindung des REX_TEMPLATE[711] -addon_subpage_readme_txt_06_01 = Das Template ist bereits im zugehörigen Orginalmodul hinterlegt, weshalb keine weitere Konfiguration notwendig ist. - -addon_subpage_modul = Module (MarkItUp) - -addon_subpage_modul_txt_01 = Eingabe/Ausgabe (MarkItUp-Beispiel) -addon_subpage_modul_txt_01_01 = Das aktuelle Beispiel-Modul für dieses Addon finden Sie unter der nachfolgenden Adresse: -addon_subpage_modul_txt_01_02 = http://www.redaxo.org/165-0-moduldetails.html?module_id=463 +# addon:markitup | de_de_utf8 + +gs_markitup_name = MarkItUp + +gs_markitup_subpage_index = Startseite + +gs_markitup_subpage_index_txt_01 = MarkItUp - einfacher Editor für TEXTILE +gs_markitup_subpage_index_txt_01_01 = Weitere Details finden Sie in den nachfolgenden Seiten +gs_markitup_subpage_index_txt_01_02 = ... + +gs_markitup_subpage_readme = Lies mich + +gs_markitup_subpage_readme_txt_01 = MarkItUp - eingebundene Dateien +gs_markitup_subpage_readme_txt_01_01 = Enthält alle wichtigen Komponenten in den aktuellen Versionen: +gs_markitup_subpage_readme_txt_01_02 = - ./sets/ [enthält das SETUP und die ICONS für den EDITOR] +gs_markitup_subpage_readme_txt_01_03 = - ./skins/ [enthält die IMAGES und CSS für den EDITOR] +gs_markitup_subpage_readme_txt_01_04 = - jquery.markitup.js +gs_markitup_subpage_readme_txt_01_05 = - jquery.markitup.pack.js +gs_markitup_subpage_readme_txt_01_06 = Alle Dateien sind in .\files\addons\markitup\ + +gs_markitup_subpage_readme_txt_02 = MarkItUp - Bedienelemente definieren (sets.js) +gs_markitup_subpage_readme_txt_02_01 = mySettings = { +gs_markitup_subpage_readme_txt_02_02 = previewParserPath: '', // path to your Textile parser +gs_markitup_subpage_readme_txt_02_03 = onShiftEnter: {keepDefault:false, replaceWith:'\n\n'}, +gs_markitup_subpage_readme_txt_02_04 = markupSet: [ +gs_markitup_subpage_readme_txt_02_05 = {name:'...', className:'...', key:'1', openWith:'...', placeHolder:'...' }, //Template +gs_markitup_subpage_readme_txt_02_06 = {name:'Heading 1', className:'h1', key:'1', openWith:'\nh1(!(([![Class]!]))!). ', placeHolder:'Ihr Titel hier...'}, //Beispiel +gs_markitup_subpage_readme_txt_02_07 = ]} + +gs_markitup_subpage_readme_txt_03 = MarkItUp - Grafiken definieren (style.css) +gs_markitup_subpage_readme_txt_03_01 = .markItUp .h1 a { +gs_markitup_subpage_readme_txt_03_02 = background-image:url(images/h1.png); +gs_markitup_subpage_readme_txt_03_03 = } + +gs_markitup_subpage_readme_txt_04 = Hinweise: Konfiguration anpassen +gs_markitup_subpage_readme_txt_04_01 = Ändern Sie bitte einfach nur die Effekte im Image-Manager, damit Ihnen weitere Systemanpassungen erspart bleiben... +gs_markitup_subpage_readme_txt_04_02 = Sollten Sie die Konfiguration dennoch ändern wollen, nachfolgend die notwendigen Schritte: +gs_markitup_subpage_readme_txt_04_03 = a) Ändern der "Bildtypen bearbeiten" und der zugehörigen "Effekte bearbeiten" +gs_markitup_subpage_readme_txt_04_04 = b) Alle Anpassungen und Namensänderungen müssen im Modul berücksichtigt werden! + +gs_markitup_subpage_readme_txt_05 = Hinweise: Löschen des Templates +gs_markitup_subpage_readme_txt_05_01 = Das Löschen des Templates mit der ID=711 sollte nur durch die DEINSTALLATION des AddOns erfolgen, da das Modul für die Texteingabe anderenfalls nicht mehr funktioniert. + +gs_markitup_subpage_readme_txt_06 = Hinweise: Installation/Einbindung des REX_TEMPLATE[711] +gs_markitup_subpage_readme_txt_06_01 = Das Template ist bereits im zugehörigen Orginalmodul hinterlegt, weshalb keine weitere Konfiguration notwendig ist. + +gs_markitup_subpage_modul = Module (MarkItUp) + +gs_markitup_subpage_modul_txt_01 = Eingabe/Ausgabe (MarkItUp-Beispiel) +gs_markitup_subpage_modul_txt_01_01 = Das aktuelle Beispiel-Modul für dieses Addon finden Sie unter der nachfolgenden Adresse: +gs_markitup_subpage_modul_txt_01_02 = http://www.redaxo.org/165-0-moduldetails.html?module_id=463 diff --git a/pages/index.inc.php b/pages/index.inc.php index 8c061fe..cd6b682 100644 --- a/pages/index.inc.php +++ b/pages/index.inc.php @@ -1,13 +1,19 @@ www.contic.de * * @package redaxo4 * @version svn:$Id$ */ +/** + * MarkitUp Lib + * @link https://github.com/markitup/1.x + * @version 1.1.4 + */ // AddOn-MARKITUP @@ -15,41 +21,78 @@ // CONFIG ////////////////////////////////////////////////////////////////////////////////// - // VARs - $addon_name = "gs_markitup"; + // GET PARAMS + //////////////////////////////////////////////////////////////////////////////// + $page = rex_request('page', 'string'); + $subpage = rex_request('subpage', 'string'); + #$func = rex_request('func', 'string'); + #$oid = rex_request('oid', 'int'); + + ////////////////////////////////////////////////////////////////////////////////// + // SUBPAGES + ////////////////////////////////////////////////////////////////////////////////// + + // REX BACKEND LAYOUT TOP + ////////////////////////////////////////////////////////////////////////////// + + require $REX['INCLUDE_PATH'] . '/layout/top.php'; + + echo '
'; + + // TITLE & SUBPAGE NAVIGATION + ////////////////////////////////////////////////////////////////////////////// + + rex_title("MarkItUp",$REX['ADDON'][$page]['SUBPAGES']); + + // JS SCRIPT FÃœR LINKS IN POPUP + //////////////////////////////////////////////////////////////////////////////// + + #echo ""; + + // INCLUDE REQUESTED SUBPAGE + ////////////////////////////////////////////////////////////////////////////// + + if($subpage != "") + { + switch($subpage) + { + case 'modul': + { + break; + } + case 'readme': + { + break; + } + default: + { + $subpage = "index"; + } + } + require $REX["INCLUDE_PATH"]."/addons/$page/pages/$subpage.inc.php"; + } + else + { + echo '

'.$I18N->msg($page."_subpage_index").'

'; + + echo '
'; + echo '

'; + echo ''; - // Sprachdateien anhaengen - if(TRUE == $REX['REDAXO']) - { - $I18N->appendFile($REX['INCLUDE_PATH'].'/addons/'.$addon_name.'/lang/'); - } - - ////////////////////////////////////////////////////////////////////////////////// - // SUBPAGES - ////////////////////////////////////////////////////////////////////////////////// - - require $REX['INCLUDE_PATH'].'/layout/top.php'; + echo $I18N->msg($page.'_subpage_index_txt_01') . "
"; + echo $I18N->msg($page.'_subpage_index_txt_01_01') . "
"; + echo $I18N->msg($page.'_subpage_index_txt_01_02') . "
"; + + echo ''; + echo '

'; + echo '
'; + } + + // REX BACKEND LAYOUT BOTTOM + ////////////////////////////////////////////////////////////////////////////// + + echo '
'; + + require $REX['INCLUDE_PATH'] . "/layout/bottom.php"; - $page = rex_request('page', 'string'); - $subpage = rex_request('subpage', 'string'); - $func = rex_request('func', 'string'); - $oid = rex_request('oid', 'int'); - - rex_title($I18N->msg("addon_name"),$REX['ADDON'][$page]['SUBPAGES']); - - switch($subpage) - { - case 'modul': - { - break; - } - default: - { - $subpage = "readme"; - } - } - - require $REX['INCLUDE_PATH'].'/addons/'.$addon_name.'/pages/'.$subpage.'.inc.php'; - - require $REX['INCLUDE_PATH'].'/layout/bottom.php'; ?> \ No newline at end of file diff --git a/pages/modul.inc.php b/pages/modul.inc.php index 479c0de..31950ef 100644 --- a/pages/modul.inc.php +++ b/pages/modul.inc.php @@ -1,49 +1,53 @@ www.contic.de * * @package redaxo4 * @version svn:$Id$ */ +/** + * MarkitUp Lib + * @link https://github.com/markitup/1.x + * @version 1.1.4 + */ // AddOn-MARKITUP - - ////////////////////////////////////////////////////////////////////////////////// - // CONFIG - ////////////////////////////////////////////////////////////////////////////////// - - $msg = "Erfolgreich geladen..."; - - if ($msg != '') - { - echo rex_info($msg); - } - - // Sprachdateien anhaengen - if(TRUE == $REX['REDAXO']) - { - $I18N->appendFile($REX['INCLUDE_PATH'].'/addons/'.$addon_name.'/lang/'); - } - - ////////////////////////////////////////////////////////////////////////////////// - // SUBPAGE - ////////////////////////////////////////////////////////////////////////////////// + + ////////////////////////////////////////////////////////////////////////////////// + // CONFIG + ////////////////////////////////////////////////////////////////////////////////// + + // VARs + #$page = "gs_markitup"; + + // GET PARAMS + //////////////////////////////////////////////////////////////////////////////// + $page = rex_request('page', 'string'); + $subpage = rex_request('subpage', 'string'); + $func = rex_request('func', 'string'); + #$oid = rex_request('oid', 'int'); + + ////////////////////////////////////////////////////////////////////////////////// + // SUBPAGES + ////////////////////////////////////////////////////////////////////////////////// + ?> -
-

msg('addon_subpage_modul_txt_01'); ?>

- -
-

- - msg('addon_subpage_modul_txt_01_01') . "
"; - echo $I18N->msg('addon_subpage_modul_txt_01_02') . "
"; - ?> - -

-
-
+
+

msg($page.'_subpage_modul_txt_01'); ?>

+ +
+

+ + msg($page.'_subpage_modul_txt_01_01') . "
"; + echo $I18N->msg($page.'_subpage_modul_txt_01_02') . "
"; + ?> + +

+
+
diff --git a/pages/readme.inc.php b/pages/readme.inc.php index 878f446..4c4423a 100644 --- a/pages/readme.inc.php +++ b/pages/readme.inc.php @@ -1,139 +1,137 @@ www.contic.de * * @package redaxo4 * @version svn:$Id$ */ +/** + * MarkitUp Lib + * @link https://github.com/markitup/1.x + * @version 1.1.4 + */ // AddOn-MARKITUP - ////////////////////////////////////////////////////////////////////////////////// - // CONFIG - ////////////////////////////////////////////////////////////////////////////////// - - // VARs - $addon_name = "gs_markitup"; - - $msg = "Erfolgreich geladen..."; - - if ($msg != '') - { - echo rex_info($msg); - } - - // Sprachdateien anhaengen - if(TRUE == $REX['REDAXO']) - { - $I18N->appendFile($REX['INCLUDE_PATH'].'/addons/'.$addon_name.'/lang/'); - } - - ////////////////////////////////////////////////////////////////////////////////// - // SUBPAGE - ////////////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////////////////////////////////// + // CONFIG + ////////////////////////////////////////////////////////////////////////////////// + + // GET PARAMS + //////////////////////////////////////////////////////////////////////////////// + $page = rex_request('page', 'string'); + $subpage = rex_request('subpage', 'string'); + #$func = rex_request('func', 'string'); + #$oid = rex_request('oid', 'int'); + + ////////////////////////////////////////////////////////////////////////////////// + // SUBPAGES + ////////////////////////////////////////////////////////////////////////////////// + ?> -
-

msg('addon_subpage_readme_txt_01'); ?>

- -
-

- - msg('addon_subpage_readme_txt_01_01') . "
"; - echo $I18N->msg('addon_subpage_readme_txt_01_02') . "
"; - echo $I18N->msg('addon_subpage_readme_txt_01_03') . "
"; - echo $I18N->msg('addon_subpage_readme_txt_01_04') . "
"; - echo $I18N->msg('addon_subpage_readme_txt_01_05') . "
"; - echo $I18N->msg('addon_subpage_readme_txt_01_06') . "
"; - ?> - -

-
-
- -
-

msg('addon_subpage_readme_txt_02'); ?>

- -
-

- - msg('addon_subpage_readme_txt_02_01') . "
"; - echo $I18N->msg('addon_subpage_readme_txt_02_02') . "
"; - echo $I18N->msg('addon_subpage_readme_txt_02_03') . "
"; - echo $I18N->msg('addon_subpage_readme_txt_02_04') . "
"; - echo $I18N->msg('addon_subpage_readme_txt_02_05') . "
"; - echo $I18N->msg('addon_subpage_readme_txt_02_06') . "
"; - echo $I18N->msg('addon_subpage_readme_txt_02_07') . "
"; - ?> - -

-
-
- -
-

msg('addon_subpage_readme_txt_03'); ?>

- -
-

- - msg('addon_subpage_readme_txt_03_01') . "
"; - echo $I18N->msg('addon_subpage_readme_txt_03_02') . "
"; - echo $I18N->msg('addon_subpage_readme_txt_03_03') . "
"; - ?> - -

-
-
- - -
-

msg('addon_subpage_readme_txt_04'); ?>

- -
-

- - msg('addon_subpage_readme_txt_04_01') . "
"; - echo $I18N->msg('addon_subpage_readme_txt_04_02') . "
"; - echo $I18N->msg('addon_subpage_readme_txt_04_03') . "
"; - echo $I18N->msg('addon_subpage_readme_txt_04_04') . "
"; - ?> - -

-
-
- -
-

msg('addon_subpage_readme_txt_05'); ?>

- -
-

- - msg('addon_subpage_readme_txt_05_01') . "
"; - ?> - -

-
-
- -
-

msg('addon_subpage_readme_txt_06'); ?>

- -
-

- - msg('addon_subpage_readme_txt_06_01') . "
"; - ?> - -

-
-
+
+

msg($page.'_subpage_readme_txt_01'); ?>

+ +
+

+ + msg($page.'_subpage_readme_txt_01_01') . "
"; + echo $I18N->msg($page.'_subpage_readme_txt_01_02') . "
"; + echo $I18N->msg($page.'_subpage_readme_txt_01_03') . "
"; + echo $I18N->msg($page.'_subpage_readme_txt_01_04') . "
"; + echo $I18N->msg($page.'_subpage_readme_txt_01_05') . "
"; + echo $I18N->msg($page.'_subpage_readme_txt_01_06') . "
"; + ?> + +

+
+
+ +
+

msg($page.'_subpage_readme_txt_02'); ?>

+ +
+

+ + msg($page.'_subpage_readme_txt_02_01') . "
"; + echo $I18N->msg($page.'_subpage_readme_txt_02_02') . "
"; + echo $I18N->msg($page.'_subpage_readme_txt_02_03') . "
"; + echo $I18N->msg($page.'_subpage_readme_txt_02_04') . "
"; + echo $I18N->msg($page.'_subpage_readme_txt_02_05') . "
"; + echo $I18N->msg($page.'_subpage_readme_txt_02_06') . "
"; + echo $I18N->msg($page.'_subpage_readme_txt_02_07') . "
"; + ?> + +

+
+
+ +
+

msg($page.'_subpage_readme_txt_03'); ?>

+ +
+

+ + msg($page.'_subpage_readme_txt_03_01') . "
"; + echo $I18N->msg($page.'_subpage_readme_txt_03_02') . "
"; + echo $I18N->msg($page.'_subpage_readme_txt_03_03') . "
"; + ?> + +

+
+
+ + +
+

msg($page.'_subpage_readme_txt_04'); ?>

+ +
+

+ + msg($page.'_subpage_readme_txt_04_01') . "
"; + echo $I18N->msg($page.'_subpage_readme_txt_04_02') . "
"; + echo $I18N->msg($page.'_subpage_readme_txt_04_03') . "
"; + echo $I18N->msg($page.'_subpage_readme_txt_04_04') . "
"; + ?> + +

+
+
+ +
+

msg($page.'_subpage_readme_txt_05'); ?>

+ +
+

+ + msg($page.'_subpage_readme_txt_05_01') . "
"; + ?> + +

+
+
+ +
+

msg($page.'_subpage_readme_txt_06'); ?>

+ +
+

+ + msg($page.'_subpage_readme_txt_06_01') . "
"; + ?> + +

+
+
diff --git a/uninstall.inc.php b/uninstall.inc.php index f6b5a51..517fc86 100644 --- a/uninstall.inc.php +++ b/uninstall.inc.php @@ -1,27 +1,33 @@ www.contic.de * * @package redaxo4 * @version svn:$Id$ */ +/** + * MarkitUp Lib + * @link https://github.com/markitup/1.x + * @version 1.1.4 + */ // AddOn-MARKITUP - ////////////////////////////////////////////////////////////////////////////////// - // CONFIG - ////////////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////////////////////////////////// + // CONFIG + ////////////////////////////////////////////////////////////////////////////////// + + // VARs + $page = "gs_markitup"; + + ////////////////////////////////////////////////////////////////////////////////// + // UNINSTALL + ////////////////////////////////////////////////////////////////////////////////// - // VARs - $addon_name = "gs_markitup"; - - ////////////////////////////////////////////////////////////////////////////////// - // UNINSTALL - ////////////////////////////////////////////////////////////////////////////////// - - $REX['ADDON']['install'][$addon_name] = 0; + $REX['ADDON']['install'][$page] = FALSE; ?> \ No newline at end of file diff --git a/uninstall.sql b/uninstall.sql deleted file mode 100644 index a2e74bd..0000000 --- a/uninstall.sql +++ /dev/null @@ -1,20 +0,0 @@ -#********************************************* -# -# UNINSTALLTION -# -# Autor: G.Seilheimer -# Company: contic.de -# Version: 1.1.14 -# Update: 2013-03-09 -# CMS: Redaxo 4.5 -# -#********************************************* - - -#********************************************* -# -# delete values from rex_template -# -#********************************************* - -DELETE FROM `%TABLE_PREFIX%template` WHERE `id`=711 LIMIT 1; \ No newline at end of file