diff --git a/classes/lnApp/Controller/TemplateDefault.php b/classes/lnApp/Controller/TemplateDefault.php index 989ca16..e5ea60f 100644 --- a/classes/lnApp/Controller/TemplateDefault.php +++ b/classes/lnApp/Controller/TemplateDefault.php @@ -145,10 +145,14 @@ abstract class lnApp_Controller_TemplateDefault extends Kohana_Controller_Templa $this->meta->description = sprintf('%s::%s',$this->request->controller(),$this->request->action()); // For any ajax rendered actions, we'll need to capture the content and put it in the response - } elseif ($this->request->is_ajax() && isset($this->template->content) && ! $this->response->body()) { + } elseif ($this->request->is_ajax()) { $output = Style::factory()->render_all(); $output .= Script::factory()->render_all(); - $output .= $this->template->content; + + if (! isset($this->template->content) AND $this->response->body()) + $output .= $this->response->body(); + else + $output .= $this->template->content; $this->response->body($output); } diff --git a/classes/lnApp/HTMLRender.php b/classes/lnApp/HTMLRender.php index 92d32ac..e181850 100644 --- a/classes/lnApp/HTMLRender.php +++ b/classes/lnApp/HTMLRender.php @@ -77,14 +77,14 @@ abstract class lnApp_HTMLRender { /** * Render all of these items */ - public static function render_all() { + public function render_all() { $output = ''; - $o = static::factory(); - for ($x=0; $xrecord($x); + if (isset(static::$_data[$x])) { + $output .= (string)$this->record($x); + unset(static::$_data[$x]); + } return $output; } diff --git a/classes/lnApp/SystemMessage.php b/classes/lnApp/SystemMessage.php index 88f938d..4b04dc9 100644 --- a/classes/lnApp/SystemMessage.php +++ b/classes/lnApp/SystemMessage.php @@ -77,7 +77,7 @@ abstract class lnApp_SystemMessage extends HTMLRender { /** * Render all of these items */ - public static function render_all() { + public function render_all() { // Reload our message from the session if ($msgs = Session::instance()->get_once('sessionmsgs')) static::$_data = $msgs; diff --git a/media/theme/bootstrap/vendor/bootstrap-wysihtml5-0.0.2/.DS_Store b/media/theme/bootstrap/vendor/bootstrap-wysihtml5-0.0.2/.DS_Store deleted file mode 100644 index a04ecd3..0000000 Binary files a/media/theme/bootstrap/vendor/bootstrap-wysihtml5-0.0.2/.DS_Store and /dev/null differ diff --git a/media/theme/bootstrap/vendor/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5-0.0.2.js b/media/theme/bootstrap/vendor/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5-0.0.2.js deleted file mode 100644 index 4e3c636..0000000 --- a/media/theme/bootstrap/vendor/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5-0.0.2.js +++ /dev/null @@ -1,299 +0,0 @@ -!function($, wysi) { - "use strict" - - var templates = { - "font-styles": "
  • " + - "" + - " Normal text " + - "" + - "" + - "
    • ", - "emphasis": "
  • " + - "
    " - + "Bold" - + "Italic" - //,+ "Underline" - + "
    " - + "
    • ", - "lists": "
  • " - + "
    " - + "" - + "" - + "" - + "" - + "
    " - + "
    • ", - - "link": "
  • " - - + "
    " - + "
    " - + "×" - + "

    Insert Link

    " - + "
    " - + "
    " - + "" - + "
    " - + "
    " - + "Cancel" - + "Insert link" - + "
    " - + "
    " - - + "" - - + "
    • ", - - "image": "
  • " - - + "
    " - + "
    " - + "×" - + "

    Insert Image

    " - + "
    " - + "
    " - + "" - + "
    " - + "
    " - + "Cancel" - + "Insert image" - + "
    " - + "
    " - - + "" - - + "
    • ", - - "html": - "
  • " - + "
    " - + "" - + "
    " - + "
    • " - }; - - var defaultOptions = { - "font-styles": true, - "emphasis": true, - "lists": true, - "html": false, - "link": true, - "image": true, - events: {}, - parserRules: { - tags: { - "b": {}, - "i": {}, - "br": {}, - "ol": {}, - "ul": {}, - "li": {}, - "h1": {}, - "h2": {}, - "u": 1, - "img": { - "check_attributes": { - "width": "numbers", - "alt": "alt", - "src": "url", - "height": "numbers" - } - }, - "a": { - set_attributes: { - target: "_blank", - rel: "nofollow" - }, - check_attributes: { - href: "url" // important to avoid XSS - } - } - } - } - }; - - var Wysihtml5 = function(el, options) { - this.el = el; - this.toolbar = this.createToolbar(el, options || defaultOptions); - this.editor = this.createEditor(options); - - window.editor = this.editor; - - $('iframe.wysihtml5-sandbox').each(function(i, el){ - $(el.contentWindow).off('focus.wysihtml5').on({ - 'focus.wysihtml5' : function(){ - $('li.dropdown').removeClass('open'); - } - }); - }); - }; - - Wysihtml5.prototype = { - constructor: Wysihtml5, - - createEditor: function(options) { - var parserRules = defaultOptions.parserRules; - - if(options && options.parserRules) { - parserRules = options.parserRules; - } - - var editor = new wysi.Editor(this.el.attr('id'), { - toolbar: this.toolbar.attr('id'), - parserRules: parserRules - }); - - if(options && options.events) { - for(var eventName in options.events) { - editor.on(eventName, options.events[eventName]); - } - } - - return editor; - }, - - createToolbar: function(el, options) { - var self = this; - var toolbar = $("