Fix merge conflicts
This commit is contained in:
Mathieu Ducharme
@@ -0,0 +1,3 @@
|
||||
Order Deny,Allow
|
||||
Deny from all
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
<!doctype html>
|
||||
<html lang="fr">
|
||||
<!--[if lte IE 9]> <html lang="fr" class="ie9"> <![endif]-->
|
||||
<!--[if gt IE 9]><!--> <html lang="fr"> <!--<![endif]-->
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
|
||||
/* Tools
|
||||
========================================================================== */
|
||||
, "tools/jacket"
|
||||
, "tools/tools"
|
||||
|
||||
/* Generic
|
||||
|
||||
@@ -1,112 +0,0 @@
|
||||
///////////////////////////////////////////////////////////
|
||||
// Jacket
|
||||
// Conditional Styles with Sass. Dress you CSS appropriately.
|
||||
///////////////////////////////////////////////////////////
|
||||
|
||||
// Jacket is a Compass component that prints and hides styles based on
|
||||
// context variables you set in your stylesheet. Write and maintain a master
|
||||
// stylesheet, then output custom tailored stylesheets for modern and legacy
|
||||
// browsers, site and app builds, or any other context you can think of.
|
||||
|
||||
///////////////////////////////////////////////////////////
|
||||
// Settings variables
|
||||
///////////////////////////////////////////////////////////
|
||||
|
||||
// Default list of jacket contexts.
|
||||
$jacket: null !default;
|
||||
|
||||
// Private variable used by jacket-context().
|
||||
$jckt-context: null;
|
||||
|
||||
///////////////////////////////////////////////////////////
|
||||
// Jacket mixin
|
||||
// Takes a list of jacket contexts.
|
||||
// Outputs a block of styles if a context is set.
|
||||
///////////////////////////////////////////////////////////
|
||||
@mixin jacket($contexts...) {
|
||||
|
||||
$naked: false;
|
||||
$selectors: ();
|
||||
$filtered: ();
|
||||
$selector-string: '';
|
||||
|
||||
// Set the global context variable.
|
||||
$jckt-context: $contexts;
|
||||
|
||||
// If jacket is a single context and selector list, encapsulate.
|
||||
@if list-separator($jacket) == 'space' {
|
||||
$jacket: $jacket, null;
|
||||
}
|
||||
|
||||
// Test if a jacket context and jacket value match.
|
||||
@each $item in $jacket {
|
||||
@each $context in $contexts {
|
||||
@if index($context, nth($item, 1)) {
|
||||
|
||||
// Gather wrapping selectors.
|
||||
@if length($item) == 1 {
|
||||
$naked: true;
|
||||
}
|
||||
@if length($item) == 2 {
|
||||
$selectors: append($selectors, nth($item, 2) + ' &');
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Filter out duplicate selectors.
|
||||
// If reject() is added to Sass we can remove the $filtered holder variable.
|
||||
@each $selector in $selectors {
|
||||
@if index($filtered, $selector) == false {
|
||||
$filtered: append($filtered, $selector);
|
||||
}
|
||||
}
|
||||
|
||||
// Build the selector string.
|
||||
@each $selector in $filtered {
|
||||
@if $selector-string != '' {
|
||||
$selector-string: $selector-string + ", ";
|
||||
}
|
||||
$selector-string: $selector-string + $selector;
|
||||
}
|
||||
|
||||
// If the weather is right, output that jacketed code!
|
||||
@if $naked {
|
||||
@content;
|
||||
}
|
||||
@if $selector-string != '' {
|
||||
#{$selector-string} {
|
||||
@content;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
///////////////////////////////////////////////////////////
|
||||
// Jacket function
|
||||
// Takes a list of jacket contexts.
|
||||
// Outputs a value if a context is set.
|
||||
///////////////////////////////////////////////////////////
|
||||
@function jacket($value, $contexts...) {
|
||||
|
||||
@each $item in $jacket {
|
||||
@each $context in $contexts {
|
||||
@if index($context, nth($item, 1)) {
|
||||
// If the weather is right, return the value!
|
||||
@return $value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Else return null. If null is the only value for a selector, the selector
|
||||
// will not be printed.
|
||||
@return null;
|
||||
}
|
||||
|
||||
///////////////////////////////////////////////////////////
|
||||
// Jacket Context function
|
||||
// Takes a jacket context value. Use when code inside a jacket
|
||||
// needs to know if a specific jacket context is set.
|
||||
///////////////////////////////////////////////////////////
|
||||
@function jacket-context($context) {
|
||||
@return if(index($jckt-context, $context), true, false);
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
<!doctype html>
|
||||
<html lang="{{lang}}">
|
||||
<!--[if lte IE 9]> <html lang="{{lang}}" class="ie9"> <![endif]-->
|
||||
<!--[if gt IE 9]><!--> <html lang="{{lang}}"> <!--<![endif]-->
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<base href="{{URL}}">
|
||||
@@ -13,7 +14,7 @@
|
||||
<link rel="apple-touch-icon-precomposed" href="{{#assets.images}}favicon-152.png{{/assets.images}}">
|
||||
<!--[if IE]><link rel="shortcut icon" href="assets/images/favicon-32.ico"><![endif]-->
|
||||
|
||||
<link rel="stylesheet" href="modules/{{module}}/assets/styles/dist/main.css">
|
||||
<link rel="stylesheet" href="{{#assets.styles}}dist/main.css{{/assets.styles}}">
|
||||
|
||||
<meta name="description" content="{{meta_description}}">
|
||||
{{opengraph_tags}}
|
||||
@@ -35,4 +36,4 @@
|
||||
{{extra_header_content}}
|
||||
|
||||
</head>
|
||||
<body>
|
||||
<body>
|
||||
|
||||
@@ -65,10 +65,10 @@ class Boilerplate_Module extends Charcoal_Module
|
||||
|
||||
if($section_id) {
|
||||
// By section
|
||||
$section_loader = new Charcoal\Object_Loader('CMS_Section');
|
||||
$section_loader = new Charcoal_Object_Loader('CMS_Section');
|
||||
|
||||
$section = $section_loader->{$section_id};
|
||||
pre($section);
|
||||
|
||||
if($section->template) {
|
||||
// What to do?
|
||||
}
|
||||
@@ -84,4 +84,4 @@ class Boilerplate_Module extends Charcoal_Module
|
||||
die('404');
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
* @link http://locomotive.ca
|
||||
* @since Version 2014-10-01
|
||||
*/
|
||||
class Boilerplate_Template_Controller extends Charcoal\Template_Controller
|
||||
class Boilerplate_Template_Controller extends Charcoal_Template_Controller
|
||||
{
|
||||
/**
|
||||
* Keep a copy of the current section
|
||||
@@ -208,4 +208,4 @@ class Boilerplate_Template_Controller extends Charcoal\Template_Controller
|
||||
|
||||
return $ret;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,3 +1,350 @@
|
||||
{
|
||||
|
||||
}
|
||||
"config_type":"object",
|
||||
"config_version":1,
|
||||
|
||||
"module":"boilerplate",
|
||||
|
||||
"name":{
|
||||
"en":"Configuration",
|
||||
"fr":"Configuration"
|
||||
},
|
||||
"description":{
|
||||
"en":"",
|
||||
"fr":""
|
||||
},
|
||||
"long_description":{
|
||||
"en":"",
|
||||
"fr":""
|
||||
},
|
||||
"notes":{
|
||||
"en":"",
|
||||
"fr":""
|
||||
},
|
||||
|
||||
"revision":true,
|
||||
|
||||
"properties":{
|
||||
"id":{
|
||||
"type":"id"
|
||||
},
|
||||
"google_analytics":{
|
||||
"type":"string",
|
||||
"label":{
|
||||
"fr":"ID Google Analytics",
|
||||
"en":"Google Analytics ID"
|
||||
},
|
||||
"notes":{
|
||||
"fr":"Ex: UA-XXXXXX-X",
|
||||
"en":"Ex: UA-XXXXXX-X"
|
||||
}
|
||||
},
|
||||
|
||||
"default_section":{
|
||||
"type":"object",
|
||||
"obj_type":"cms_section",
|
||||
"label":{
|
||||
"en":"Default section",
|
||||
"fr":"Section par défaut"
|
||||
},
|
||||
"description":{
|
||||
"en":"Default section is loaded when the default URL (without any section) is reached, or usually when the logo is clicked. Typically, this should be a \"Home\" section.",
|
||||
"fr":"La section par défaut est chargée lorsqu'un utilisateur atteint l'URL par défaut (sans paramètre de section). Est également, à l'habitude, la section qui est chargée lorsque le logo est cliqué. Typiquement, ce devrait être une section \"Accueil\"."
|
||||
},
|
||||
"input_type":"tree_select",
|
||||
"input_options":{
|
||||
"tree_select":{
|
||||
"tree_property":"master",
|
||||
"order_property":"position"
|
||||
}
|
||||
}
|
||||
},
|
||||
"default_lang":{
|
||||
"type":"lang",
|
||||
"label":{
|
||||
"en":"Default language",
|
||||
"fr":"Langage par défaut"
|
||||
}
|
||||
},
|
||||
"contact_address":{
|
||||
"type":"string",
|
||||
"l10n":true
|
||||
},
|
||||
"contact_address2":{
|
||||
"type":"string",
|
||||
"l10n":true
|
||||
},
|
||||
"contact_city":{
|
||||
"type":"string",
|
||||
"l10n":true
|
||||
},
|
||||
"contact_postal_code":{
|
||||
"type":"string"
|
||||
},
|
||||
"contact_province":{
|
||||
"type":"string",
|
||||
"l10n":true
|
||||
},
|
||||
"contact_country":{
|
||||
"type":"string"
|
||||
},
|
||||
"contact_phone":{
|
||||
"type":"phone"
|
||||
},
|
||||
"contact_phone2":{
|
||||
"type":"phone"
|
||||
},
|
||||
"contact_fax":{
|
||||
"type":"phone"
|
||||
},
|
||||
"contact_email":{
|
||||
"type":"email"
|
||||
},
|
||||
"contact_lat":{
|
||||
"type":"float"
|
||||
},
|
||||
"contact_lon":{
|
||||
"type":"float"
|
||||
},
|
||||
|
||||
"social_facebook_url":{
|
||||
"type":"string"
|
||||
},
|
||||
"social_twitter_url":{
|
||||
"type":"string"
|
||||
},
|
||||
"social_google_url":{
|
||||
"type":"string"
|
||||
},
|
||||
"social_linkedin_url":{
|
||||
"type":"string"
|
||||
},
|
||||
"social_instagram_url":{
|
||||
"type":"string"
|
||||
},
|
||||
"social_flickr_url":{
|
||||
"type":"string"
|
||||
},
|
||||
"social_youtube_url":{
|
||||
"type":"string"
|
||||
},
|
||||
"meta_default_title":{
|
||||
"type":"string",
|
||||
"l10n":true
|
||||
},
|
||||
"meta_title_prefix":{
|
||||
"type":"string",
|
||||
"l10n":true
|
||||
},
|
||||
"meta_title_suffix":{
|
||||
"type":"string",
|
||||
"l10n":true
|
||||
},
|
||||
"meta_default_description":{
|
||||
"type":"text",
|
||||
"l10n":true
|
||||
},
|
||||
|
||||
"meta_default_image":{
|
||||
"type":"image",
|
||||
"upload_path":"uploads/cfg/meta_default_image/"
|
||||
},
|
||||
"meta_default_keywords":{
|
||||
"type":"string",
|
||||
"multiple":true,
|
||||
"l10n":true,
|
||||
"notes":{
|
||||
"en":"",
|
||||
"fr":"À moins d'avis professionnel disant le contraire, les mots-clés par défaut devraient être laissés vide."
|
||||
}
|
||||
},
|
||||
"signature_text":{
|
||||
"type":"string",
|
||||
"l10n":true,
|
||||
"label":{
|
||||
"en":"Signature text",
|
||||
"fr":"Texte de la signature"
|
||||
}
|
||||
},
|
||||
"signature_title":{
|
||||
"type":"string",
|
||||
"l10n":true,
|
||||
"label":{
|
||||
"en":"Signature title",
|
||||
"fr":"Titre de la signature"
|
||||
},
|
||||
"description":{
|
||||
"en":"This is mainly used for SEO purpose.",
|
||||
"fr":"Le titre est principalement utilisé à des fins de référencement / SEO."
|
||||
}
|
||||
},
|
||||
"signature_url":{
|
||||
"type":"url",
|
||||
"l10n":true,
|
||||
"label":{
|
||||
"en":"Signature URL",
|
||||
"fr":"Lien de la signature"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
"data":{
|
||||
|
||||
},
|
||||
|
||||
"sources":{
|
||||
"default":{
|
||||
"table":"boilerplate_config"
|
||||
}
|
||||
},
|
||||
"default_source" : "default",
|
||||
|
||||
"lists":{
|
||||
"boilerplate_config":{
|
||||
"label":{
|
||||
"fr":"Liste des sections",
|
||||
"en":"Section list"
|
||||
},
|
||||
"description":{
|
||||
|
||||
},
|
||||
"properties":[
|
||||
|
||||
],
|
||||
"orders":{
|
||||
"position":{
|
||||
"property":"position",
|
||||
"mode":"asc"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"default_list":"boilerplate_config",
|
||||
|
||||
"forms":{
|
||||
"boilerplate_config":{
|
||||
"label":{
|
||||
"en":"Configuration",
|
||||
"fr":"Configuration"
|
||||
},
|
||||
"groups":{
|
||||
"analytics":{
|
||||
"label":{
|
||||
"en":"Analytics",
|
||||
"fr":"Outils d'analyse"
|
||||
},
|
||||
"properties":[
|
||||
"google_analytics"
|
||||
]
|
||||
},
|
||||
"content":{
|
||||
"label":{
|
||||
"en":"Default content settings",
|
||||
"fr":"Configuration de contenu par défaut"
|
||||
},
|
||||
"properties":[
|
||||
"default_section",
|
||||
"default_lang"
|
||||
]
|
||||
},
|
||||
"social":{
|
||||
"label":{
|
||||
"en":"Social Links",
|
||||
"fr":"Liens sociaux"
|
||||
},
|
||||
"properties":[
|
||||
"social_facebook_url",
|
||||
"social_twitter_url",
|
||||
"social_google_url",
|
||||
"|",
|
||||
"social_linkedin_url",
|
||||
"|",
|
||||
"social_instagram_url",
|
||||
"social_flickr_url",
|
||||
"|",
|
||||
"social_youtube_url"
|
||||
],
|
||||
"properties_options":{},
|
||||
"priority":30
|
||||
},
|
||||
"contact":{
|
||||
"label":{
|
||||
"en":"Meta-informations",
|
||||
"fr":"Informations méta"
|
||||
},
|
||||
"l10n":true,
|
||||
"l10n_options":{
|
||||
"mode":"loop_group"
|
||||
},
|
||||
"properties":[
|
||||
"contact_address",
|
||||
"contact_address2",
|
||||
"contact_city",
|
||||
"contact_postal_code",
|
||||
"contact_province",
|
||||
"contact_country",
|
||||
"|",
|
||||
"contact_phone",
|
||||
"contact_phone2",
|
||||
"contact_fax",
|
||||
"|",
|
||||
"contact_email"
|
||||
],
|
||||
"properties_options":{},
|
||||
"priority":40
|
||||
},
|
||||
"meta":{
|
||||
"label":{
|
||||
"en":"Meta-informations",
|
||||
"fr":"Informations méta"
|
||||
},
|
||||
"l10n":true,
|
||||
"l10n_options":{
|
||||
"mode":"loop_group"
|
||||
},
|
||||
"properties":[
|
||||
"meta_default_title",
|
||||
"meta_title_prefix",
|
||||
"meta_title_suffix",
|
||||
"meta_default_description",
|
||||
"meta_default_keywords",
|
||||
"meta_default_image"
|
||||
],
|
||||
"properties_options":{},
|
||||
"priority":50
|
||||
},
|
||||
"signature":{
|
||||
"label":{
|
||||
"en":"Signature",
|
||||
"fr":"Signature"
|
||||
},
|
||||
"l10n":true,
|
||||
"l10n_options":{
|
||||
"mode":"loop_group"
|
||||
},
|
||||
"properties":[
|
||||
"signature_text",
|
||||
"signature_url",
|
||||
"signature_title"
|
||||
|
||||
],
|
||||
"priority":60
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"default_form":"boilerplate_config",
|
||||
|
||||
"dashboards":{
|
||||
|
||||
},
|
||||
|
||||
"widgets": {
|
||||
|
||||
},
|
||||
|
||||
"patterns":{
|
||||
|
||||
},
|
||||
"default_pattern":"default"
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user