summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpiernov <piernov@piernov.servegame.org>2012-10-19 21:37:53 +0200
committerpiernov <piernov@piernov.servegame.org>2012-10-19 21:37:53 +0200
commit8a03b03fb21e168ace1c5424967d0e6ddbc6c7cc (patch)
tree34d5e54243c038b43bfa34a934bbad670e2905cf
parent2df4c55788261bf9efd40bc31047885683f948f6 (diff)
downloadbdg-8a03b03fb21e168ace1c5424967d0e6ddbc6c7cc.tar.gz
bdg-8a03b03fb21e168ace1c5424967d0e6ddbc6c7cc.tar.bz2
bdg-8a03b03fb21e168ace1c5424967d0e6ddbc6c7cc.tar.xz
bdg-8a03b03fb21e168ace1c5424967d0e6ddbc6c7cc.zip
Header déplacé dans header.rb
-rwxr-xr-xheader.rb24
-rwxr-xr-xindex.cgi24
-rwxr-xr-xlatest.cgi44
-rwxr-xr-xtop.cgi25
4 files changed, 43 insertions, 74 deletions
diff --git a/header.rb b/header.rb
new file mode 100755
index 0000000..51c3a85
--- /dev/null
+++ b/header.rb
@@ -0,0 +1,24 @@
+def header_bdg()
+ $cgi = CGI.new
+ puts $cgi.header
+
+ html = <<HTML_BDG
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr">
+ <head>
+ <title>BDG Blagues de Geek</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <meta http-equiv="content-language" content="fr" />
+ <meta http-equiv="Pragma" content="no-cache" />
+ <meta http-equiv="Cache-Control" content="no-cache, must-revalidate" />
+ <meta http-equiv="Expires" content="0" />
+ <link rel="shortcut icon" href="favicon.ico" />
+ <link rel="stylesheet" media="screen" type="text/css" title="Design" href="index.css" />
+ </head>
+ <body>
+HTML_BDG
+ return html
+end \ No newline at end of file
diff --git a/index.cgi b/index.cgi
index 5cd81ac..177054f 100755
--- a/index.cgi
+++ b/index.cgi
@@ -10,27 +10,9 @@ db=$db
page="Blagues"
subpage="Aléatoire"
-cgi = CGI.new
-puts cgi.header
-
-puts <<HTML_BDG
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
- "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr">
- <head>
- <title>BDG — Blagues de Geek</title>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <meta http-equiv="content-language" content="fr" />
- <meta http-equiv="Pragma" content="no-cache" />
- <meta http-equiv="Cache-Control" content="no-cache, must-revalidate" />
- <meta http-equiv="Expires" content="0" />
- <link rel="shortcut icon" href="favicon.ico" />
- <link rel="stylesheet" media="screen" type="text/css" title="Design" href="index.css" />
- </head>
- <body>
-HTML_BDG
+require 'header'
+puts header_bdg()
+cgi=$cgi
require 'menu'
puts menu_bdg(page,subpage)
diff --git a/latest.cgi b/latest.cgi
index 22bb34a..30ee24a 100755
--- a/latest.cgi
+++ b/latest.cgi
@@ -10,41 +10,23 @@ db=$db
page="Blagues"
subpage="Derniers ajouts"
-cgi = CGI.new
-puts cgi.header
+require 'header'
+puts header_bdg()
+cgi=$cgi
if cgi['page'] =~ /\d*/
- page = cgi['page'].to_i
+ current_page = cgi['page'].to_i
else
- page = 1
+ current_page = 1
end
-puts <<HTML_BDG
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
- "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr">
- <head>
- <title>BDG — Blagues de Geek</title>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <meta http-equiv="content-language" content="fr" />
- <meta http-equiv="Pragma" content="no-cache" />
- <meta http-equiv="Cache-Control" content="no-cache, must-revalidate" />
- <meta http-equiv="Expires" content="0" />
- <link rel="shortcut icon" href="favicon.ico" />
- <link rel="stylesheet" media="screen" type="text/css" title="Design" href="index.css" />
- </head>
- <body>
-HTML_BDG
-
require 'menu'
puts menu_bdg(page,subpage)
puts <<HTML_BDG
<table id="milieu">
<tr>
- <td id="gauche"><h1><a href="random.cgi">Dernières blagues ajoutés</a></h1>
+ <td id="gauche"><h1><a href="latest.cgi">Dernières blagues ajoutés</a></h1>
<div id="page">
HTML_BDG
@@ -53,8 +35,8 @@ db.execute("SELECT count(id) FROM blague").each { |row| num_bdg = row[0].to_i }
num_page = ((num_bdg+11)/10+1)
i = 0
-if page > 5 then
- i = page
+if current_page > 5 then
+ i = current_page
puts <<HTML_BDG
<a class="page" href="?page=1">1</a>
@@ -63,20 +45,20 @@ HTML_BDG
end
until i == num_page
i = i+1
- if i > (page+10) and num_page/2 > 10 then
+ if i > (current_page+10) and num_page/2 > 10 then
puts <<HTML_BDG
- <a class="page" href="?page=#{(num_page+page)/2}">#{(num_page+page)/2}</a>
+ <a class="page" href="?page=#{(num_page+current_page)/2}">#{(num_page+current_page)/2}</a>
HTML_BDG
break
- elsif i > 5 and page > 5 then
+ elsif i > 5 and current_page > 5 then
puts <<HTML_BDG
<a class="page" href="?page=#{i-4}">#{i-4}</a>
HTML_BDG
- elsif i < 11 and page <= 5
+ elsif i < 11 and current_page <= 5
puts <<HTML_BDG
<a class="page" href="?page=#{i}">#{i}</a>
@@ -95,7 +77,7 @@ puts"
</div>"
i = 0
-db.execute("SELECT * FROM blague WHERE id < ((SELECT id FROM blague ORDER BY id DESC LIMIT 1)-#{(page*10)-11}) ORDER BY id DESC LIMIT 10").each { |row|
+db.execute("SELECT * FROM blague WHERE id < ((SELECT id FROM blague ORDER BY id DESC LIMIT 1)-#{(current_page*10)-11}) ORDER BY id DESC LIMIT 10").each { |row|
unless row[1] == ""
if i.modulo(2) == 1
parity = " impair"
diff --git a/top.cgi b/top.cgi
index df6424f..0f88548 100755
--- a/top.cgi
+++ b/top.cgi
@@ -11,34 +11,15 @@ order = "-"
page="Blagues"
subpage="Top 10"
-cgi = CGI.new
+require 'header'
+puts header_bdg()
+cgi=$cgi
if cgi['order'] == "worst"
order = "+"
subpage="Worst"
end
-puts cgi.header
-
-puts <<HTML_BDG
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
- "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr">
- <head>
- <title>BDG — Blagues de Geek</title>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <meta http-equiv="content-language" content="fr" />
- <meta http-equiv="Pragma" content="no-cache" />
- <meta http-equiv="Cache-Control" content="no-cache, must-revalidate" />
- <meta http-equiv="Expires" content="0" />
- <link rel="shortcut icon" href="favicon.ico" />
- <link rel="stylesheet" media="screen" type="text/css" title="Design" href="index.css" />
- </head>
- <body>
-HTML_BDG
-
require 'menu'
puts menu_bdg(page,subpage)