Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base: 9d2298c05c
...
compare: 08d6d68e03
  • 19 commits
  • 12 files changed
  • 1 commit comment
  • 1 contributor
View
4 e107slider/admin_config.php
@@ -24,7 +24,7 @@
exit;
}
-include_lan(e_PLUGIN.'vanilla_slider/languages/".e_LANGUAGE.".php');
+include_lan(e_PLUGIN.'e107slider/languages/".e_LANGUAGE.".php');
require_once( e_ADMIN . "auth.php" );
@@ -107,7 +107,7 @@
<p class='licence'>Copyright (c) 2011-2012 Viljami Salminen, <a href='http://viljamis.com/'>http://viljamis.com/</a></p>
- <p class='licence'>Licensed under the <a href='http://www.opensource.org/licenses/mit-license.php'>MIT</a>MIT</a> license.</p>
+ <p class='licence'>Licensed under the <a href='http://www.opensource.org/licenses/mit-license.php'>MIT</a> license.</p>
</td>
</tr>
View
8 e107slider/admin_menu.php
@@ -29,13 +29,11 @@
$var['admin_news_slider_settings']['text'] = ES_PLUGIN_MU_2;
$var['admin_news_slider_settings']['link'] = 'admin_news_slider_settings.php';
-show_admin_menu(es_PLUGIN_MU_3, $action, $var);
+show_admin_menu(ES_PLUGIN_MU_3, $action, $var);
$vanillatheme_text = "
- <div class='tip'>
- <h3>".ES_PLUGIN_MU_5."</h3>
- <p>".ES_PLUGIN_MU_5."</p>
- </div>
+ <h3>".ES_PLUGIN_MU_5."</h3>
+ ".ES_PLUGIN_MU_6."
";
$ns->tablerender('', $vanillatheme_text);
View
0  e107slider/vanillaslider_menu.php → e107slider/e107slider_menu.php
File renamed without changes
View
2  e107slider/vanillaslider_news_menu.php → e107slider/e107slider_news_menu.php
@@ -50,4 +50,4 @@
</div>
";
-$ns -> tablerender( $pref['es_slider_news_title'], $es_text, 'e107newsslider' );
+$ns -> tablerender( $pref['es_slider_news_title'], $es_text, 'e107slider_news' );
View
0  e107slider/vanillaslider_sql.php → e107slider/e107slider_sql.php
File renamed without changes
View
44 e107slider/e_meta.php
@@ -15,14 +15,14 @@
*/
if(basename($_SERVER['PHP_SELF'])=='admin_slider_settings.php' || basename($_SERVER['PHP_SELF'])=='admin_news_slider_settings.php' || basename($_SERVER['PHP_SELF'])=='admin_config.php' ) {
-echo '<link rel="stylesheet" type="text/css" href="'.e_PLUGIN_ABS.'vanilla_slider/style.css" />';
+echo '<link rel="stylesheet" type="text/css" href="'.e_PLUGIN_ABS.'e107slider/style.css" />';
}
if(basename($_SERVER['PHP_SELF'])=='admin_slider.php' ) {
-echo '<link rel="stylesheet" type="text/css" href="'.e_PLUGIN_ABS.'vanilla_slider/style.css" />
+echo '<link rel="stylesheet" type="text/css" href="'.e_PLUGIN_ABS.'e107slider/style.css" />
<script type="text/javascript">
function addtext(sc) {
- document.forms.dataform.vs_image.value=sc;
+ document.forms.dataform.es_image.value=sc;
}
</script>';
}
@@ -30,33 +30,33 @@ function addtext(sc) {
global $pref;
echo "
- <link rel='stylesheet' type='text/css' href='".e_PLUGIN."vanilla_slider/css/responsiveslides.css' media='screen' />
+ <link rel='stylesheet' type='text/css' href='".e_PLUGIN."e107slider/css/responsiveslides.css' media='screen' />
<script src='//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js'></script>
- <!--<script src='".e_PLUGIN."vanilla_slider/scripts/jquery-1.7.2.min.js'></script>-->
- <script src='".e_PLUGIN."vanilla_slider/scripts/responsiveslides.min.js'></script>
+ <!--<script src='".e_PLUGIN."e107slider/scripts/jquery-1.7.2.min.js'></script>-->
+ <script src='".e_PLUGIN."e107slider/scripts/responsiveslides.min.js'></script>
<script type='text/javascript'>
$(function () {
$(\".rslides1\").responsiveSlides({
- auto: ".$pref['vs_slider_auto'].",
- speed: ".$pref['vs_slider_speed'].",
- timeout: ".$pref['vs_slider_timeout'].",
- pager: ".$pref['vs_slider_pager'].",
- nav: ".$pref['vs_slider_nav'].",
- random: ".$pref['vs_slider_random'].",
- pause: ".$pref['vs_slider_pause'].",
- pauseControls: ".$pref['vs_slider_pauseControls']."
+ auto: ".$pref['es_slider_auto'].",
+ speed: ".$pref['es_slider_speed'].",
+ timeout: ".$pref['es_slider_timeout'].",
+ pager: ".$pref['es_slider_pager'].",
+ nav: ".$pref['es_slider_nav'].",
+ random: ".$pref['es_slider_random'].",
+ pause: ".$pref['es_slider_pause'].",
+ pauseControls: ".$pref['es_slider_pauseControls']."
});
$(\".rslides2\").responsiveSlides({
- auto: ".$pref['vs_slider_news_auto'].",
- speed: ".$pref['vs_slider_news_speed'].",
- timeout: ".$pref['vs_slider_news_timeout'].",
- pager: ".$pref['vs_slider_news_pager'].",
- nav: ".$pref['vs_slider_news_nav'].",
- random: ".$pref['vs_slider_news_random'].",
- pause: ".$pref['vs_slider_news_pause'].",
- pauseControls: ".$pref['vs_slider_news_pauseControls']."
+ auto: ".$pref['es_slider_news_auto'].",
+ speed: ".$pref['es_slider_news_speed'].",
+ timeout: ".$pref['es_slider_news_timeout'].",
+ pager: ".$pref['es_slider_news_pager'].",
+ nav: ".$pref['es_slider_news_nav'].",
+ random: ".$pref['es_slider_news_random'].",
+ pause: ".$pref['es_slider_news_pause'].",
+ pauseControls: ".$pref['es_slider_news_pauseControls']."
});
});
View
12 e107slider/languages/English.php
@@ -27,9 +27,9 @@
define(ES_PLUGIN_MU_1, 'Image Slider');
define(ES_PLUGIN_MU_2, 'News Slider');
define(ES_PLUGIN_MU_3, 'Slider Settings');
-define(ES_PLUGIN_MU_4, 'Introduction');
+define(ES_PLUGIN_MU_4, 'Plugin Details');
define(ES_PLUGIN_MU_5, 'Vanilla Theme');
-define(ES_PLUGIN_MU_6, 'Vanilla is the ultimate e107 theme! It\'s as close to an e107 theme builder as you\'re going to get.');
+define(ES_PLUGIN_MU_6, '<p>Build an unlimited number of unique sites with the most powerful e107 theme on the market!</p><p><a href="http://www.xenthemes.com/product/e107/vanilla/">View Vanilla Theme Details</a></p>');
/*admin_slider_settings.php*/
define(ES_PLUGIN_SS_1, 'Slider Settings');
@@ -65,12 +65,12 @@
define(ES_PLUGIN_PL_3, 'Plugin Updated Successfully!');
/*admin_config.php*/
-define(ES_PLUGIN_CF_1, 'Introduction');
-define(ES_PLUGIN_CF_2, 'The e107Slider Plugin is a lightweight responsive slider built using ResponsiveSlides.js. The plugin has 2 menus, an <a href=\''.e_PLUGIN.'vanilla_slider/admin_slider_settings.php\'>image slider</a> and a <a href=\''.e_PLUGIN.'vanilla_slider/admin_news_slider_settings.php\'>news slider</a>.');
+define(ES_PLUGIN_CF_1, 'Plugin Details');
+define(ES_PLUGIN_CF_2, 'The e107Slider Plugin is a lightweight responsive slider built using ResponsiveSlides.js. The plugin has 2 menus, an <a href=\''.e_PLUGIN.'e107/admin_slider_settings.php\'>image slider</a> and a <a href=\''.e_PLUGIN.'e107slider/admin_news_slider_settings.php\'>news slider</a>.');
define(ES_PLUGIN_CF_3, 'ResponsiveSlides.js is a tiny jQuery plugin that creates a responsive slider using list items inside &#60;ul&#62;. It works with wide range of browsers including all IE versions from IE6 and up. It also adds css max-width support for IE6 and other browsers that don\'t natively support it. Its only dependency is that <strong>all the images are the same size</strong>.');
define(ES_PLUGIN_CF_4, 'The biggest difference to other responsive slider plugins is the file size (1kb minified and gzipped).');
define(ES_PLUGIN_CF_5, 'Instructions');
-define(ES_PLUGIN_CF_6, 'The Image Slider Menu displays image slides and an optional caption, slides can also be given a link. The menu has a number of settings which can be configured in the <a href=\''.e_PLUGIN.'vanilla_slider/admin_slider_settings.php\'>Image Slider settings</a> page.');
+define(ES_PLUGIN_CF_6, 'The Image Slider Menu displays image slides and an optional caption, slides can also be given a link. The menu has a number of settings which can be configured in the <a href=\''.e_PLUGIN.'e107/admin_slider_settings.php\'>Image Slider settings</a> page.');
define(ES_PLUGIN_CF_7, 'Add images to <code>e107_plugins/e107slider/slides/</code> then choose which image to use when you \'Add a Slide\'. <strong>Each image must be the same size</strong>. You can add an optional caption or create a link for each slide. Captions can contain HTML.');
-define(ES_PLUGIN_CF_8, 'The News Slider Menu will display your latest news posts images and headline in a responsive slider. The slides are generated from the news items image which is set when you create a news item. <strong>Each image must be the same size</strong>. You can choose how many posts to display in the <a href=\''.e_PLUGIN.'vanilla_slider/admin_news_slider_settings.php\'>News Slider settings</a> page.');
+define(ES_PLUGIN_CF_8, 'The News Slider Menu will display your latest news posts images and headline in a responsive slider. The slides are generated from the news items image which is set when you create a news item. <strong>Each image must be the same size</strong>. You can choose how many posts to display in the <a href=\''.e_PLUGIN.'e107/admin_news_slider_settings.php\'>News Slider settings</a> page.');
define(ES_PLUGIN_CF_9, 'Licence');
View
76 e107slider/languages/Swedish.php
@@ -0,0 +1,76 @@
+<?php
+/*
+ * e107Slider Plugin v0.1
+ *
+ * Copyright (C) 2007-2012 Xen Themes (xenthemes.com)
+ *
+ * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) or
+ * GPL Version 2 (http://www.gnu.org/licenses/gpl-2.0.txt) licenses
+ *
+ * $Source:
+ * $Revision: 1 $
+ * $Date: 25/05/2012 $
+ * $Author: leonlloyd $
+ *
+*/
+
+/* PLUGIN LANGUAGES */
+
+define(ES_PLUGIN_1, 'e107 bildspel');
+define(ES_PLUGIN_2, 'Inställningarna sparade');
+define(ES_PLUGIN_3, 'Spara inställningarna');
+define(ES_PLUGIN_4, 'e107 bildspel');
+define(ES_PLUGIN_5, 'e107 nyhetsartiklar');
+define(ES_PLUGIN_6, 'e107 bildspelsprogram');
+
+/*admin_menu.php*/
+define(ES_PLUGIN_MU_1, 'Bildspel');
+define(ES_PLUGIN_MU_2, 'Nyhetsartiklar');
+define(ES_PLUGIN_MU_3, 'Inställningar för bildspel');
+define(ES_PLUGIN_MU_4, 'Programdetaljer');
+define(ES_PLUGIN_MU_5, 'Vanilla tema');
+define(ES_PLUGIN_MU_6, '<p>Skapa ett obegränsat antal unika webbplatser med det mest kraftfulla e107-temat på marknaden!</p><p><a href="http://www.xenthemes.com/product/e107/vanilla/">Se detaljer om temat Vanilla</a></p>');
+
+/*admin_slider_settings.php*/
+define(ES_PLUGIN_SS_1, 'Inställningar för bildspel');
+define(ES_PLUGIN_SS_2, 'Auto-starta bildspelet:');
+define(ES_PLUGIN_SS_3, 'Övergångshastighet:');
+define(ES_PLUGIN_SS_4, 'Paus:');
+define(ES_PLUGIN_SS_5, 'Visa sidor:');
+define(ES_PLUGIN_SS_6, 'Visa kontroller:');
+define(ES_PLUGIN_SS_7, 'Slumpmässig visning:');
+define(ES_PLUGIN_SS_8, 'Pausa vid hovring:');
+define(ES_PLUGIN_SS_9, 'Pausa vid ctrl-hovring');
+define(ES_PLUGIN_SS_10, 'ID');
+define(ES_PLUGIN_SS_11, 'Rubrik');
+define(ES_PLUGIN_SS_12, 'Bild');
+define(ES_PLUGIN_SS_13, 'Länk');
+define(ES_PLUGIN_SS_14, 'Alternativ');
+define(ES_PLUGIN_SS_15, 'Antal poster att visa:');
+define(ES_PLUGIN_SS_16, 'Menyrubrik:');
+define(ES_PLUGIN_SS_17, 'Lägg till en bild');
+
+/*admin_slider.php*/
+define(ES_PLUGIN_SL_1, 'Ändra en bild');
+define(ES_PLUGIN_SL_2, 'Lägg till bilder');
+define(ES_PLUGIN_SL_3, 'Rubrik<span class="smalltext">Valfritt</span>');
+define(ES_PLUGIN_SL_4, 'Bildtext<span class="smalltext">Valfritt</span>');
+define(ES_PLUGIN_SL_5, 'Bild');
+define(ES_PLUGIN_SL_6, 'Länk URL<span class="smalltext">Valfritt</span>');
+define(ES_PLUGIN_SL_7, 'Spara inställningarna');
+define(ES_PLUGIN_SL_8, 'Spara');
+
+/*plugin.php*/
+define(ES_PLUGIN_PL_2, 'Programmet installerades utan problem!');
+define(ES_PLUGIN_PL_3, 'Programmet uppdaterades utan problem!');
+
+/*admin_config.php*/
+define(ES_PLUGIN_CF_1, 'Programdetaljer');
+define(ES_PLUGIN_CF_2, 'e107 bildspel är ett lätt och responsivt bildspel byggt med ResponsiveSlides.js. Programmet har två menyer, ett <a href=\''.e_PLUGIN.'e107/admin_slider_settings.php\'>bildspel</a> och <a href=\''.e_PLUGIN.'e107slider/admin_news_slider_settings.php\'>nyhetsartiklar</a>.');
+define(ES_PLUGIN_CF_3, 'ResponsiveSlides.js är ett litet jQuery program som skapar ett responsivt bildspel baserat på innehållet i listor &#60;ul&#62;. Det fungerar med en lång rad webbläsare, inklusive alla IE-versioner från IE6 och upp. Det lägger även till css max-width för IE6 och andra webbläsare som saknar stöd för detta. Det enda kravet är att <strong>alla bilder håller samma storlek</strong>.');
+define(ES_PLUGIN_CF_4, 'Den största skillnaden mot andra bildspel är filstorleken (1 kb gzippad).');
+define(ES_PLUGIN_CF_5, 'Instruktioner');
+define(ES_PLUGIN_CF_6, 'Bildspelsmenyn visar bilder och eventuell bildtext, bilderna kan länkas. Menyn har ett antal inställningar som kan <a href=\''.e_PLUGIN.'e107/admin_slider_settings.php\'>konfigureras under inställningarna</a>.');
+define(ES_PLUGIN_CF_7, 'Lägg till bilder i <code>e107_plugins/e107slider/slides/</code> och välj vilken bild du vill använda under \'Lägg till bilder\'. <strong>Alla bilder måste vara av samma bredd och höjd</strong>. Du kan även lägga till bildtext och länk för varje bild. Bildtexter får innehålla HTML.');
+define(ES_PLUGIN_CF_8, 'Menyn för nyhetsartiklar visar bildspel med ikon och rubrik från dina senaste nyhetsartiklar. <strong>Alla bilder måste ha samma bredd och höjd</strong>. Du kan välja antalet nyhetsartiklar som skall visas i bildspelet under <a href=\''.e_PLUGIN.'e107slider/admin_news_slider_settings.php\'>inställningarna för nyhetsartiklar</a>.');
+define(ES_PLUGIN_CF_9, 'Licens');
View
36 e107slider/licence.txt
@@ -0,0 +1,36 @@
+The MIT License (MIT)
+
+Copyright (c) 2012 Xen Themes, http://xenthemes.com
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the “Software”), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+GNU GENERAL PUBLIC LICENSE
+Version 2, June 1991
+
+Copyright (C) 2012 Xen Themes, http://xenthemes.com
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
View
15 e107slider/plugin.php
@@ -1,8 +1,8 @@
<?php
/*
- * e107Slider Plugin v0.1
+ * e107Slider Plugin
*
- * Copyright (C) 2007-2012 Xen Themes (xenthemes.com)
+ * Copyright (C) 2012 Xen Themes (xenthemes.com)
*
* Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) or
* GPL Version 2 (http://www.gnu.org/licenses/gpl-2.0.txt) licenses
@@ -20,10 +20,9 @@
$eplug_author = 'Xen Themes';
$eplug_url = 'http://www.xenthemes.com/';
$eplug_email = 'support@xenthemes.com';
-$eplug_description = '';
-$eplug_compatible = 'e107v1.0.1 +';
-$eplug_readme = '';
-$eplug_compliant = true;
+$eplug_description = 'Lightweight responsive slider menus for e107<br />Dual licensed under the <a href="'.e_PLUGIN.'e107slider/licence.txt">MIT or GPL Version 2</a> licenses';
+$eplug_compatible = 'e107v1.0.1+';
+$eplug_readme = $eplug_folder . 'readme.txt';
$eplug_folder = 'e107slider';
$eplug_menu_name = true;
$eplug_conffile = 'admin_config.php';
@@ -33,7 +32,7 @@
$eplug_prefs = array(
'es_slider_title'=>'Featured',
-'es_slider_auto'=>'random',
+'es_slider_auto'=>'true',
'es_slider_speed'=>'500',
'es_slider_timeout'=>'6000',
'es_slider_pager'=>'true',
@@ -44,7 +43,7 @@
'es_slider_news_title'=>'Latest News',
'es_slider_news_amount'=>'5',
-'es_slider_news_auto'=>'random',
+'es_slider_news_auto'=>'true',
'es_slider_news_speed'=>'500',
'es_slider_news_timeout'=>'6000',
'es_slider_news_pager'=>'true',
View
63 e107slider/readme.txt
@@ -0,0 +1,63 @@
+e107Slider Plugin
+=================
+
+Introduction
+------------
+
+The e107Slider Plugin is a lightweight responsive slider built
+using ResponsiveSlides.js. The plugin has 2 menus, an image slider
+and a news slider.
+
+ResponsiveSlides.js is a tiny jQuery plugin that creates a
+responsive slider using list items inside <ul>. It works with wide
+range of browsers including all IE versions from IE6 and up. It
+also adds css max-width support for IE6 and other browsers that
+don't natively support it. Its only dependency is that all the
+images are the same size.
+
+The biggest difference to other responsive slider plugins is the
+file size (1kb minified and gzipped).
+
+Instructions
+------------
+
+*Image Slider
+
+The Image Slider Menu displays image slides and an optional caption,
+slides can also be given a link. The menu has a number of settings
+which can be configured in the Image Slider settings page.
+
+Add images to e107_plugins/e107slider/slides/ then choose which image
+to use when you 'Add a Slide'. Each image must be the same size. You
+can add an optional caption or create a link for each slide. Captions
+can contain HTML.
+
+*News Slider
+
+The News Slider Menu will display your latest news posts images and
+headline in a responsive slider. The slides are generated from the
+news items image which is set when you create a news item. Each image
+must be the same size. You can choose how many posts to display in the
+News Slider settings page.
+
+Licence
+-------
+
+e107Slider Plugin
+e107Slider Plugin (c) copyright 2012, Xen Themes.
+Dual licensed under the MIT or GPL Version 2 licenses.
+
+jQuery - JavaScript Library
+http://jquery.com (c) Copyright 2010-2012, John Resig
+Dual licensed under the MIT or GPL Version 2 licenses.
+
+ResponsiveSlides.js
+Copyright (c) 2011-2012 Viljami Salminen, http://viljamis.com/
+Licensed under the MIT license.
+
+Changelog
+---------
+
+= 0.1 - 30 May 2012
+
+* Initial beta release
View
47 readme.md
@@ -0,0 +1,47 @@
+# e107Slider Plugin
+
+## Introduction
+
+The e107Slider Plugin is a lightweight responsive slider built using ResponsiveSlides.js. The plugin has 2 menus, an image slider and a news slider.
+
+ResponsiveSlides.js is a tiny jQuery plugin that creates a responsive slider using list items inside `<ul>`. It works with wide range of browsers including all IE versions from IE6 and up. It also adds css max-width support for IE6 and other browsers that don't natively support it. Its only dependency is that **all the images are the same size**.
+
+The biggest difference to other responsive slider plugins is the file size (1kb minified and gzipped).
+
+## Instructions
+
+### Image Slider
+
+The Image Slider Menu displays image slides and an optional caption, slides can also be given a link. The menu has a number of settings which can be configured in the Image Slider settings page.
+
+Add images to `e107_plugins/e107slider/slides/` then choose which image to use when you 'Add a Slide'. **Each image must be the same size**. You can add an optional caption or create a link for each slide. Captions can contain HTML.
+
+### News Slider
+
+The News Slider Menu will display your latest news posts images and headline in a responsive slider. The slides are generated from the news items image which is set when you create a news item. **Each image must be the same size**. You can choose how many posts to display in the News Slider settings page.');
+
+## Licence
+
+**e107Slider Plugin**
+
+e107Slider Plugin (c) copyright 2012, Xen Themes.
+
+Dual licensed under the MIT or GPL Version 2 licenses.
+
+**jQuery - JavaScript Library**
+
+http://jquery.com (c) Copyright 2010-2012, John Resig
+
+Dual licensed under the MIT or GPL Version 2 licenses.
+
+**ResponsiveSlides.js**
+
+Copyright (c) 2011-2012 Viljami Salminen, http://viljamis.com/
+
+Licensed under the MIT license.
+
+## Changelog
+
+= 0.1 - 30 May 2012
+
+* Initial beta release

Showing you all comments on commits in this comparison.

@ghostsimon

very nice but how do we alter the size of the pictrue we use Http://www.11thhrclan.co.uk

Something went wrong with that request. Please try again.