Merge branch 'release/1.2.1'

hg9x · Nov 18, 2014 · 24d3fb1 · 24d3fb1
2 parents a04d2f4 + 41dba74
commit 24d3fb1
Show file tree

Hide file tree

Showing 88 changed files with 2,224 additions and 1,673 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+.idea
+.DS_Store
+fuel/application/cache/
diff --git a/assets/css/blog.css b/assets/css/blog.css
@@ -38,7 +38,7 @@ input.search_btn { background-color: #eee; height: 22px; line-height: 12px; marg
 
 /* for form */
 .success { background-color: #cc0; padding: 2px 5px; }
-.error { background-color: #c30; color: #fff; padding: 2px 5px; margin: 0; }
+.error, .comment_error { background-color: #c30; color: #fff; padding: 2px 5px; margin: 0; }
 span.error_highlight input, span.error_highlight textarea, span.error_highlight select { border: 2px solid #c30; }
 
 

diff --git a/fuel/application/libraries/MY_Typography.php b/fuel/application/libraries/MY_Typography.php
@@ -0,0 +1,3 @@
+<?php 
+// to simplify updates, we post the main files in the fuel module
+require_once(FUEL_PATH.'libraries/MY_Typography.php');
diff --git a/fuel/application/views/_docs/index.php b/fuel/application/views/_docs/index.php
@@ -1,3 +1,7 @@
+<?php 
+$CI = get_instance();
+$CI->load->library('form_builder');
+?>
 <h1>Site Documentation for <?=$this->config->item('site_name', 'fuel')?></h1>
 <p>The following contains documentation regarding your FUEL CMS website. This site is running FUEL CMS <?=FUEL_VERSION?>. Additional FUEL documentation can be found at <a href="http://docs.getfuelcms.com" target="_blank">docs.getfuelcms.com</a>.</p>
 <ul>
@@ -18,14 +22,14 @@
 
 <h2 id="what">What is FUEL CMS?</h2>
 <p><a href="http://getfuelcms.com" target="_blank">FUEL CMS</a> is a hybrid of a CMS and a framework.
-At it's core, FUEL is a PHP/MySQL, modular-based development platform built on top of the popular <a href="http://www.codeigniter.com" target="_blank">CodeIgniter</a> framework. </p>
+At its core, FUEL is a PHP/MySQL, modular-based development platform built on top of the popular <a href="http://www.codeigniter.com" target="_blank">CodeIgniter</a> framework. </p>
 
 <p>Learn more at <a href="http://getfuelcms.com" target="_blank">getfuelcms.com</a>.</p>
 
 <h2 id="modules">Modules</h2>
 <p>The <?=$this->fuel->config('site_name')?> website contains the following modules.</p>
 
-<h3>Core Modules</h3>
+<h3 id="core_modules">Core Modules</h3>
 <ul>
 	<li><strong>Site</strong> - The following modules are part of the core functionality of FUEL CMS:
 		<ul>
@@ -52,28 +56,56 @@
 	</li>	
 </ul>
 
-<h3>Installed Modules</h3>
-<p>The following modules are currently installed for your website:</p>
+<h3 id="installed_modules">Installed Modules</h3>
+<p>The following modules are currently installed for your website with the corresponding fields:</p>
 <?php $modules = $this->fuel->modules->advanced();?>
 <ul>
-<?php foreach($modules as $mod) :  ?>
-	<li>
+<?php foreach($modules as $mod) :
+	$i = 0;
+ ?>
+	<?php if ($this->fuel->auth->has_permission($mod->name())) : ?>
+	<li id="adv_module_<?=$mod->name()?>">
 		<strong><?=$mod->friendly_name()?></strong>
 		<?php if ($mod->install_info('description')) : ?> - <?=$mod->install_info('description')?> <?php endif; ?>
 		<?php  
 			$submodules = $mod->submodules();
 			if (!empty($submodules)) : 
 		?>
 		<ul>
-			<?php  foreach($submodules as $sub) : ?>
-			<li><?=$sub->info('module_name')?></li>
+			<?php foreach($submodules as $sub) : ?>
+			<li id="sub_module_<?=$sub->info('module_name')?>">
+				<?php 
+				$sub_model = $sub->model();
+				if (empty($sub_model)) : ?>
+				<?=$sub->info('module_name')?>
+				<?php else: ?>
+				<a href="#" class="show_fields" class="show_fields"><?=$sub->info('module_name')?></a>
+				<ul style="display: none;">
+					<?php 
+					$form_fields = $sub_model->form_fields();
+					foreach($sub_model->form_fields() as $field => $field_params) : ?>
+					<?php if ($field != 'id') : 
+					$label = (!empty($field_params['label'])) ? $field_params['label'] : $CI->form_builder->create_label($field_params);
+					$label = ucfirst(str_replace('_', ' ', $field));
+					?>
+					<li><strong><?=$label?></strong><?php if (!empty($field_params['comment'])) : ?> - <?=$field_params['comment']?><?php endif; ?></li>
+					<?php endif; ?>
+					<?php endforeach;?>
+				</ul>
+				<?php endif; ?>
+
+			</li>
 			<?php endforeach;?>
 		</ul>
 
 		<?php endif; ?>
 	</li>
+<?php $i++; endif; ?>
 <?php endforeach; ?>
 </ul>
+<?php if ($i === 0) : ?>
+<p>You currently don't have access to any modules</p>
+<?php endif; ?>
 
 
 <h2 id="dashboard" class="ico ico_dashboard"><img src="<?=img_path('icons/ico_dashboard.png', 'fuel')?>" alt="Dashboard" /> <a href="<?=fuel_url('dashboard')?>">Dashboard</a></h2>
@@ -94,7 +126,7 @@
 	<?php $layouts = $this->fuel->layouts->get(); ?>
 	<?php foreach($layouts as $layout) : ?>
 	<?php if (!$layout->is_hidden()) : ?>
-	<li><strong><?=$layout->name()?></strong><?php if ($layout->description()) : ?> - <?=$layout->description()?><?php endif; ?></li>
+	<li id="layout->name()"><strong><?=$layout->label()?></strong><?php if ($layout->description()) : ?> - <?=$layout->description()?><?php endif; ?></li>
 	<?php endif; ?>
 	<?php endforeach; ?>
 </ul>
@@ -118,7 +150,7 @@
 <p>When inputting content, you can use special template functions to help insert things such 
 as page URLS and image paths. The most common are:</p>
 <ul>
-	<li><strong>{site_url('my_page')}</strong> - inserts a link path relative to the site (e.g. http://www.marchex.com/my_page)/z.</li>
+	<li><strong>{site_url('my_page')}</strong> - inserts a link path relative to the site (e.g. http://www.mysite.com/my_page)/z.</li>
 	<li><strong>{img_path('my_image.jpg')}</strong> - inserts the image path based (e.g. /assets/images/my_image.jpg)/.</li>
 	<li><strong>{pdf_path('my_pdf.pdf')}</strong> - inserts the pdf path based (e.g. /assets/pdf/my_pdf.pdf). Extension (.pdf) is optional.</li>
 	<li><strong>{docs_path('my_doc.doc')}</strong> - inserts the pdf path based (e.g. /assets/pdfs/my_doc.doc).</li>
@@ -218,3 +250,19 @@
 <h2 id="settings" class="ico ico_settings"><img src="<?=img_path('icons/ico_table_gear.png', 'fuel')?>" alt="Layouts" /> <a href="<?=fuel_url('settings')?>">Settings</a></h2>
 <p>Although it's unlikely you'll need to worry too much about this, some modules have extra configuration settings you can manage in the CMS. For example, you may have a blog settings area if the blog is installed.</p>
 
+
+
+<?=jquery()?>
+<script type="text/javascript">
+	$(function(){
+		$('.show_fields').on('click', function(e){
+			e.preventDefault();
+			$ul = $(this).next('ul');
+			if ($ul && $ul.is(':hidden')){
+				$ul.show();
+			} else {
+				$ul.hide();
+			}
+		})
+	})
+</script>
diff --git a/fuel/codeigniter/language/english/upload_lang.php b/fuel/codeigniter/language/english/upload_lang.php
@@ -10,7 +10,7 @@
 $lang['upload_no_file_selected'] = "You did not select a file to upload.";
 $lang['upload_invalid_filetype'] = "The filetype you are attempting to upload is not allowed.";
 $lang['upload_invalid_filesize'] = "The file you are attempting to upload is larger than the permitted size.";
-$lang['upload_invalid_dimensions'] = "The image you are attempting to upload exceedes the maximum height or width.";
+$lang['upload_invalid_dimensions'] = "The image you are attempting to upload doesn't fit into the allowed dimensions.";
 $lang['upload_destination_error'] = "A problem was encountered while attempting to move the uploaded file to the final destination.";
 $lang['upload_no_filepath'] = "The upload path does not appear to be valid.";
 $lang['upload_no_file_types'] = "You have not specified any allowed file types.";

diff --git a/fuel/modules/fuel/assets/css/colorpicker.css b/fuel/modules/fuel/assets/css/colorpicker.css
@@ -4,7 +4,7 @@
 	overflow: hidden;
 	position: absolute;
 	background: url(images/colorpicker_background.png);
-	font-family: Arial, Helvetica, sans-serif;
+	font-family: 'Lucida Grande', Verdana, Arial, Helvetica, Sans-serif;
 	display: none;
 	z-index: 10;
 }
@@ -74,7 +74,7 @@
 	border: 1px solid transparent;
 	position: absolute;
 	font-size: 10px;
-	font-family: Arial, Helvetica, sans-serif;
+	font-family: 'Lucida Grande', Verdana, Arial, Helvetica, Sans-serif;
 	color: #898989;
 	top: 4px;
 	right: 11px;

diff --git a/fuel/modules/fuel/assets/css/datepicker.css b/fuel/modules/fuel/assets/css/datepicker.css
@@ -52,7 +52,7 @@ div.dp-popup {
 	position: relative;
 	background: #fff;
 	font-size: 10px;
-	font-family: arial, sans-serif;
+	font-family: 'Lucida Grande', Verdana, Arial, Helvetica, Sans-serif;
 	padding: 2px;
 	width: 171px;
 	line-height: 1.2em;

diff --git a/fuel/modules/fuel/assets/css/fuel.css b/fuel/modules/fuel/assets/css/fuel.css
@@ -11,7 +11,7 @@ IMPORT CSS HERE SO THAT REQUIRE.JS CAN OPTIMIZE IT
 
 * { margin: 0; padding: 0; outline-style: none; }
 html, body { height: 100%; overflow: hidden; }
-body { background-color: #333; font-family: 'Lucida Grande', 'Gill Sans', Arial, Helvetica, Sans-serif; margin: 0; padding: 0; font-size: 11px; color: #333; }
+body { background-color: #333; font-family: 'Lucida Grande', Verdana, Arial, Helvetica, Sans-serif; margin: 0; padding: 0; font-size: 11px; color: #333; }
 h1 { font-size: 20px; margin-bottom: 10px;  }
 h2 { font-size: 16px; margin-bottom: 10px; }
 h3 { font-size: 12px; margin: 15px 0 3px 0; }
@@ -21,7 +21,7 @@ a:hover { text-decoration: underline; }
 a:visited { color: #4679bd;}
 p { margin: 5px 0 15px 0; }
 option { margin: 0 2px; }
-input,select,textarea { font-size: 11px; font-family: 'Lucida Grande', 'Gill Sans', Arial, Helvetica, Sans-serif; }
+input,select,textarea { font-size: 11px; font-family: 'Lucida Grande', Verdana, Arial, Helvetica, Sans-serif; }
 textarea { min-height: 40px; overflow: auto; resize: vertical; /*width: 100%;*/ }
 
 

diff --git a/fuel/modules/fuel/assets/css/fuel.min.css b/fuel/modules/fuel/assets/css/fuel.min.css
diff --git a/fuel/modules/fuel/assets/css/fuel_inline.css b/fuel/modules/fuel/assets/css/fuel_inline.css
@@ -1,5 +1,5 @@
 /* generic styles */
-.__fuel__ * { font-family: 'Lucida Grande', 'Gill Sans', Arial, Helvetica, Sans-serif; margin: 0; padding: 0; font-size: 11px; outline-style: none; color: #000; text-shadow: none !important; background: none; }
+.__fuel__ * { font-family: 'Lucida Grande', Verdana, Arial, Helvetica, Sans-serif; margin: 0; padding: 0; font-size: 11px; outline-style: none; color: #000; text-shadow: none !important; background: none; }
 .__fuel__ h2 { font-size: 14px !important; margin-bottom: 10px !important; }
 .__fuel__ a { color: #0e3e7e !important; text-decoration: none !important; font-weight: normal !important; border: none !important; }
 .__fuel__ a:hover { text-decoration: underline !important; }

diff --git a/fuel/modules/fuel/assets/css/jquery-ui-1.8.17.custom.css b/fuel/modules/fuel/assets/css/jquery-ui-1.8.17.custom.css
@@ -53,9 +53,9 @@
 
 /* Component containers
 ----------------------------------*/
-.ui-widget { font-family: 'Lucida Grande', 'Gill Sans', Arial, Helvetica, Sans-serif; font-size: 1.1em; }
+.ui-widget { font-family: 'Lucida Grande', Verdana, Arial, Helvetica, Sans-serif; font-size: 1.1em; }
 .ui-widget .ui-widget { font-size: 1em; }
-.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: 'Lucida Grande', 'Gill Sans', Arial, Helvetica, Sans-serif; font-size: 1em; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: 'Lucida Grande', Verdana, Arial, Helvetica, Sans-serif; font-size: 1em; }
 .ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_glass_75_ffffff_1x400.png) 50% 50% repeat-x; color: #222222; }
 .ui-widget-content a { color: #222222; }
 .ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; }

diff --git a/fuel/modules/fuel/assets/js/editors/markitup/jquery.markitup.set.js b/fuel/modules/fuel/assets/js/editors/markitup/jquery.markitup.set.js
@@ -453,7 +453,7 @@ myMarkItUpSettings.displayLinkEditWindow = function(selected, attrs, callback){
 				if ($class.length && $class.val().length){
 					replace += ' class="' + $class.val() + '"';
 				}
-				replace += '>' + $selected.val() + '</a>';
+				replace += '>' + unescape($selected.val()) + '</a>';
 
 				callback(replace);
 			}

diff --git a/fuel/modules/fuel/assets/js/fuel/controller/AssetsController.js b/fuel/modules/fuel/assets/js/fuel/controller/AssetsController.js
@@ -23,7 +23,7 @@ fuel.controller.AssetsController = jqx.createController(fuel.controller.BaseFuel
 		var selectedAssetFolder = this.initObj.folder;
 
 		$assetSelect.change(function(e){
-			var isImg = ($assetSelect.val() && $assetSelect.val().match(/\.jpg$|\.jpeg$|\.gif$|\.png$/));
+			var isImg = ($assetSelect.val() && $assetSelect.val().toLowerCase().match(/\.jpg$|\.jpeg$|\.gif$|\.png$/));
 			if (isImg){
 				$assetPreview.show().html('<img src="' + jqx.config.assetsPath + selectedAssetFolder + '/' + $assetSelect.val() + '" />');
 				$('.img_only').show();

diff --git a/fuel/modules/fuel/assets/js/fuel/controller/BaseFuelController.js b/fuel/modules/fuel/assets/js/fuel/controller/BaseFuelController.js
@@ -184,7 +184,6 @@ fuel.controller.BaseFuelController = jqx.lib.BaseController.extend({
 			var itemViewsCookie = $.supercookie(this.uiCookie, itemViewsCookieId);
 
 			$('#toggle_tree').click(function(e){
-				_this._toggleRearrangeBtn();
 
 				$('#toggle_tree').parent().addClass('active');
 				if ($('#rearrange').parent().hasClass('active')){
@@ -202,6 +201,8 @@ fuel.controller.BaseFuelController = jqx.lib.BaseController.extend({
 				// lazy load tree
 				if (!_this.treeLoaded){
 					_this.redrawTree();
+				} else {
+					_this._toggleRearrangeBtn();
 				}
 				return false;
 			});
@@ -220,6 +221,8 @@ fuel.controller.BaseFuelController = jqx.lib.BaseController.extend({
 				// lazy load table
 				if (!_this.tableLoaded){
 					_this.redrawTable();
+				} else {
+					_this._toggleRearrangeBtn();
 				}
 				return false;
 			});
@@ -603,17 +606,10 @@ fuel.controller.BaseFuelController = jqx.lib.BaseController.extend({
 	},
 
 	_toggleRearrangeBtn : function(){
-
-		// remove the button if no precedence columns
-		if (!$('#precedence').length)
-		{
-			$('.ico_precedence').parent().remove();
-		}
-
-		if ($('#precedence').val() != 1){
-			$('#rearrange').parent().hide();
-		} else {
+		if (!$('#list_container').is(':hidden') && parseInt($('#precedence').val()) == 1){
 			$('#rearrange').parent().show();
+		} else {
+			$('#rearrange').parent().hide();
 		}
 	},
 
@@ -645,7 +641,7 @@ fuel.controller.BaseFuelController = jqx.lib.BaseController.extend({
 		if (!_this.treeLoaded) _this.treeLoaded = true;
 
 		// setup rearranging precedence
-		$('#rearrange').parent().hide();
+		_this._toggleRearrangeBtn();
 
 	},
 
@@ -662,7 +658,6 @@ fuel.controller.BaseFuelController = jqx.lib.BaseController.extend({
 			$.post(_this.modulePath + '/toggle_' + toggleStatus + '/' + id + '/' + field, params, function(html){
 				_this.redrawTable(true, false);
 			});
-
 		}
 
 		$('#data_table .publish_text').parent().addClass('publish_col');
@@ -683,7 +678,7 @@ fuel.controller.BaseFuelController = jqx.lib.BaseController.extend({
 					if (!_this.rearrangeOn){
 						var actionsCol = $(this).parent().find('td.actions');
 						var firstLink = $('a:first', actionsCol[0]).attr('href');
-						if (firstLink && firstLink){
+						if (firstLink){
 							window.location = firstLink;
 						}
 					}