Skip to content

Commit

Permalink
Add ability to define title and slug of page parts
Browse files Browse the repository at this point in the history
Fix specs with slug support

Use params[:slug] for page_part_field render

Validate presence of title in PagePart model

Add slug locales in FR and EN

Fix page_part_dialog JS

Change new_page_part_save errors text

Fix visual_editor_add_image specs with the adding of :slug param (thanks @parndt)

slug should be able to default to title.to_param (thanks @parndt)

Set default slug before validation

Fix indentation in pages_spec

Deprecate old api for title_matches? and part_with_title methods

Add feature and deprecations in changelog

Use seourl unminified
  • Loading branch information
bricesanchez authored and Brice Sanchez committed Apr 17, 2015
1 parent 235af3c commit 5b526f7
Show file tree
Hide file tree
Showing 15 changed files with 386 additions and 41 deletions.
2 changes: 2 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
* Limited the jquery-ui assets loaded in the backend to the ones we use in the core. [#2735](https://github.com/refinery/refinerycms/pull/2735). [Philip Arndt](https://github.com/parndt)
* Moved the tabs to the left hand side of the screen. [#2734](https://github.com/refinery/refinerycms/pull/2734). [Isaac Freeman](https://github.com/isaacfreeman) & [Philip Arndt](https://github.com/parndt) & [Brice Sanchez](https://github.com/bricesanchez)
* Add extra fields partial in Admin Pages form advanced options [#2943](https://github.com/refinery/refinerycms/pull/2943). [Brice Sanchez](https://github.com/bricesanchez)
* Added ability to create page part title different form slug. [#2875](https://github.com/refinery/refinerycms/pull/2875). [Brice Sanchez](https://github.com/bricesanchez) & [Philip Arndt](https://github.com/parndt) & [Josef Šimánek](https://github.com/simi)
* Deprecated `part_with_title` method in `Refinery#Page` and `title_matches?` method in `Refinery#PagePart`. [#2875](https://github.com/refinery/refinerycms/pull/2875). [Brice Sanchez](https://github.com/bricesanchez) & [Philip Arndt](https://github.com/parndt)

* [See full list](https://github.com/refinery/refinerycms/compare/2-1-stable...master)

Expand Down
38 changes: 29 additions & 9 deletions core/app/assets/javascripts/refinery/admin.js.erb
Original file line number Diff line number Diff line change
Expand Up @@ -577,33 +577,51 @@ var page_options = {
},

page_part_dialog: function(){
var seoURLoptions = {
'translitarate': true,
'uppercase': false,
"lowercase": true,
"divider": '_'
}

$('#new_page_part_dialog').dialog({
title: 'Create Content Section',
modal: true,
resizable: false,
autoOpen: false,
width: 600,
height: 200
height: 300
});

$('#add_page_part').click(function(e){
e.preventDefault();
$('#new_page_part_dialog').dialog('open');
});

$('#new_page_part_title').on('input propertychange', function() {
var part_title = $(this).val();

if(part_title.length > 0) {
var part_slug = part_title.seoURL(seoURLoptions);
$('#new_page_part_slug').val(part_slug);
}
});

$('#new_page_part_save').click(function(e){
e.preventDefault();

var part_title = $('#new_page_part_title').val();
var part_slug = $('#new_page_part_slug').val();

if(part_title.length > 0){
var tab_title = part_title.toLowerCase().replace(" ", "_");
if(part_slug.length > 0){
var tab_slug = part_slug.seoURL(seoURLoptions);

if ($('#page_part_' + tab_title).size() === 0) {
if ($('#page_part_' + tab_slug).size() === 0) {
$.get(page_options.new_part_url, {
title: part_title
, part_index: $('#new_page_part_index').val()
, body: ''
title: part_title,
part_index: $('#new_page_part_index').val(),
slug: tab_slug,
body: ''
}, function(data, status){
$('#submit_continue_button').remove();
// Add a new tab for the new content section.
Expand All @@ -622,22 +640,24 @@ var page_options = {
// Wipe the title and increment the index counter by one.
$('#new_page_part_index').val(parseInt($('#new_page_part_index').val(), 10) + 1);
$('#new_page_part_title').val('');
$('#new_page_part_slug').val('');

$('#new_page_part_dialog').dialog('close');
}, 'html'
);
}else{
alert("A content section with that title already exists, please choose another.");
alert("A content section with that slug already exists, please choose another.");
}
}else{
alert("You have not entered a title for the content section, please enter one.");
alert("You have not entered a slug for the content section, please enter one.");
}
});

$('#new_page_part_cancel').click(function(e){
e.preventDefault();
$('#new_page_part_dialog').dialog('close');
$('#new_page_part_title').val('');
$('#new_page_part_slug').val('');
});

$('#delete_page_part').click(function(e){
Expand Down
282 changes: 282 additions & 0 deletions core/app/assets/javascripts/refinery/jquery.seourl.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,282 @@
/*
* jQuery SeoURL plugin 0.1
*
* http://www.spidersoft.com.au/projects/jquery-seo-url-plugin/
*
* Copyright (c) 2013 Slawomir Jasinski
*
* Dual licensed under the MIT and GPL licenses:
* http://www.opensource.org/licenses/mit-license.php
* http://www.gnu.org/licenses/gpl.html
*
*/

(function( $ ){

// protorype, and return string
String.prototype.seoURL = function (options) {

// Create some defaults, extending them with any options that were provided
var settings = $.extend( {
'transliterate': true,
'lowercase': false,
'uppercase': false,
'divider': '-',
'append': ''
}, options);


var text = this;

// transliterate
if (settings.transliterate === true) {
text = trans(text);
}
// lowercase
if (settings.lowercase === true) {
text = text.toLowerCase();
}
// uppercase
if (settings.uppercase === true) {
text = text.toUpperCase();
}

text = text.replace(/^\s+|\s+$/g, "") // trim leading and trailing spaces
.replace(/[_|\s]+/g, "-") // change all spaces and underscores to a hyphen
.replace(/[^a-zA-z\u0400-\u04FF0-9-]+/g, "") // remove almoust all characters except hyphen
.replace(/[-]+/g, "-") // replace multiple hyphens
.replace(/^-+|-+$/g, "") // trim leading and trailing hyphen
.replace(/[-]+/g, settings.divider) // replace hyphen with divider
return text + settings.append;
}


var text = '';

function trans (text) {
text = strtr(text, from, to)
text = strtr(text, special);
return text;
}

var from = 'ąĄęĘóÓśŚłŁżŻźŹćĆńŃ' + // polish
'ŠŒŽšœžŸ¥µÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÔÕÖØÙÚÛÜÝßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýÿ'; // common

var to = 'aAeEoOsSlLzZzZcCnN' +
'SOZsozYYuAAAAAAACEEEEIIIIDNOOOOOUUUUYsaaaaaaaceeeeiiiionoooooouuuuyy';

var special = {'ä': 'ae', 'Ä': 'AE', 'ö': 'oe', 'Ö': 'OE', 'ü' : 'ue', 'Ü': 'UE', 'ß':'ss', 'ẞ': 'SS'}


// from - http://phpjs.org/functions/strtr/
function strtr (str, from, to) {

var fr = '',
i = 0,
j = 0,
lenStr = 0,
lenFrom = 0,
tmpStrictForIn = false,
fromTypeStr = '',
toTypeStr = '',
istr = '';
var tmpFrom = [];
var tmpTo = [];
var ret = '';
var match = false;

// Received replace_pairs?
// Convert to normal from->to chars
if (typeof from === 'object') {
tmpStrictForIn = ini_set('phpjs.strictForIn', false); // Not thread-safe; temporarily set to true
from = krsort(from);
ini_set('phpjs.strictForIn', tmpStrictForIn);

for (fr in from) {
if (from.hasOwnProperty(fr)) {
tmpFrom.push(fr);
tmpTo.push(from[fr]);
}
}

from = tmpFrom;
to = tmpTo;
}

// Walk through subject and replace chars when needed
lenStr = str.length;
lenFrom = from.length;
fromTypeStr = typeof from === 'string';
toTypeStr = typeof to === 'string';

for (i = 0; i < lenStr; i++) {
match = false;
if (fromTypeStr) {
istr = str.charAt(i);
for (j = 0; j < lenFrom; j++) {
if (istr == from.charAt(j)) {
match = true;
break;
}
}
} else {
for (j = 0; j < lenFrom; j++) {
if (str.substr(i, from[j].length) == from[j]) {
match = true;
// Fast forward
i = (i + from[j].length) - 1;
break;
}
}
}
if (match) {
ret += toTypeStr ? to.charAt(j) : to[j];
} else {
ret += str.charAt(i);
}
}

return ret;
}

function krsort (inputArr, sort_flags) {
// http://kevin.vanzonneveld.net
// + original by: GeekFG (http://geekfg.blogspot.com)
// + improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
// + improved by: Brett Zamir (http://brett-zamir.me)
// % note 1: The examples are correct, this is a new way
// % note 2: This function deviates from PHP in returning a copy of the array instead
// % note 2: of acting by reference and returning true; this was necessary because
// % note 2: IE does not allow deleting and re-adding of properties without caching
// % note 2: of property position; you can set the ini of "phpjs.strictForIn" to true to
// % note 2: get the PHP behavior, but use this only if you are in an environment
// % note 2: such as Firefox extensions where for-in iteration order is fixed and true
// % note 2: property deletion is supported. Note that we intend to implement the PHP
// % note 2: behavior by default if IE ever does allow it; only gives shallow copy since
// % note 2: is by reference in PHP anyways
// % note 3: Since JS objects' keys are always strings, and (the
// % note 3: default) SORT_REGULAR flag distinguishes by key type,
// % note 3: if the content is a numeric string, we treat the
// % note 3: "original type" as numeric.
// - depends on: i18n_loc_get_default
// * example 1: data = {d: 'lemon', a: 'orange', b: 'banana', c: 'apple'};
// * example 1: data = krsort(data);
// * results 1: {d: 'lemon', c: 'apple', b: 'banana', a: 'orange'}
// * example 2: ini_set('phpjs.strictForIn', true);
// * example 2: data = {2: 'van', 3: 'Zonneveld', 1: 'Kevin'};
// * example 2: krsort(data);
// * results 2: data == {3: 'Kevin', 2: 'van', 1: 'Zonneveld'}
// * returns 2: true
var tmp_arr = {},
keys = [],
sorter, i, k, that = this,
strictForIn = false,
populateArr = {};

switch (sort_flags) {
case 'SORT_STRING':
// compare items as strings
sorter = function (a, b) {
return that.strnatcmp(b, a);
};
break;
case 'SORT_LOCALE_STRING':
// compare items as strings, based on the current locale (set with i18n_loc_set_default() as of PHP6)
var loc = this.i18n_loc_get_default();
sorter = this.php_js.i18nLocales[loc].sorting;
break;
case 'SORT_NUMERIC':
// compare items numerically
sorter = function (a, b) {
return (b - a);
};
break;
case 'SORT_REGULAR':
// compare items normally (don't change types)
default:
sorter = function (b, a) {
var aFloat = parseFloat(a),
bFloat = parseFloat(b),
aNumeric = aFloat + '' === a,
bNumeric = bFloat + '' === b;
if (aNumeric && bNumeric) {
return aFloat > bFloat ? 1 : aFloat < bFloat ? -1 : 0;
} else if (aNumeric && !bNumeric) {
return 1;
} else if (!aNumeric && bNumeric) {
return -1;
}
return a > b ? 1 : a < b ? -1 : 0;
};
break;
}

// Make a list of key names
for (k in inputArr) {
if (inputArr.hasOwnProperty(k)) {
keys.push(k);
}
}
keys.sort(sorter);

// BEGIN REDUNDANT
this.php_js = this.php_js || {};
this.php_js.ini = this.php_js.ini || {};
// END REDUNDANT
strictForIn = this.php_js.ini['phpjs.strictForIn'] && this.php_js.ini['phpjs.strictForIn'].local_value && this.php_js.ini['phpjs.strictForIn'].local_value !== 'off';
populateArr = strictForIn ? inputArr : populateArr;


// Rebuild array with sorted key names
for (i = 0; i < keys.length; i++) {
k = keys[i];
tmp_arr[k] = inputArr[k];
if (strictForIn) {
delete inputArr[k];
}
}
for (i in tmp_arr) {
if (tmp_arr.hasOwnProperty(i)) {
populateArr[i] = tmp_arr[i];
}
}

return strictForIn || populateArr;
}

function ini_set (varname, newvalue) {
// http://kevin.vanzonneveld.net
// + original by: Brett Zamir (http://brett-zamir.me)
// % note 1: This will not set a global_value or access level for the ini item
// * example 1: ini_set('date.timezone', 'America/Chicago');
// * returns 1: 'Asia/Hong_Kong'

var oldval = '',
that = this;
this.php_js = this.php_js || {};
this.php_js.ini = this.php_js.ini || {};
this.php_js.ini[varname] = this.php_js.ini[varname] || {};
oldval = this.php_js.ini[varname].local_value;

var _setArr = function (oldval) { // Although these are set individually, they are all accumulated
if (typeof oldval === 'undefined') {
that.php_js.ini[varname].local_value = [];
}
that.php_js.ini[varname].local_value.push(newvalue);
};

switch (varname) {
case 'extension':
if (typeof this.dl === 'function') {
this.dl(newvalue); // This function is only experimental in php.js
}
_setArr(oldval, newvalue);
break;
default:
this.php_js.ini[varname].local_value = newvalue;
break;
}
return oldval;
}

})(jQuery);
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
page = Refinery::Page.create :title => "Add Image to me"
# we need page parts so that there's a visual editor
Refinery::Pages.default_parts.each_with_index do |default_page_part, index|
page.parts.create(:title => default_page_part, :body => nil, :position => index)
page.parts.create(:title => default_page_part, :slug => default_page_part, :body => nil, :position => index)
end
page
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class PagePartsController < ::Refinery::AdminController

def new
render :partial => '/refinery/admin/pages/page_part_field', :locals => {
:part => ::Refinery::PagePart.new(:title => params[:title], :body => params[:body]),
:part => ::Refinery::PagePart.new(:title => params[:title], :slug => params[:slug], :body => params[:body]),
:new_part => true,
:part_index => params[:part_index]
}
Expand Down
Loading

0 comments on commit 5b526f7

Please sign in to comment.