Merge branch 'live' into edge

Author: subiabre

Resources/currencies.yml

@@ -20,3 +20,10 @@ GBP:
     thousands: ','
     decimal: .
     active: true
+
+MXN:
+    name: 'Peso Mexicano'
+    symbol: '$'
+    thousands: ','
+    decimal: '.'
+    active: true

Resources/defaults.yml

@@ -81,6 +81,9 @@ url:
             - /password-reset
             - /signup
 
+    # Domains that are allowed by the application to redirect to outside of the platform.
+    allowed_domains:
+
     # If you want to use a CDN or another web server to serve the cached images
     # You can define this constants. All cached images links will point to this
     # Url, event if don't exists yet.

Resources/permissions.yml

@@ -252,6 +252,10 @@ admin-module-communication: # Can access to module CommunicationAdminController
     model: null
     relational: null
 
+admin-module-announcements: # Can access to module AnnouncementAdminController
+    model: null
+    relational: null
+
 receive-test-communications: # Can receive test communications
     model: null
     relational: null

Resources/roles.yml

@@ -135,6 +135,7 @@ admin:
         - edit-any-matcher # View any editing matcher
         - remove-any-matcher # Remove any matcher
         - admin-module-channels # Can access to channels admin modules
+        - admin-module-announcements # Can access to announcements admin modules
     level: 70
 
 superadmin:

Resources/templates/default/channel/layout.php

@@ -1,12 +1,14 @@
 <?php
 
-$channel=$this->channel;
+$channel = $this->channel;
 
 $this->layout("layout", [
     'bodyClass' => 'channel home',
-    'title' => $this->text('regular-channel').' '.$channel->name,
+    'title' => $this->text('regular-channel') . ' ' . $channel->name,
     'meta_description' => $channel->description
-    ]);
+]);
+
+$this->supply('announcements', $this->insert("partials/components/announcements"));
 
 $this->section('content');
 
@@ -17,9 +19,9 @@
 
     <div id="side">
 
-    <?php foreach ($this->side_order as $sideitem => $sideitemName) {
+        <?php foreach ($this->side_order as $sideitem => $sideitemName) {
             echo $this->insert("channel/partials/side/$sideitem");
-    } ?>
+        } ?>
     </div>
 
     <div id="content">
@@ -32,8 +34,8 @@
 
 <?php $this->section('footer') ?>
 <script type="text/javascript">
-// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt
-    $(function(){
+    // @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt
+    $(function() {
         $('#slides_side_sponsor').slides({
             container: 'slides_container',
             effect: 'fade',
@@ -43,6 +45,6 @@
             pause: 1
         });
     });
-// @license-end
+    // @license-end
 </script>
 <?php $this->append() ?>

Resources/templates/responsive/admin/announcements/edit.php

@@ -0,0 +1,25 @@
+<?php
+
+$this->layout('admin/announcements/layout');
+
+$this->section('admin-search-box-addons');
+?>
+<a class="btn btn-cyan" href="/admin/announcement"><i class="fa fa-arrow-circle-left"></i> <?= $this->text('admin-back-list') ?></a>
+
+<?php $this->replace() ?>
+
+<?php $this->section('admin-container-body') ?>
+
+<?php
+$id = $this->announcement->id;
+?>
+
+<h4 class="title"><?= $id ? $this->text('admin-announcement-edit', "#{$id}") : $this->text('admin-announcement-add') ?></h4>
+
+
+<?= $this->form_form($this->raw('form')) ?>
+
+</div>
+</div>
+
+<?php $this->replace() ?>

Resources/templates/responsive/admin/announcements/layout.php

@@ -0,0 +1,14 @@
+<?php
+
+$this->layout('admin/container');
+
+$this->section('admin-container-head');
+
+?>
+    <h2><?= $this->text('admin-announcements') ?></h2>
+
+    <?= $this->insert('admin/partials/search_box') ?>
+
+    <?= $this->supply('admin-announcements-head') ?>
+
+<?php $this->replace() ?>

Resources/templates/responsive/admin/announcements/list.php

@@ -0,0 +1,20 @@
+<?php
+
+$this->layout('admin/announcements/layout');
+
+$this->section('admin-search-box-addons');
+?>
+<a class="btn btn-cyan" href="/admin/announcement/add"><i class="fa fa-plus"></i> <?= $this->text('admin-announcement-add') ?></a>
+
+<?php $this->replace() ?>
+
+<?php $this->section('admin-container-body') ?>
+
+<h5><?= $this->text('admin-list-total', $this->total) ?></h5>
+
+<?= $this->insert('admin/partials/material_table', ['list' => $this->model_list_entries($this->list, ['id', 'title', 'type', 'active', 'actions'])]) ?>
+
+</div>
+</div>
+
+<?php $this->replace() ?>

Resources/templates/responsive/blog/layout.php

@@ -27,6 +27,8 @@
 
 $this->section('content');
 
+$this->supply('announcements', $this->insert("partials/components/announcements"));
+
 ?>
 
 <div class="blog">

Resources/templates/responsive/channel/partials/javascript.php

@@ -6,4 +6,4 @@
 
 <script type="text/javascript" src="<?= SRC_URL ?>/assets/js/channel/stories.js"></script>
 <script type="text/javascript" src="<?= SRC_URL ?>/assets/js/channel/call.js"></script>
-
+<script type="text/javascript" src="<?= SRC_URL ?>/assets/js/components/announcements.js"></script>