Skip to content

Commit

Permalink
Border between preview iframes
Browse files Browse the repository at this point in the history
  • Loading branch information
Victor Josson committed Mar 2, 2015
1 parent 186eec8 commit 6beba80
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 13 deletions.
2 changes: 1 addition & 1 deletion arlima.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Plugin URI: https://github.com/victorjonsson/Arlima
Description: Manage the order of posts on your front page, or any page you want. This is a plugin suitable for online newspapers that's in need of a fully customizable front page.
Author: VK (<a href="http://twitter.com/chredd">@chredd</a>, <a href="http://twitter.com/znoid">@znoid</a>, <a href="http://twitter.com/victor_jonsson">@victor_jonsson</a>, <a href="http://twitter.com/lefalque">@lefalque</a>)
Version: 3.1.beta.35
Version: 3.1.beta.36
License: GPL2
License URI: http://www.gnu.org/licenses/gpl-2.0.html
*/
Expand Down
5 changes: 0 additions & 5 deletions classes/WP/Plugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -763,11 +763,6 @@ public function addAdminJavascriptVars($handle)

/**
* Will enqueue the css for the presentation of articles in an arlima list.
* There is two ways to add the template CSS.
* Old way: return URL to css file in filter arlima_template_css. The css
* file will be added to the header in arlima admin
* New way: return array with URL´s to stylesheets that will be added to
* iframe in arlima admin
*/
function addTemplateCSS()
{
Expand Down
2 changes: 1 addition & 1 deletion classes/docs.md
Original file line number Diff line number Diff line change
Expand Up @@ -794,7 +794,7 @@ isInScheduledInterval('*:*'); // All days of the week and all hours of the day
| public | <strong>addAttachmentMetaBox()</strong> : <em>void</em><br /><em>Adds attachment meta box</em> |
| public | <strong>addExportFeeds()</strong> : <em>void</em><br /><em>Adds arlima export feed to Wordpress</em> |
| public | <strong>addMetaBox()</strong> : <em>void</em><br /><em>Adds meta box to post edit/create page</em> |
| public | <strong>addTemplateCSS()</strong> : <em>void</em><br /><em>Will enqueue the css for the presentation of articles in an arlima list. There is two ways to add the template CSS. Old way: return URL to css file in filter arlima_template_css. The css file will be added to the header in arlima admin New way: return array with URL´s to stylesheets that will be added to iframe in arlima admin</em> |
| public | <strong>addTemplateCSS()</strong> : <em>void</em><br /><em>Will enqueue the css for the presentation of articles in an arlima list.</em> |
| public | <strong>adminBar()</strong> : <em>void</em> |
| public | <strong>adminInitHook()</strong> : <em>void</em><br /><em>Function called on init in wp-admin</em> |
| public | <strong>adminMenu()</strong> : <em>void</em><br /><em>Creates the menu in wp-admin for this plugin</em> |
Expand Down
2 changes: 1 addition & 1 deletion constants.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
or define('ARLIMA_COMPILE_LESS_IN_BROWSER', ARLIMA_DEV_MODE);

// Plugin version (only edit this via grunt!)
define('ARLIMA_PLUGIN_VERSION', '3.1.beta.35');
define('ARLIMA_PLUGIN_VERSION', '3.1.beta.36');
define('ARLIMA_FILE_VERSION', ARLIMA_PLUGIN_VERSION .(ARLIMA_DEV_MODE ? '__'.time():''));

// Which type of tag to use for images in Arlima RSS feeds
Expand Down
4 changes: 2 additions & 2 deletions js/arlima/arlima.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/arlima/dev/ArlimaArticlePreview.js
Original file line number Diff line number Diff line change
Expand Up @@ -342,8 +342,8 @@ var ArlimaArticlePreview = (function($, window, Mustache, ArlimaUtils, ArlimaJS)
iframes.push(_this.$iframeBody[0]);

for (i=_this.$iframe.length; i<_this.width.length;i++) {
_this.$elem.append('<iframe name="arlima-preview-iframe" id="arlima-preview-iframe-'+i+'" style="overflow: hidden; width: '+_this.width[i]+'px; height:0" scrolling="no" border="0" frameborder="0"></iframe>');
// _this.$elem.append('<div class="iframe-wrapper"><iframe name="arlima-preview-iframe" id="arlima-preview-iframe-'+i+'" style="width: '+_this.width[i]+'px;" scrolling="no" border="0" frameborder="0"></iframe></div>');
//_this.$elem.append('<iframe name="arlima-preview-iframe" id="arlima-preview-iframe-'+i+'" style="overflow: hidden; width: '+_this.width[i]+'px; height:0" scrolling="no" border="0" frameborder="0"></iframe>');
_this.$elem.append('<div class="iframe-wrapper"><iframe name="arlima-preview-iframe" id="arlima-preview-iframe-'+i+'" style="width: '+_this.width[i]+'px;" scrolling="no" border="0" frameborder="0"></iframe></div>');
var anotherPreview = _this.$elem.find('#arlima-preview-iframe-'+i).contents();

// Add stylesheets
Expand Down
2 changes: 1 addition & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Contributors: @chredd, @znoid, @victor_jonsson, @lefalque, @aaslun
Tags: CMS, e-paper, e-magazine, magazine, newspaper, front page, wysiwyg
Requires at least: 3.8
Tested up to: 3.9.1
Stable tag: 3.1.beta.35
Stable tag: 3.1.beta.36
License: GPL2
License URI: http://www.gnu.org/licenses/gpl-2.0.html

Expand Down

0 comments on commit 6beba80

Please sign in to comment.