Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request FortAwesome#117 from stephanemeron/develop
dump cgp-tenor, ec-tenor et ec-tenor-basedoc
  • Loading branch information
lioshi committed Mar 29, 2012
2 parents 7af8e02 + 89048bf commit 7d5ad91
Show file tree
Hide file tree
Showing 102 changed files with 1,348 additions and 9 deletions.
15 changes: 13 additions & 2 deletions dmCorePlugin/lib/data/dmDataLoad.php
Expand Up @@ -713,9 +713,10 @@ protected function loadGroups()
)
),
*
* Ajout SID : les groupes d'autorisations à l'installation
* Ajout SID : les groupes d'autorisations à l'installation pour le client
*/
"web_client" => array(
// droit pour les sites
"web_client" => array(
'description' => "Accès pour le client Web",
'permissions' => array(
'bandeau',
Expand All @@ -738,6 +739,16 @@ protected function loadGroups()
'selection_placement'
)
),
// droit pour les bases doc
"basedoc_client" => array(
'description' => "Accès pour le client Base Doc",
'permissions' => array(
'see_accueil',
'see_chart',
'tool_bar_admin',
'admin',
)
),
);

$permissions = dmDb::query('DmPermission p INDEXBY name')->select('p.name')->fetchArray();
Expand Down
Expand Up @@ -234,7 +234,7 @@ UNLOCK TABLES;

LOCK TABLES `dm_user` WRITE;
/*!40000 ALTER TABLE `dm_user` DISABLE KEYS */;
INSERT INTO `dm_user` (`id`, `username`, `email`, `algorithm`, `salt`, `password`, `is_active`, `is_super_admin`, `last_login`, `forgot_password_code`, `created_at`, `updated_at`) VALUES (1,'admin','admin@cgp-tenor.com','sha1','048a0554132473c6205151f9c6a0bfc3','afe1879d5a680b352059385f5fda509d11ee5ac7',1,1,'2012-03-29 12:15:16',NULL,'2011-11-16 14:23:09','2011-11-16 14:23:09'),(2,'client','client@client.fr','sha1','1ecbcc7d51d509c40c13c00a9a62ee14','9c4e226396030f4e6674335b7274dc210483d7e8',1,0,'2012-03-21 11:04:48',NULL,'2011-11-16 14:45:56','2011-11-16 14:45:56');
INSERT INTO `dm_user` (`id`, `username`, `email`, `algorithm`, `salt`, `password`, `is_active`, `is_super_admin`, `last_login`, `forgot_password_code`, `created_at`, `updated_at`) VALUES (1,'admin','admin@cgp-tenor.com','sha1','048a0554132473c6205151f9c6a0bfc3','afe1879d5a680b352059385f5fda509d11ee5ac7',1,1,'2012-03-29 16:46:32',NULL,'2011-11-16 14:23:09','2011-11-16 14:23:09'),(2,'client','client@client.fr','sha1','1ecbcc7d51d509c40c13c00a9a62ee14','9c4e226396030f4e6674335b7274dc210483d7e8',1,0,'2012-03-21 11:04:48',NULL,'2011-11-16 14:45:56','2011-11-16 14:45:56');
/*!40000 ALTER TABLE `dm_user` ENABLE KEYS */;
UNLOCK TABLES;

Expand Down Expand Up @@ -791,4 +791,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;

-- Dump completed on 2012-03-29 12:18:32
-- Dump completed on 2012-03-29 16:49:23

Large diffs are not rendered by default.

Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,9 @@
<?php
/**
* Main actions
*/
class mainActions extends myFrontModuleActions
{


}
@@ -0,0 +1,21 @@
<?php
/**
* Main components
*
* No redirection nor database manipulation ( insert, update, delete ) here
*
*/
class mainComponents extends myFrontModuleComponents
{


public function executeHeader()
{
// Your code here
}

public function executeFooter()
{
// Your code here
}
}
@@ -0,0 +1,3 @@
<?php
echo "<h2>INSERTION DU FOOTER</h2>";
echo "<p>Aenean convallis gravida fermentum. Quisque porta, mauris eget suscipit convallis, purus justo varius magna, sit amet dictum sapien dui ac velit. Nulla in odio eget leo ultricies facilisis sed vel mi. Quisque dictum, est vitae dignissim egestas, ante nunc pretium libero, eu imperdiet diam purus eget lectus.</p>";
@@ -0,0 +1 @@
<?php
@@ -0,0 +1,8 @@
// _ConfigFrameworkOverride.less
// v0.1
// Last Updated : 2011-04-13 10:30
// Copyright : SID Presse
// Author : Arnaud GAUDIN

// Ce fichier définit des overrides pour les paramètres par défaut du framework. Permet d'effectuer des modifications de façon locale à un site.
/*@colorBlack: #00f;*/
@@ -0,0 +1,15 @@
// _ConfigGeneral.less
// v1.0
// Last Updated : 2012-01-11 11:50
// Copyright : SID Presse
// Author : Arnaud GAUDIN

//définir ici le chemin vers le fichier de config du theme choisi (passer en variable PHP)
//impossibilité d'importer des fichiers de config de variable par une fonction incluant un import de fichier less, car elles ne sont pas prises en compte par la suite !

//définition du theme par défaut
@mainTemplate: "BaseTheme";
//timeStamp Unix codé en md5 raccourci sur 7 chiffres
@mainHashMd5: "ef58c98";
//importation du fichier de config du thème choisi
@import "_templates/BaseTheme/Config/_ConfigTemplateDefault.less";
@@ -0,0 +1,8 @@
// _ConfigTemplateOverride.less
// v0.1
// Last Updated : 2011-04-13 10:30
// Copyright : SID Presse
// Author : Arnaud GAUDIN

// Ce fichier définit des overrides pour les paramètres par défaut du template courant. Permet d'effectuer des modifications de façon locale à un site.
/*@colorBlack: #0f0;*/

0 comments on commit 7d5ad91

Please sign in to comment.