Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Optimisations #18

Closed
wants to merge 8 commits into from
Closed

Optimisations #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3e78eea
MAJ de la page de contacts.
blackheaven Jul 19, 2012
5d5db4e
Merge branch 'master' of github.com:IFAEDI/S.I
blackheaven Jan 30, 2013
e050576
Adding Société Général partnership.
blackheaven Jan 30, 2013
9cbab66
Welcome to 2013
blackheaven Jan 30, 2013
971fc4e
Reverse bad merge
blackheaven Jan 31, 2013
6c86015
Correcting Société Générale partnership size
blackheaven Jan 31, 2013
d76166c
Concatenation of js and css
blackheaven Jan 31, 2013
7ae1e7f
Compress images.
blackheaven Jan 31, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Serveur/web/accueil.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,10 @@
</p>
<p class="span3">
<a href="http://www.thalesgroup.com/" title="Thalès - Parrain Promo 2014"><img class="width2" src="./commun/img/parrains_caroussel/thales.png" alt="Thalès"></a>
</p>
</p>
<p class="span12">
<embed src="./commun/img/societe_generale.swf" height="100" width="800" />
</p>
</div>

</div>
Expand Down
0 ...ui-bg_diagonals-thick_18_b81900_40x40.png → ...ui-bg_diagonals-thick_18_b81900_40x40.png
View file
Open in desktop
File renamed without changes
0 ...ui-bg_diagonals-thick_20_666666_40x40.png → ...ui-bg_diagonals-thick_20_666666_40x40.png
View file
Open in desktop
File renamed without changes
0 ...ss/images/ui-bg_flat_10_000000_40x100.png → ...ss/images/ui-bg_flat_10_000000_40x100.png
View file
Open in desktop
File renamed without changes
0 ...s/images/ui-bg_glass_100_f6f6f6_1x400.png → ...s/images/ui-bg_glass_100_f6f6f6_1x400.png
View file
Open in desktop
File renamed without changes
0 ...s/images/ui-bg_glass_100_fdf5ce_1x400.png → ...s/images/ui-bg_glass_100_fdf5ce_1x400.png
View file
Open in desktop
File renamed without changes
0 ...ss/images/ui-bg_glass_65_ffffff_1x400.png → ...ss/images/ui-bg_glass_65_ffffff_1x400.png
View file
Open in desktop
File renamed without changes
0 ...es/ui-bg_gloss-wave_35_f6a828_500x100.png → ...es/ui-bg_gloss-wave_35_f6a828_500x100.png
View file
Open in desktop
File renamed without changes
0 ...ui-bg_highlight-soft_100_eeeeee_1x100.png → ...ui-bg_highlight-soft_100_eeeeee_1x100.png
View file
Open in desktop
File renamed without changes
0 .../ui-bg_highlight-soft_75_ffe45c_1x100.png → .../ui-bg_highlight-soft_75_ffe45c_1x100.png
View file
Open in desktop
File renamed without changes
0 ...htness/images/ui-icons_222222_256x240.png → ...un/css/images/ui-icons_222222_256x240.png
View file
Open in desktop
File renamed without changes
0 ...htness/images/ui-icons_228ef1_256x240.png → ...un/css/images/ui-icons_228ef1_256x240.png
View file
Open in desktop
File renamed without changes
0 ...htness/images/ui-icons_ef8c08_256x240.png → ...un/css/images/ui-icons_ef8c08_256x240.png
View file
Open in desktop
File renamed without changes
0 ...htness/images/ui-icons_ffd27a_256x240.png → ...un/css/images/ui-icons_ffd27a_256x240.png
View file
Open in desktop
File renamed without changes
0 ...htness/images/ui-icons_ffffff_256x240.png → ...un/css/images/ui-icons_ffffff_256x240.png
View file
Open in desktop
File renamed without changes
0 ...web/commun/css/ui-lightness/jquery-ui.css → Serveur/web/commun/css/jquery-ui.css
View file
Open in desktop
File renamed without changes.
1,749 changes: 1,749 additions & 0 deletions Serveur/web/commun/css/layout.css
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified Serveur/web/commun/img/equipe/bureau.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Serveur/web/commun/img/equipe/equipe_admin.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Serveur/web/commun/img/equipe/equipe_animation.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Serveur/web/commun/img/equipe/equipe_communication.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Serveur/web/commun/img/equipe/equipe_entiere.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Serveur/web/commun/img/equipe/equipe_entreprise.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Serveur/web/commun/img/photo_caroussel/conference.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Serveur/web/commun/img/photo_caroussel/detente.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Serveur/web/commun/img/photo_caroussel/equipe.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Serveur/web/commun/img/photo_caroussel/integration.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Serveur/web/commun/img/photo_caroussel/integration2.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Serveur/web/commun/img/photo_caroussel/rif.jpg
View file
Open in desktop
Binary file added Serveur/web/commun/img/societe_generale.swf
View file
Open in desktop
Binary file not shown.
1,729 changes: 1,729 additions & 0 deletions Serveur/web/commun/js/layout.js
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 3 additions & 17 deletions Serveur/web/layout.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,8 @@
<meta charset="utf-8" />
<link rel="shortcut icon" href="./favicon.ico" >
<?php
inclure_fichier('commun', 'bootstrap.min', 'css');
inclure_fichier('commun', 'bootstrap-responsive.min', 'css');
inclure_fichier('commun', 'style', 'css');
inclure_fichier('commun', 'ui-lightness/jquery-ui', 'css');

inclure_fichier('commun', 'jquery.min', 'js');
inclure_fichier('commun', 'jquery-ui.min', 'js');
inclure_fichier('commun', 'bootstrap.min', 'js');
inclure_fichier('commun', 'datepicker.fr', 'js');
inclure_fichier('commun', 'json2', 'js');
inclure_fichier('commun', 'utils', 'js');
inclure_fichier('commun', 'jquery.tablesorter.min', 'js');


inclure_fichier('commun', 'login', 'js');
inclure_fichier('commun', 'SHA1', 'js');
inclure_fichier('commun', 'layout', 'css');
inclure_fichier('commun', 'layout', 'js');
?>

<title>AEDI - <?php echo $titre_page; ?></title>
Expand Down Expand Up @@ -66,7 +52,7 @@
<div class="module">
<?php inclure_fichier($nom_module, $nom_page, 'php'); ?>
</div>
<p id="layout" class="footer">&copy; AEDI - 2012</p>
<p id="layout" class="footer">&copy; AEDI - 2013</p>
</div>

</body>
Expand Down