From a5fa26a9aa722272e293eb5f0d750f76da1bdf42 Mon Sep 17 00:00:00 2001 From: Manuel Hiebel Date: Wed, 5 Jul 2017 09:52:42 +0200 Subject: replace custom .css with common header, basic bootstrap adaptation --- en/1/for-you/index.php | 2 ++ en/1/index.php | 2 ++ en/1/migrate/index.php | 2 ++ en/1/next/index.php | 2 ++ en/1/notes/index.php | 4 +++- en/2/download_index.php | 2 ++ en/2/for-pc/index.php | 24 +++++++++++++++--------- en/2/for-server/index.php | 8 ++++++-- en/2/index.php | 4 +++- en/3/download_index.php | 2 ++ en/3/for-pc/index.php | 24 +++++++++++++++--------- en/3/for-server/index.php | 8 ++++++-- en/3/index.php | 4 +++- en/4/download_index.php | 2 +- en/4/index.php | 2 +- en/about/code-of-conduct/index.php | 12 ++++++------ en/about/constitution/index.php | 5 ++--- en/about/index.php | 4 ++-- en/about/license/index.php | 5 ++--- en/about/media/index.php | 5 ++--- en/about/policies/privacy/index.php | 7 +++---- en/about/reports/2010/index.php | 2 ++ en/about/reports/index.php | 3 +-- en/about/reports/template.php | 2 ++ en/about/values/index.php | 3 +-- en/calendar/index.php | 2 +- en/legal/index.php | 3 ++- en/support/report-a-bug/index.php | 3 ++- en/thank-you/index.php | 2 +- en/timeline/index.php | 3 +-- 30 files changed, 95 insertions(+), 58 deletions(-) (limited to 'en') diff --git a/en/1/for-you/index.php b/en/1/for-you/index.php index eed3ded86..f2e92af1d 100644 --- a/en/1/for-you/index.php +++ b/en/1/for-you/index.php @@ -17,6 +17,7 @@ $_t = i18n::get_strings($_t, $locale, $i18n_fallback_rules); + @@ -83,5 +84,6 @@ $_t = i18n::get_strings($_t, $locale, $i18n_fallback_rules); + diff --git a/en/1/index.php b/en/1/index.php index ee21002a9..c17c0ec99 100644 --- a/en/1/index.php +++ b/en/1/index.php @@ -18,6 +18,7 @@ $_t = i18n::get_strings($_t, $locale, $i18n_fallback_rules); + @@ -64,5 +65,6 @@ $_t = i18n::get_strings($_t, $locale, $i18n_fallback_rules); + diff --git a/en/1/migrate/index.php b/en/1/migrate/index.php index f24d73d93..59f5d62f2 100644 --- a/en/1/migrate/index.php +++ b/en/1/migrate/index.php @@ -17,6 +17,7 @@ $_t = i18n::get_strings($_t, $locale, $i18n_fallback_rules); + @@ -110,5 +111,6 @@ $_t = i18n::get_strings($_t, $locale, $i18n_fallback_rules); + diff --git a/en/1/next/index.php b/en/1/next/index.php index 98696dbb8..c1af04557 100644 --- a/en/1/next/index.php +++ b/en/1/next/index.php @@ -17,6 +17,7 @@ $_t = i18n::get_strings($_t, $locale, $i18n_fallback_rules); + @@ -111,5 +112,6 @@ $_t = i18n::get_strings($_t, $locale, $i18n_fallback_rules); + diff --git a/en/1/notes/index.php b/en/1/notes/index.php index 9ee372f95..8fb521ae7 100644 --- a/en/1/notes/index.php +++ b/en/1/notes/index.php @@ -18,6 +18,7 @@ $_t = i18n::get_strings($_t, $locale, $i18n_fallback_rules); + @@ -211,5 +212,6 @@ $_t = i18n::get_strings($_t, $locale, $i18n_fallback_rules); + - \ No newline at end of file + diff --git a/en/2/download_index.php b/en/2/download_index.php index 25524306c..5755650d7 100644 --- a/en/2/download_index.php +++ b/en/2/download_index.php @@ -18,6 +18,7 @@ require '../downloads/get/lib.php'; + @@ -227,5 +228,6 @@ require '../downloads/get/lib.php'; + diff --git a/en/2/for-pc/index.php b/en/2/for-pc/index.php index 5794be6e5..15933427d 100644 --- a/en/2/for-pc/index.php +++ b/en/2/for-pc/index.php @@ -16,12 +16,14 @@ $dictionary = read_translation_file($locale, '2'); hr { margin-top: 2em; } +

Mageia 2 »

-
+
+
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
Mageia 2 Release notes.', array('https://wiki.mageia.org/en/Mageia_2_Release_Notes'), 'p'); _g('You can take a look at the Mageia Application Database to get a more complete list of Mageia packages.', array('//madb.mageia.org'), 'p'); ?>
+
+
+ diff --git a/en/2/for-server/index.php b/en/2/for-server/index.php index 2bf840800..5c6f7d635 100644 --- a/en/2/for-server/index.php +++ b/en/2/for-server/index.php @@ -16,12 +16,14 @@ $dictionary = read_translation_file($locale, '2'); hr { margin-top: 2em; } +

Mageia 2 »

-
+
+
-
+
Mageia 2 Release notes.', null, 'p'); _g('You can take a look at the Mageia Application Database to get a more complete list of Mageia packages.', array('//madb.mageia.org'), 'p'); ?>
+
+ diff --git a/en/2/index.php b/en/2/index.php index 2fd8055b5..3df8da1e6 100644 --- a/en/2/index.php +++ b/en/2/index.php @@ -17,12 +17,13 @@ $dictionary = read_translation_file($locale, '2'); hr { margin-top: 2em; } +

Mageia 2

-
+
Mageia 2
+ diff --git a/en/3/download_index.php b/en/3/download_index.php index df7b8f84c..dd1c8defa 100755 --- a/en/3/download_index.php +++ b/en/3/download_index.php @@ -18,6 +18,7 @@ require '../downloads/get/lib.php'; + @@ -208,5 +209,6 @@ require '../downloads/get/lib.php';
+ diff --git a/en/3/for-pc/index.php b/en/3/for-pc/index.php index a4de84404..8a4e1c36a 100644 --- a/en/3/for-pc/index.php +++ b/en/3/for-pc/index.php @@ -16,12 +16,14 @@ $dictionary = read_translation_file($locale, '3'); hr { margin-top: 2em; } +

Mageia 3 »

-
+
+
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
Mageia 3 Release notes.', array('https://wiki.mageia.org/en/Mageia_3_Release_Notes'), 'p'); _g('You can take a look at the Mageia Application Database to get a more complete list of Mageia packages.', array('//madb.mageia.org'), 'p'); ?>
+
+
+ diff --git a/en/3/for-server/index.php b/en/3/for-server/index.php index 8bf254280..35a3f71f7 100644 --- a/en/3/for-server/index.php +++ b/en/3/for-server/index.php @@ -16,12 +16,14 @@ $dictionary = read_translation_file($locale, '3'); hr { margin-top: 2em; } +

Mageia 3 »

-
+
+
-
+
Mageia 3 Release notes.', null, 'p'); _g('You can take a look at the Mageia Application Database to get a more complete list of Mageia packages.', array('//madb.mageia.org'), 'p'); ?>
+
+ diff --git a/en/3/index.php b/en/3/index.php index ec3cc5cdf..96fc93e2e 100644 --- a/en/3/index.php +++ b/en/3/index.php @@ -17,12 +17,13 @@ $dictionary = read_translation_file($locale, '3'); hr { margin-top: 2em; } +

Mageia 3

-
+
Mageia 3
+ diff --git a/en/4/download_index.php b/en/4/download_index.php index f5335621d..f0f1260d0 100755 --- a/en/4/download_index.php +++ b/en/4/download_index.php @@ -51,7 +51,7 @@ function dl_link($variant = null, $arch = 'i586', $medium, $torrent = false, $un - + diff --git a/en/4/index.php b/en/4/index.php index 6fdd8604c..2b47bb623 100644 --- a/en/4/index.php +++ b/en/4/index.php @@ -11,7 +11,7 @@ $dictionary = read_translation_file($locale, array('4', 'common_footer')); <?php _g('Mageia 4')?> - + diff --git a/en/about/code-of-conduct/index.php b/en/about/code-of-conduct/index.php index 96f0bcf7c..2acad4887 100644 --- a/en/about/code-of-conduct/index.php +++ b/en/about/code-of-conduct/index.php @@ -12,17 +12,17 @@ $dictionary = read_translation_file($locale, array('about/code-of-conduct', 'com - - + +

-
+
-
+

@@ -34,7 +34,7 @@ $dictionary = read_translation_file($locale, array('about/code-of-conduct', 'com

-
+

@@ -107,4 +107,4 @@ $dictionary = read_translation_file($locale, array('about/code-of-conduct', 'com
- \ No newline at end of file + diff --git a/en/about/constitution/index.php b/en/about/constitution/index.php index fff6423d3..df4533e21 100644 --- a/en/about/constitution/index.php +++ b/en/about/constitution/index.php @@ -15,9 +15,8 @@ $dictionary = read_translation_file($locale, array('about/constitution', 'common - - + @@ -25,7 +24,7 @@ $dictionary = read_translation_file($locale, array('about/constitution', 'common
-
+

may be improved. Do not hesitate to mail your patches; check how in the %s.'), 'gitweb.mageia.org/org/constitution', diff --git a/en/about/index.php b/en/about/index.php index 87d969784..b922efe2b 100644 --- a/en/about/index.php +++ b/en/about/index.php @@ -13,8 +13,8 @@ $dictionary = read_translation_file($locale, array('about', 'common_footer')); - + - + diff --git a/en/about/license/index.php b/en/about/license/index.php index 9047ebddf..a42946ee4 100644 --- a/en/about/license/index.php +++ b/en/about/license/index.php @@ -14,14 +14,13 @@ $prepared_license_strings = read_license_from_vcs($locale); + + <?php _g('Mageia license')?> - - - diff --git a/en/about/media/index.php b/en/about/media/index.php index c02c428f1..bd87ce72a 100644 --- a/en/about/media/index.php +++ b/en/about/media/index.php @@ -13,8 +13,7 @@ $dictionary = read_translation_file($locale, array('about/media', 'common_footer - - + @@ -24,7 +23,7 @@ $dictionary = read_translation_file($locale, array('about/media', 'common_footer

- +
diff --git a/en/about/policies/privacy/index.php b/en/about/policies/privacy/index.php index 8d23f04cd..21e66f8cc 100644 --- a/en/about/policies/privacy/index.php +++ b/en/about/policies/privacy/index.php @@ -11,17 +11,16 @@ $dictionary = read_translation_file($locale, array('about/policies/privacy', 'co <?php _g('Privacy policy')?> - - +

-
+
-
+ diff --git a/en/about/reports/index.php b/en/about/reports/index.php index cdf5ed313..c0d6c8777 100644 --- a/en/about/reports/index.php +++ b/en/about/reports/index.php @@ -11,9 +11,8 @@ $dictionary = read_translation_file($locale, array('about/reports', 'common_foot - - + diff --git a/en/about/reports/template.php b/en/about/reports/template.php index 1f33b56d0..6cbe0fae5 100644 --- a/en/about/reports/template.php +++ b/en/about/reports/template.php @@ -128,6 +128,7 @@ require '../../../../langs.php'; + diff --git a/en/timeline/index.php b/en/timeline/index.php index 213158317..d1cdd250c 100644 --- a/en/timeline/index.php +++ b/en/timeline/index.php @@ -81,8 +81,7 @@ $events = array( <?php _g('Mageia Timeline')?> - - +