From 96c3e3173aa2ec89928e85b0f19212560806d9a1 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 25 Mar 2019 17:14:26 +0100 Subject: [PATCH] [ongoing] remove LaCasemate marks --- CONTRIBUTING.md | 6 ++--- README.md | 8 +++--- db/seeds.rb | 68 +++++++++++++++++++++++++------------------------ 3 files changed, 42 insertions(+), 40 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3b41e3d93..d7ee792fc 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -13,7 +13,7 @@ patches and features. ## Using the issue tracker -The [issue tracker](https://github.com/LaCasemate/fab-manager/issues) is the preferred channel for [bug reports](#bugs) +The [issue tracker](https://github.com/sleede/fab-manager/issues) is the preferred channel for [bug reports](#bugs) and [submitting pull requests](#pull-requests), but please respect the following restrictions: * Please **do not** use the issue tracker for personal support requests (use [the forum](https://forum.fab-manager.com)). @@ -96,7 +96,7 @@ Adhering to the following process is the best way to get your work included in t # Navigate to the newly cloned directory cd fab-manager # Assign the original repo to a remote called "upstream" - git remote add upstream https://github.com/LaCasemate/fab-manager.git + git remote add upstream https://github.com/sleede/fab-manager.git ``` 2. If you cloned a while ago, get the latest changes from upstream: @@ -131,4 +131,4 @@ Adhering to the following process is the best way to get your work included in t 7. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/) with a clear title and description. **IMPORTANT**: By submitting a patch, you agree to allow the project owners to license your work under the terms of -the [GNU Affero General Public License](LICENSE.md). \ No newline at end of file +the [GNU Affero General Public License](LICENSE.md). diff --git a/README.md b/README.md index b9f9fe3ba..873cd0959 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ FabManager is the FabLab management solution. It is web-based, open-source and totally free. -[![Coverage Status](https://coveralls.io/repos/github/LaCasemate/fab-manager/badge.svg)](https://coveralls.io/github/LaCasemate/fab-manager) +[![Coverage Status](https://coveralls.io/repos/github/sleede/fab-manager/badge.svg)](https://coveralls.io/github/sleede/fab-manager) [![Docker pulls](https://img.shields.io/docker/pulls/sleede/fab-manager.svg)](https://hub.docker.com/r/sleede/fab-manager/) [![Docker Build Status](https://img.shields.io/docker/build/sleede/fab-manager.svg)](https://hub.docker.com/r/sleede/fab-manager/builds) @@ -102,7 +102,7 @@ This procedure is not easy to follow so if you don't need to write some code for 7. Retrieve the project from Git ```bash - git clone https://github.com/LaCasemate/fab-manager.git + git clone https://github.com/sleede/fab-manager.git ``` 8. Install the software dependencies. @@ -205,7 +205,7 @@ environment. 2. Retrieve the project from Git ```bash - git clone https://github.com/LaCasemate/fab-manager + git clone https://github.com/sleede/fab-manager ``` 3. From the project directory, run: @@ -467,7 +467,7 @@ After modifying any values concerning the localisation, restart the application **This configuration is optional.** -You can configure your fab-manager to synchronize every project with the [Open Projects platform](https://github.com/LaCasemate/openlab-projects). +You can configure your fab-manager to synchronize every project with the [Open Projects platform](https://github.com/sleede/openlab-projects). It's very simple and straightforward and in return, your users will be able to search over projects from all fab-manager instances from within your platform. The deal is fair, you share your projects and as reward you benefits from projects of the whole community. diff --git a/db/seeds.rb b/db/seeds.rb index 476a878cf..e9e0c2757 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -168,46 +168,48 @@ end # end # end -if Category.count == 0 - Category.create!([ - {name: 'Stage'}, - {name: 'Atelier'} - ]) +if Category.count.zero? + Category.create!( + [ + { name: 'Stage' }, + { name: 'Atelier' } + ] + ) end unless Setting.find_by(name: 'about_body').try(:value) setting = Setting.find_or_initialize_by(name: 'about_body') - setting.value = "

Le Fab Lab de La Casemate est un"+ - ' atelier de fabrication numérique où l’on peut utiliser des machines de découpe, des imprimantes 3D,… permettant'+ - ' de travailler sur des matériaux variés : plastique, bois, carton, vinyle, … afin de créer toute sorte d’objet grâce'+ - ' à la conception assistée par ordinateur ou à l’électronique. Mais le Fab Lab est aussi un lieu d’échange de'+ - ' compétences technique.

'+ - "

Le Fab Lab de La Casemate est un espace"+ - ' permanent : ouvert à tous, il offre la possibilité de réaliser des objets soi-même, de partager ses'+ - ' compétences et d’apprendre au contact des médiateurs du Fab Lab et des autres usagers.

'+ - '

La formation au Fab Lab s’appuie sur des projets et le partage de connaissances : vous devez prendre'+ + setting.value = '

La Fabrique du Fab-manager est un' \ + ' atelier de fabrication numérique où l’on peut utiliser des machines de découpe, des imprimantes 3D,… permettant' \ + ' de travailler sur des matériaux variés : plastique, bois, carton, vinyle, … afin de créer toute sorte d’objet grâce' \ + ' à la conception assistée par ordinateur ou à l’électronique. Mais le Fab Lab est aussi un lieu d’échange de' \ + ' compétences technique.

' \ + '

La Fabrique du Fab-manager est un espace' \ + ' permanent : ouvert à tous, il offre la possibilité de réaliser des objets soi-même, de partager ses' \ + ' compétences et d’apprendre au contact des médiateurs du Fab Lab et des autres usagers.

' \ + '

La formation au Fab Lab s’appuie sur des projets et le partage de connaissances : vous devez prendre' \ ' part à la capitalisation des connaissances et à l’instruction des autres utilisateurs.

' setting.save end unless Setting.find_by(name: 'about_title').try(:value) setting = Setting.find_or_initialize_by(name: 'about_title') - setting.value = 'Imaginer, Fabriquer,
Partager au Fab Lab
de La Casemate' + setting.value = 'Imaginer, Fabriquer,
Partager à la Fabrique
du Fab-manager' setting.save end unless Setting.find_by(name: 'about_contacts').try(:value) setting = Setting.find_or_initialize_by(name: 'about_contacts') - setting.value = '
'+ - '
Manager Fab Lab :
'+ - '
jean-michel.molenaar@lacasemate.fr
'+ - '
Responsable médiation :
'+ - '
catherine.demarcq@lacasemate.fr
'+ - '
Animateur scientifique :
'+ - '
diego.scharager@lacasemate.fr
'+ - '
'+ - '

'+ - "

Visitez le site de La Casemate

" + setting.value = '
' \ + '
Manager Fab Lab :
' \ + '
jean.dupont@fab-manager.com
' \ + '
Responsable médiation :
' \ + '
pierre.dupond@fab-manager.com
' \ + '
Animateur scientifique :
' \ + '
louise.durand@fab-manager.com
' \ + '
' \ + '

' \ + "

Visitez le site de Fab-manager

" setting.save end @@ -297,11 +299,11 @@ end unless Setting.find_by(name: 'invoice_legals').try(:value) setting = Setting.find_or_initialize_by(name: 'invoice_legals') - setting.value = 'La Casemate
'+ - '2 Place St Laurent 38000 GRENOBLE France
'+ - 'Tél. Administration : +33 4 76 44 88 80
'+ - 'Fax. : +33 4 76 42 76 66
'+ - 'SIRET : 317 270 593 00013 - APE 913 E' + setting.value = 'La fabrique
' \ + '68 rue Louise Michel 38100 GRENOBLE France
' \ + 'Tél. : +33 1 23 45 67 98
' \ + 'Fax. : +33 1 23 45 67 98
' \ + 'SIRET : 237 082 474 00006 - APE 913 E' setting.save end @@ -365,13 +367,13 @@ end unless Setting.find_by(name: 'fablab_name').try(:value) setting = Setting.find_or_initialize_by(name: 'fablab_name') - setting.value = 'Fab Lab de La Casemate' + setting.value = 'Fabrique' setting.save end unless Setting.find_by(name: 'name_genre').try(:value) setting = Setting.find_or_initialize_by(name: 'name_genre') - setting.value = 'male' + setting.value = 'female' setting.save end @@ -457,4 +459,4 @@ unless StatisticIndex.find_by(es_type_key: 'space') {statistic_index_id: index.id, key: 'booking', label:I18n.t('statistics.bookings'), graph: true, simple: true}, {statistic_index_id: index.id, key: 'hour', label:I18n.t('statistics.hours_number'), graph: true, simple: false} ]) -end \ No newline at end of file +end