- Mise à jour du thème pour la surcharge de thème de Shaarli.

MarceauKa · Mar 11, 2015 · abdbafb · abdbafb
1 parent 9bae7b1
commit abdbafb
Show file tree

Hide file tree

Showing 33 changed files with 79 additions and 13 deletions.
diff --git a/inc/bootstrap.min.css b/inc/bootstrap.min.css
diff --git a/inc/index.html b/inc/index.html
diff --git a/readme.md b/readme.md
@@ -18,9 +18,12 @@ Pré-requis
 Installation
 ----
 
-- Remplacer les fichiers /tpl du thème dans le dossier /tpl de votre Shaarli
-- Copier le dossiers /fonts à la racine de votre Shaarli
-- Ajouter les fichiers bootstrap.* dans le dossier /inc de votre Shaarli 
+La branche "shaarli-template" suit la nouvelle façon de charger les thèmes pour votre Shaarli.
+Vous pouvez obtenir plus d'information à ce sujet en suivant cette URL : https://github.com/shaarli/Shaarli/issues/163
+
+Dans ce cas il suffit de configurer la configuration en indiquant la valeur "RAINTPL_TPL" à "superhero".
+
+Si votre Shaarli n'est pas compatible (< 0.43), suivez la branche "master" de ce thème.
 
 
 Version

diff --git a/tpl/addlink.html → superhero/addlink.html b/tpl/addlink.html → superhero/addlink.html
diff --git a/tpl/changepassword.html → superhero/changepassword.html b/tpl/changepassword.html → superhero/changepassword.html
diff --git a/tpl/changetag.html → superhero/changetag.html b/tpl/changetag.html → superhero/changetag.html
diff --git a/tpl/configure.html → superhero/configure.html b/tpl/configure.html → superhero/configure.html
diff --git a/tpl/daily.html → superhero/daily.html b/tpl/daily.html → superhero/daily.html
diff --git a/tpl/dailyrss.html → superhero/dailyrss.html b/tpl/dailyrss.html → superhero/dailyrss.html
diff --git a/tpl/editlink.html → superhero/editlink.html b/tpl/editlink.html → superhero/editlink.html
diff --git a/tpl/export.html → superhero/export.html b/tpl/export.html → superhero/export.html
diff --git a/tpl/import.html → superhero/import.html b/tpl/import.html → superhero/import.html
diff --git a/inc/bootstrap.licence.txt → superhero/inc/bootstrap.licence.txt b/inc/bootstrap.licence.txt → superhero/inc/bootstrap.licence.txt
diff --git a/superhero/inc/bootstrap.min.css b/superhero/inc/bootstrap.min.css
diff --git a/inc/bootstrap.min.js → superhero/inc/bootstrap.min.js b/inc/bootstrap.min.js → superhero/inc/bootstrap.min.js
diff --git a/fonts/glyphicons-halflings-regular.eot → ...hero/inc/glyphicons-halflings-regular.eot b/fonts/glyphicons-halflings-regular.eot → ...hero/inc/glyphicons-halflings-regular.eot
diff --git a/fonts/glyphicons-halflings-regular.svg → ...hero/inc/glyphicons-halflings-regular.svg b/fonts/glyphicons-halflings-regular.svg → ...hero/inc/glyphicons-halflings-regular.svg
diff --git a/fonts/glyphicons-halflings-regular.ttf → ...hero/inc/glyphicons-halflings-regular.ttf b/fonts/glyphicons-halflings-regular.ttf → ...hero/inc/glyphicons-halflings-regular.ttf
diff --git a/fonts/glyphicons-halflings-regular.woff → ...ero/inc/glyphicons-halflings-regular.woff b/fonts/glyphicons-halflings-regular.woff → ...ero/inc/glyphicons-halflings-regular.woff
diff --git a/fonts/index.html → superhero/inc/index.html b/fonts/index.html → superhero/inc/index.html
diff --git a/tpl/includes.html → superhero/includes.html b/tpl/includes.html → superhero/includes.html
@@ -5,7 +5,7 @@
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <link rel="alternate" type="application/rss+xml" href="{$feedurl}?do=rss{$searchcrits}#" title="RSS Feed" />
 <link rel="alternate" type="application/atom+xml" href="{$feedurl}?do=atom{$searchcrits}#" title="ATOM Feed" />
-<link type="text/css" rel="stylesheet" href="http://links.casals.fr/inc/bootstrap.min.css" />
+<link type="text/css" rel="stylesheet" href="<?= RAINTPL_TPL; ?>/inc/bootstrap.min.css" />
 <style type="text/css">body { padding-top: 70px; }</style>
-<script src="http://links.casals.fr/inc/jquery.min.js"></script>
-<script src="http://links.casals.fr/inc/bootstrap.min.js"></script>
+<script src="<?= RAINTPL_TPL; ?>/inc/jquery.min.js"></script>
+<script src="<?= RAINTPL_TPL; ?>/inc/bootstrap.min.js"></script>
diff --git a/tpl/install.html → superhero/install.html b/tpl/install.html → superhero/install.html
diff --git a/tpl/linklist.html → superhero/linklist.html b/tpl/linklist.html → superhero/linklist.html
diff --git a/tpl/linklist.paging.html → superhero/linklist.paging.html b/tpl/linklist.paging.html → superhero/linklist.paging.html
diff --git a/tpl/loginform.html → superhero/loginform.html b/tpl/loginform.html → superhero/loginform.html
diff --git a/tpl/page.footer.html → superhero/page.footer.html b/tpl/page.footer.html → superhero/page.footer.html
diff --git a/tpl/page.header.html → superhero/page.header.html b/tpl/page.header.html → superhero/page.header.html
diff --git a/tpl/page.html → superhero/page.html b/tpl/page.html → superhero/page.html
diff --git a/tpl/picwall.html → superhero/picwall.html b/tpl/picwall.html → superhero/picwall.html
diff --git a/tpl/picwall2.html → superhero/picwall2.html b/tpl/picwall2.html → superhero/picwall2.html
diff --git a/superhero/readme.md b/superhero/readme.md
@@ -0,0 +1,62 @@
+Shaarli - Bootstrap 3 SuperHero
+=========
+
+Kézako?
+----
+Bootstrap 3 SuperHero est un thème pour [Shaarli] (par le génial [SebSauvage]).
+
+Ce thème est basé sur la version 3 de [Bootstrap] et le thème [Bootswatch] SuperHero.
+
+Il apporte aussi la traduction française de Shaarli.
+
+Pré-requis
+----
+
+  - Shaarli >= 0.41 (le thème a été conçu sur cette version)
+  - jQuery >= 1.7.1 (vient avec Shaarli)
+
+Installation
+----
+
+- Remplacer les fichiers /tpl du thème dans le dossier /tpl de votre Shaarli
+- Copier le dossiers /fonts à la racine de votre Shaarli
+- Ajouter les fichiers bootstrap.* dans le dossier /inc de votre Shaarli 
+
+
+Version
+----
+
+Le thème est encore en Alpha.
+Bootstrap est encore en phase d'intégration.
+
+To-do
+----
+
+- Finalisation de la structure HTML
+- Arrangement des couleurs (ça pique un peu les yeux pour le moment)
+- Finalisation de la traduction française
+- Nettoyage du code HTML
+- Ajout de sucrettes javascript
+
+Démo
+----
+
+Mon petit Shaarli : [MarceauKa]
+
+
+Licenses
+----
+
+- Bootstrap : [MIT]
+- jQuery : [MIT]
+- Shaarli : [Zlib]
+- Bootstrap 3 SuperHero : [WTFPL]
+
+[Shaarli]:http://sebsauvage.net/wiki/doku.php?id=php:shaarli
+[SebSauvage]:http://sebsauvage.net/
+[Bootstrap]:http://getbootstrap.com/
+[Bootswatch]:http://bootswatch.com/superhero/
+[MarceauKa]:http://links.casals.fr
+[WTFPL]:http://en.wikipedia.org/wiki/WTFPL
+[Zlib]:http://en.wikipedia.org/wiki/Zlib
+[MIT]:http://en.wikipedia.org/wiki/MIT_License
diff --git a/tpl/tagcloud.html → superhero/tagcloud.html b/tpl/tagcloud.html → superhero/tagcloud.html
diff --git a/tpl/tools.html → superhero/tools.html b/tpl/tools.html → superhero/tools.html