Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=f290d962b146d6f5400a1ed6154a20f04564d247
commit f290d962b146d6f5400a1ed6154a20f04564d247
Author: PacMiam <pacm...@gmx.fr>
Date: Fri Nov 15 11:02:44 2013 +0100
* Change some path again
diff --git a/frugalware/.htaccess b/frugalware/.htaccess
index 05fd828..29150f8 100644
--- a/frugalware/.htaccess
+++ b/frugalware/.htaccess
@@ -5,8 +5,8 @@
</Files>
RewriteEngine on
-RewriteCond %{REQUEST_URI} ^/news.php
-RewriteRule .* http://frugalware.org/news
+#RewriteCond %{REQUEST_URI} ^/news.php
+#RewriteRule .* http://frugalware.org/news
RewriteCond %{REQUEST_URI} !^/.*\.php
RewriteCond %{REQUEST_URI} !^/images
RewriteCond %{REQUEST_URI} !^/start
diff --git a/frugalware/lib/config.inc.php b/frugalware/lib/config.inc.php
index 493d87b..06396d4 100644
--- a/frugalware/lib/config.inc.php
+++ b/frugalware/lib/config.inc.php
@@ -11,7 +11,7 @@ $sqlpass = "85Tdjf{Od";
$sqldb = "frugalware2";
# FWNG SETTINGS
-#$myurl = "";
+$myurl = "https://frugalware.org";;
$fwng_root = $myurl."/";
$adodb_path = "/usr/share/php";
$trans_path="/home/ftp/pub/other/translations/";
diff --git a/frugalware/lib/functions.inc.php b/frugalware/lib/functions.inc.php
index 4f2447e..d4ac394 100644
--- a/frugalware/lib/functions.inc.php
+++ b/frugalware/lib/functions.inc.php
@@ -82,20 +82,20 @@ function showAbout ($content, $showScreenshot=true)
print "
<div id=\"slideshow\" align=\"center\">";
- if ($screenshot_dir =
opendir(".".$fwng_root."images/users_screenshots/"))
+ if ($screenshot_dir = opendir($fwng_root."images/users_screenshots/"))
{
print '
<ul>
<li>
- <a id="imagebox"
href=".'.$fwng_root.'images/official_background.jpg"><img rel="fancybox"
src=".'. $fwng_root . 'images/data/official_background.jpg" title="Let\'s make
things frugal!" /></a>
+ <a id="imagebox"
href="'.$fwng_root.'images/official_background.jpg"><img rel="fancybox" src="'.
$fwng_root . 'images/data/official_background.jpg" title="Let\'s make things
frugal!" /></a>
</li>';
while (false !== ($file = readdir($screenshot_dir)))
{
if ($file != '.' && $file != '..' && $file != 'thumbnails' && $file !=
'README') {
print '
<li>
- <a id="imagebox"
href=".'.$fwng_root.'images/users_screenshots/'.$file.'"><img rel="fancybox"
src=".'. $fwng_root . 'images/users_screenshots/thumbnails/'.$file.'"
title="'.NiceName($file).'" /></a>
+ <a id="imagebox"
href="'.$fwng_root.'images/users_screenshots/'.$file.'"><img rel="fancybox"
src="'. $fwng_root . 'images/users_screenshots/thumbnails/'.$file.'"
title="'.NiceName($file).'" /></a>
</li>';
}
}
diff --git a/frugalware/screenshots.php b/frugalware/screenshots.php
index 6e71668..6db76c4 100644
--- a/frugalware/screenshots.php
+++ b/frugalware/screenshots.php
@@ -46,9 +46,9 @@ include("lib/config.inc.php");
include("header.php");
-$screenTitle = "<img src=\"." . $fwng_root . "images/icons/screenshots.png\"
/>" . gettext("Screenshots from users");
+$screenTitle = "<img src=\"" . $fwng_root . "images/icons/screenshots.png\"
/>" . gettext("Screenshots from users");
$screenContent = "";
-if ($screenshot_dir = opendir(".".$fwng_root."images/users_screenshots/"))
+if ($screenshot_dir = opendir("" . $fwng_root."images/users_screenshots/"))
{
$screenContent .= "<ul>";
while (false !== ($file = readdir($screenshot_dir)))
@@ -56,8 +56,8 @@ if ($screenshot_dir =
opendir(".".$fwng_root."images/users_screenshots/"))
if ($file != '.' && $file != '..' && $file != 'thumbnails' && $file !=
'README') {
$screenContent .= "<li>
<h1>".NiceName($file)."</h1>
- <a id=\"imagebox\"
href=\".".$fwng_root."images/users_screenshots/".$file."\">
- <img src=\".".$fwng_root .
'images/users_screenshots/thumbnails/'.$file."\" alt=\"".NiceName($file)."\"
title=\"".NiceName($file)."\" />
+ <a id=\"imagebox\" href=\"" .
$fwng_root."images/users_screenshots/".$file."\">
+ <img src=\"" . $fwng_root .
'images/users_screenshots/thumbnails/'.$file."\" alt=\"".NiceName($file)."\"
title=\"".NiceName($file)."\" />
</a>
</li>\n";
}
@@ -67,7 +67,7 @@ if ($screenshot_dir =
opendir(".".$fwng_root."images/users_screenshots/"))
fwscreenbox($screenTitle, $screenContent);
}
-$screenTitle = "<img src=\"." . $fwng_root . "images/icons/screenshots.png\"
/>" . gettext("Old screenshots");
+$screenTitle = "<img src=\"" . $fwng_root . "images/icons/screenshots.png\"
/>" . gettext("Old screenshots");
$screenContent = "<ul>";
//$fwng_root = "https://frugalware.org/";;
@@ -75,8 +75,8 @@ for ($i=0; $i<count($shots['users']); $i++)
{
$screenContent .= "<li>
<h1>".$shots['users'][$i]['title']."</h1>
- <a id=\"imagebox\"
href=\".".$fwng_root."images/screenshots/users/".$shots['users'][$i]['name']."\">
- <img
src=\".".$fwng_root."images/screenshots/users/thumbnails/".$shots['users'][$i]['name']."\"
alt=\"screenshot\" />
+ <a id=\"imagebox\" href=\"" .
$fwng_root."images/screenshots/users/".$shots['users'][$i]['name']."\">
+ <img src=\"" .
$fwng_root."images/screenshots/users/thumbnails/".$shots['users'][$i]['name']."\"
alt=\"screenshot\" />
</a>
</li>\n";
}
diff --git a/frugalware/static/socialnetworks.inc.html
b/frugalware/static/socialnetworks.inc.html
index 45ed85a..a340fbc 100644
--- a/frugalware/static/socialnetworks.inc.html
+++ b/frugalware/static/socialnetworks.inc.html
@@ -1,6 +1,6 @@
<div class="social">
- <a
href="https://plus.google.com/111814325401516364988";><img
src="images/social/google_1.png" alt="" /></a>
- <a href="https://twitter.com/frugalware";><img
src="images/social/twitter_1.png" alt="" /></a>
- <a
href="https://www.facebook.com/pages/Frugalware/102198856488858";><img
src="images/social/facebook_1.png" alt="" /></a>
- <a
href="https://frugalware-linux.deviantart.com/";><img
src="images/social/deviantart_1.png" alt="" /></a>
+ <a
href="https://plus.google.com/111814325401516364988";><img
src="https://frugalware.org/images/social/google_1.png"; alt="" /></a>
+ <a href="https://twitter.com/frugalware";><img
src="https://frugalware.org/images/social/twitter_1.png"; alt="" /></a>
+ <a
href="https://www.facebook.com/pages/Frugalware/102198856488858";><img
src="https://frugalware.org/images/social/facebook_1.png"; alt="" /></a>
+ <a
href="https://frugalware-linux.deviantart.com/";><img
src="https://frugalware.org/images/social/deviantart_1.png"; alt="" /></a>
</div>
diff --git a/frugalware/xml/menu.xml b/frugalware/xml/menu.xml
index d587278..1ee35a9 100644
--- a/frugalware/xml/menu.xml
+++ b/frugalware/xml/menu.xml
@@ -20,32 +20,32 @@
<menu>
<_link>Frugalware</_link>
<submenus>
- <_sublink url="news">News</_sublink>
- <_sublink url="docs">Documentation</_sublink>
- <_sublink url="screenshots">Screenshots</_sublink>
+ <_sublink url="https://frugalware.org/news";>News</_sublink>
+ <_sublink
url="https://frugalware.org/docs";>Documentation</_sublink>
+ <_sublink
url="https://frugalware.org/screenshots";>Screenshots</_sublink>
<_sublink></_sublink>
- <_sublink url="authors">Authors</_sublink>
- <_sublink url="media">Press</_sublink>
- <_sublink url="rss">News feeds</_sublink>
+ <_sublink url="https://frugalware.org/authors";>Authors</_sublink>
+ <_sublink url="https://frugalware.org/media";>Press</_sublink>
+ <_sublink url="https://frugalware.org/rss";>News feeds</_sublink>
</submenus>
</menu>
<menu>
<_link>Community</_link>
<submenus>
<_sublink url="https://forums.frugalware.org";>Forums</_sublink>
- <_sublink url="irc">IRC</_sublink>
+ <_sublink url="https://frugalware.org/irc";>IRC</_sublink>
<_sublink></_sublink>
<_sublink url="http://www.frugalware-art.org/";>Artwork</_sublink>
<_sublink url="http://planet.frugalware.org";>Blogs</_sublink>
- <_sublink url="paste">Pastebin</_sublink>
+ <_sublink url="https://frugalware.org/paste";>Pastebin</_sublink>
<_sublink url="https://frugalware.org/mailman/listinfo";>Mailing lists</_sublink>
</submenus>
</menu>
<menu>
- <_link url="download">Download</_link>
+ <_link url="https://frugalware.org/download";>Download</_link>
</menu>
<menu>
- <_link url="packages">Packages</_link>
+ <_link url="https://frugalware.org/packages";>Packages</_link>
</menu>
<menu>
<_link url="https://wiki.frugalware.org";>Wiki</_link>
@@ -54,13 +54,13 @@
<_link>Development</_link>
<submenus>
<_sublink url="https://bugs.frugalware.org";>Bug Tracker</_sublink>
- <_sublink url="buildlogs">Buildlogs</_sublink>
+ <_sublink
url="https://frugalware.org/buildlogs";>Buildlogs</_sublink>
<_sublink url="http://git.frugalware.org";>Git repository</_sublink>
- <_sublink url="roadmap">Roadmap</_sublink>
- <_sublink url="security">Security announcements</_sublink>
+ <_sublink url="https://frugalware.org/roadmap";>Roadmap</_sublink>
+ <_sublink url="https://frugalware.org/security";>Security
announcements</_sublink>
<_sublink url="https://pootle.frugalware.org";>Translation portal</_sublink>
<_sublink></_sublink>
- <_sublink url="donations">Donations</_sublink>
+ <_sublink
url="https://frugalware.org/donations";>Donations</_sublink>
</submenus>
</menu>
</menus>
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
![https://frugalware.org/images/social/google_1.png"](https://frugalware.org/images/social/google_1.png"){kind=link}
![https://frugalware.org/images/social/twitter_1.png"](https://frugalware.org/images/social/twitter_1.png"){kind=link}
![https://frugalware.org/images/social/facebook_1.png"](https://frugalware.org/images/social/facebook_1.png"){kind=link}
![https://frugalware.org/images/social/deviantart_1.png"](https://frugalware.org/images/social/deviantart_1.png"){kind=link}