Merge branch 'release/v1.2.1'

README.md

@@ -2,7 +2,7 @@
 
 * [Website](http://pyrocms.com/)
 * [Documentation](http://pyrocms.com/documentation)
-* Version: 1.2.0
+* Version: 1.2.1
 
 ## Team
 

addons/modules/galleries/controllers/admin.php

@@ -411,10 +411,9 @@ public function ajax_select_folder($folder_id)
 		{
 			$folder->images = $this->gallery_images_m->get_images_by_file_folder($folder->id);
 
-			echo json_encode($folder);
-
-			return;
+			return $this->template->build_json($folder);
 		}
+
 		echo FALSE;
 	}
 

addons/modules/galleries/models/gallery_images_m.php

@@ -42,7 +42,7 @@ public function get_images_by_gallery($id, $options = array())
 
 		if (isset($options['offset']))
 		{
-			$this->db->limit($options['offset']);
+			$this->db->offset($options['offset']);
 		}
 
 		if (isset($options['limit']))

addons/modules/galleries/plugin.php

@@ -43,7 +43,8 @@ function images()
 	{
 		$limit	= $this->attribute('limit');
 		$slug	= $this->attribute('slug');
-
+		$offset = $this->attribute('offset');
+
 		$this->load->model(array(
 			'galleries_m',
 			'gallery_images_m'
@@ -52,7 +53,8 @@ function images()
 		$gallery = $this->galleries_m->get_by('slug', $slug);
 
 		return $gallery ? $this->gallery_images_m->get_images_by_gallery($gallery->id, array(
-			'limit' => $limit
+			'limit' => $limit,
+			'offset' => $offset
 		)) : array();
 	}
 

addons/modules/galleries/views/admin/form.php

@@ -84,7 +84,7 @@
 						<?php if ( $gallery_images !== FALSE ): ?>
 						<?php foreach ( $gallery_images as $image ): ?>
 						<li>
-							<a href="<?php echo site_url() . 'admin/files/edit/' . $image->file_id; ?>" class="upload_colorbox">
+							<a href="<?php echo site_url() . 'admin/files/edit/' . $image->file_id; ?>" class="modal">
 								<?php echo img(array('src' => site_url() . 'files/thumb/' . $image->file_id, 'alt' => $image->name, 'title' => 'Title: ' . $image->name . ' -- Caption: ' . $image->description)); ?>
 								<?php echo form_hidden('action_to[]', $image->id); ?>
 							</a>

addons/themes/minimal/css/main.css

@@ -275,7 +275,8 @@ blockquote
 #footer
 {
 	border-top:		3px solid #333;
-	margin:			50px 0px 10px 0px;
+	margin-top:		50px; 
+	margin-bottom:	10px;
 	padding-top:	25px;
 	text-align:		center;
 }

documentation/designers/getting_started.html

@@ -39,26 +39,66 @@ <h3>theme.php</h3>
 
 <p>
 	No real PHP experience is required to edit this file, just remember to put a \ before any ' you write into the strings or you will create a syntax
-	error.
+	error. As mentioned below in the Theme Options section the "public $options" array is optional. If you do not want to add options simply remove 
+	that section.
 </p>
 
 <pre><code class="code php">&lt;?php defined('BASEPATH') OR exit('No direct script access allowed');
 
 class Theme_Custom extends Theme
 {
-    public $name = 'My Theme';
-    public $author = 'John Smith';
-    public $author_website = 'http://example.com';
-    public $website = 'http://exsmple.com/themes/mytheme';
-    public $description = 'An awesome theme in blue and green with two columns and stuff.';
-    public $version = '1.0';
+    public $name            = 'My Theme';
+    public $author          = 'John Smith';
+    public $author_website  = 'http://example.com';
+    public $website         = 'http://example.com/themes/mytheme';
+    public $description     = 'An awesome theme in blue and green with two columns and stuff.';
+    public $version         = '1.0';
+
+    public $options         =  array(
+        'show_breadcrumbs' =>   array('title'         => 'Show Breadcrumbs',
+                                      'description'   => 'Would you like to display breadcrumbs?',
+                                      'default'       => 'yes',
+                                      'type'          => 'radio',
+                                      'options'       => 'yes=Yes|no=No',
+                                      'is_required'   => TRUE),
+        'layout' =>             array('title'         => 'Layout',
+                                      'description'   => 'Which type of layout shall we use?',
+                                      'default'       => '2 column',
+                                      'type'          => 'select',
+                                      'options'       => '2 column=Two Column|full-width=Full Width',
+                                      'is_required'   => TRUE),
+     );
+
 }
 
 /* End of file theme.php */</code></pre>
+<h3>Theme Options</h3>
+<p>
+	This feature is optional and may not be necessary for simple themes
+	but for more complex themes it is can be very helpful. The options defined here are accessible in the admin panel via Design > Themes > Options.
+	If you are creating a theme and add another option to theme.php just click the Re-index button in the Options window. This will load the
+	latest options from your theme.php file.
+</p>
+
+<p>
+	The available form types are:
+	<ul>
+		<li>radio</li>
+		<li>checkbox</li>
+		<li>select</li>
+		<li>select-multiple</li>
+		<li>text</li>
+		<li>textarea</li>
+		<li>password</li>
+	</ul>
+	If we were to use a tag to access this example it would look like this:
+<pre><code>{pyro:theme:options option="layout"}</code></pre>
+	And it would output either "2 column" or "full-width" depending on the selection in the dropdown in the admin panel.
+</p>
 
-<h3>screenshot.png</h3>
 
 <p>
+	<h3>screenshot.png</h3>
 	So you can see a preview of your theme in the CP > Design > Themes area you will need to create a screenshot and place it
 	in <dfn>addons/themes/custom/screenshot.png</dfn>. Make it any size you like but 500x400 is probably about right.
 </p>

documentation/designers/plugins/theme.html

@@ -8,6 +8,39 @@ <h1>Theme Plugin</h1>
 
 <h2>Functions</h2>
 
+<h3>{pyro:theme:options}</h3>
+
+<p>
+	Displays an option for the current theme. To read more about this tag
+	and its usage refer to the <a href="#designers/getting_started.html">theme documentation.</a>
+</p>
+
+<p><strong>Parameters</strong></p>
+
+<table cellpadding="0" cellspacing="0">
+
+	<tr>
+		<th>Parameter</th>
+		<th>Description</th>
+	</tr>
+
+	<tr>
+		<td width="100">option</td>
+		<td>Required. The option slug to request from the theme.</td>
+	</tr>
+
+</table>
+
+<p><strong>Example:</strong></p>
+
+<pre><code>{if '{pyro:theme:options option="layout"}' == 'full-width'}
+	&lt;div class="full-width"&gt;
+		{pyro:template:body}
+	&lt;/div&gt;
+{/if}</code></pre>
+
+<br />
+
 <h3>{pyro:theme:partial}</h3>
 
 <p>Loads partial from the current theme.</p>

documentation/designers/tags/galleries.html

@@ -29,6 +29,12 @@ <h3>{pyro:galleries:images}</h3><br />
 		<td width="100">All</td>
 		<td>Optional. Limit the number of displayed images.</td>
 	</tr>
+
+	<tr>
+		<td width="100">offset</td>
+		<td width="100">0</td>
+		<td>Optional. Offset the images when retrieving them with a limit set.</td>
+	</tr>
 
 </table>
 

documentation/designers/tags/pages.html

@@ -80,7 +80,10 @@ <h3>{pyro:pages:children}</h3><br />
 
 <h3>{pyro:pages:display}</h3><br />
 
-<p>A tag that allows any one page to be displayed inside other content.</p>
+<p>
+	A tag that allows any one page to be displayed inside other content. Can be used as a double tag for
+	ultimate control or a single tag to output the page body only.
+</p>
 
 <p><strong>Parameters</strong></p>
 
@@ -106,7 +109,7 @@ <h3>{pyro:pages:display}</h3><br />
 
 </table>
 
-<p><strong>Example</strong></p>
+<p><strong>Examples</strong></p>
 
 <pre><code>{pyro:pages:display slug="home"}
 	&lt;h2&gt;{title}&lt;/h2&gt;
@@ -119,6 +122,13 @@ <h3>{pyro:pages:display}</h3><br />
 
 <br />
 
+<pre><code>{pyro:pages:display slug="home"}</code></pre>
+
+<pre><code>&lt;p&gt;Page Body&lt;/p&gt;
+</code></pre>
+
+<br />
+
 <h3>{pyro:pages:is}</h3><br />
 
 <p>A tag that says if a page is direct child of another page or is descendent of another page.</p>

documentation/general/changelog.html

@@ -1,5 +1,22 @@
 <h2>Change Log</h2>
 
+<h3>v1.2.1</h3>
+
+<h4>Bugs</h4>
+
+<ul>
+	<li>Unzip library shows the path that is unwritable if an addon upload fails.</li>
+	<li>Special characters are now stripped from filenames on upload.</li>
+	<li>{pyro:pages:display} now displays the page body when used as a single tag.</li>
+	<li>Fixed the yellow bar that displayed at the top of the admin panel in IE8</li>
+	<li>Fixed bug where analytics graph wouldn't display in IE.</li>
+	<li>Fixed issue #524. php error when page was restricted and segment was empty.</li>
+	<li>Fixed bug where gallery thumbnails wouldn't open in modal window (admin manage).</li>
+	<li>Fixed bug where the visitor's info displayed when viewing another user's profile page.</li>
+	<li>Added @font-face file extensions to the theme uploader to keep the files from getting stripped.</li>
+	<li>Modified the edit css class so buttons with the class of edit wouldn't display pencils :)</li>
+</ul>
+
 <h3>v1.2.0</h3>
 
 <ul>
@@ -12,7 +29,7 @@ <h3>v1.2.0</h3>
 	<li>Breadcrumbs will be automatically set for the entire trail of pages.</li>
 	<li>Upgraded to CodeIgniter 2.0.1.</li>
 	<li>Ran all png's through pngcrush to save some file-space and decrease load times.</li>
-	<li>Added Greek, Hebrew, Finnish, and Slovenian language support.</li>
+	<li>Added Greek, Hebrew, Finnish, Slovenian and Lithuanian language support.</li>
 	<li>Inline documentation can now be multi-lingual.</li>
 	<li>iPhones and iPads should now been seen as mobile devices.</li>
 	<li>Hide the graph if the Google Analytics details are not filled in.</li>

documentation/general/upgrades/v1.html

@@ -12,15 +12,17 @@ <h3>Update the filesystem</h3>
 
 <blockquote>git pull git://github.com/pyrocms/pyrocms.git tag v1.1.0</blockquote>
 
-<p>3.) Erase the system folder and replace with the new version. Put your old application/config/config.php and application/config/database.php files back.</p>
+<p>3.) Erase the system folder and replace with the new version. Put your old system/pyrocms/config/config.php and system/pyrocms/config/database.php
+	files back. You may want to compare to make sure the files have not changed in the newer version or just copy your config information into the new files.</p>
 
-<p>4.) Erase bundled modules in addons/modules (galleries) and replace with the updated version.</p>
+<p>4.) Replace the index.php file with the newer version.</p>
 
-<p>5.) Make the following folders writable:</p>
+<p>5.) Erase bundled modules in addons/modules (galleries) and replace with the updated version.</p>
+
+<p>6.) Make the following folders writable:</p>
 
 <ul>
-	<li>system/codeigniter/cache</li>
-	<li>system/codeigniter/logs</li>
+	<li>system/pyrocms/logs</li>
 	<li>system/pyrocms/cache</li>
 	<li>system/pyrocms/cache/simplepie</li>
 	<li>system/pyrocms/config</li>

documentation/index.html

@@ -21,7 +21,7 @@
 		<header id="main-header">
 			<img src="assets/images/logo.png" class="logo" />
 
-			<h1><a href="./">PyroCMS Documentation</a> : v1.2.0</h1>
+			<h1><a href="./">PyroCMS Documentation</a> : v1.2.1</h1>
 
 			<nav id="nav-main">
 				<ul>

installer/config/constants.php

@@ -91,4 +91,4 @@
 |
 */
 
-define('CMS_VERSION', '1.2.0');
+define('CMS_VERSION', '1.2.1');

installer/language/italian/complete_lang.php

@@ -2,10 +2,10 @@
 
 // labels
 $lang['congrats']			= 'Congratulazioni';
-$lang['intro_text']			= 'PyroCMS è stato installato ed è pronot! Per favore entra nel pannello di controllo con i seguenti parametri.';
+$lang['intro_text']			= 'PyroCMS è stato installato ed è pronot! Per favore entra nel pannello di controllo con i seguenti parametri.';
 $lang['email']				= 'E-mail';
 $lang['password']			= 'Password';
-$lang['outro_text']			= 'Ed infine, <strong>elimina la cartella installer dal tuo server</strong> perchè se lasciata al suo posto può permettere l\'hackeraggio del tuo sito.';
+$lang['outro_text']			= 'Ed infine, <strong>elimina la cartella installer dal tuo server</strong> perchè se lasciata al suo posto può permettere l\'hackeraggio del tuo sito.';
 
 $lang['go_website']			= 'Vai al sito';
 $lang['go_control_panel']	= 'Vai al Pannello di Controllo';

installer/language/italian/step_1_lang.php

@@ -2,7 +2,7 @@
 
 // labels
 $lang['header']			=	'Passo 1: Configura Database e Server';
-$lang['intro_text']		=	'Prima di verificare il database, abbiamo bisogno di sapere dov\' è e quali sono i parametri di accesso.';
+$lang['intro_text']		=	'Prima di verificare il database, abbiamo bisogno di sapere dov\' è e quali sono i parametri di accesso.';
 
 $lang['db_settings']	=	'Impostazioni del Database';
 $lang['db_text']		=	'Per verificare la versione del tuo server MySQL devi inserire hostname, username e password nel modulo sottostante. Questi parametri saranno inoltre usati per installare il database.';

installer/language/italian/step_3_lang.php

@@ -21,7 +21,7 @@
 $lang['retry']			= 'Riprova';
 
 // messages
-$lang['step1_failure']		= 'È necessario fornire le impostazioni del database nel modulo sottostante.';
+$lang['step1_failure']		= 'È necessario fornire le impostazioni del database nel modulo sottostante.';
 
 /* End of file step_3_lang.php */
 /* Location: ./installer/language/italian/step_3_lang.php */

installer/language/italian/step_4_lang.php

@@ -17,13 +17,13 @@
 $lang['conf_password']	=	'Conferma Password';
 $lang['finish']			=	'Installa';
 
-$lang['error_101']		=	'Il database non è stato trovato. Se hai chiesto all\' installer di crearlo, il problema potrebbero essere i permessi non corretti.';
-$lang['error_102']		=	'L\' installer non può aggiungere nessuna tabella al database.';
-$lang['error_103']		=	'L\' installer non può inserire dati nel database.';
-$lang['error_104']		=	'L\' installer non può creare l\' utente di default.';
-$lang['error_105']		=	'Il file di configurazione del database non può essere scritto, hai imbrgliato l\' installer saltando il passo 3?';
-$lang['error_106']		=	'Il file config non può essere scritto, sei sicuro che il file abbia i giusti permessi ?';
-$lang['success']		=	'PyroCMS è stato installato con successo.';
+$lang['error_101']		=	'Il database non è stato trovato. Se hai chiesto all\' installer di crearlo, il problema potrebbero essere i permessi non corretti.';
+$lang['error_102']		=	'L\' installer non può aggiungere nessuna tabella al database.';
+$lang['error_103']		=	'L\' installer non può inserire dati nel database.';
+$lang['error_104']		=	'L\' installer non può creare l\' utente di default.';
+$lang['error_105']		=	'Il file di configurazione del database non può essere scritto, hai imbrgliato l\' installer saltando il passo 3?';
+$lang['error_106']		=	'Il file config non può essere scritto, sei sicuro che il file abbia i giusti permessi ?';
+$lang['success']		=	'PyroCMS è stato installato con successo.';
 
 /* End of file step_4_lang.php */
 /* Location: ./installer/language/italian/step_4_lang.php */