From 2a4698c982e586e2bb0c792f5dc8c05c9f41d6a8 Mon Sep 17 00:00:00 2001 From: Douglas Gardner Date: Thu, 18 Apr 2013 11:06:13 +0000 Subject: [PATCH 01/10] push out WIP --- modules/project/pages.js | 44 ++++++++++++++++++++++++++++++++++++ modules/project/project.js | 14 ++++++++++++ modules/project/strings.json | 36 +++++++++++++++++++++++++++++ views/project/project.jade | 19 ++++++++++++++++ 4 files changed, 113 insertions(+) create mode 100644 modules/project/pages.js create mode 100644 modules/project/project.js create mode 100644 modules/project/strings.json create mode 100644 views/project/project.jade diff --git a/modules/project/pages.js b/modules/project/pages.js new file mode 100644 index 0000000..c35ac54 --- /dev/null +++ b/modules/project/pages.js @@ -0,0 +1,44 @@ +var exec = require('child_process').exec; + +var pages = function(dbot) { + var lang = dbot.config.language; + /* + var modules = function() { + var modlist = dbot.config.moduleNames; + var formatted = "" + return formatted; + } */ + var rev; + exec("git rev-list --all | wc -l", function(a,b,c){rev = b}); + return { + '/project': function(req, res) { + res.render('project', { + "name": dbot.config.name, + "curr839": lang, + "currver": dbot.config.version, + "currlang": dbot.strings["dbotspeaks"][lang].format({ // dbot.t won't work s; + "lang839": lang, + "langen": dbot.strings[lang]["en"], + "lang": dbot.strings[lang][lang], + "name": dbot.config.name + }), + "projectstatus": dbot.strings["projectstatus"][lang], + "revnum": dbot.strings["revnum"][lang].format({ + "name": dbot.config.name, + "rev": rev, + "ver": "abcdef" // TODO, obviously + }), + "modules": dbot.config.moduleNames, + "loadmod": dbot.strings["loadedmodules"][lang] + }); + }, + }; +}; + +exports.fetch = function(dbot) { + return pages(dbot); +}; diff --git a/modules/project/project.js b/modules/project/project.js new file mode 100644 index 0000000..7f4c498 --- /dev/null +++ b/modules/project/project.js @@ -0,0 +1,14 @@ +/** + * Module Name: imgur + * Description: Various imgur functionality + */ + +var _ = require('underscore')._, + request = require('request'); + +var project = function(dbot) { + // nothing to see here go away love zuzak +} +exports.fetch = function(dbot) { + return new project(dbot); +} diff --git a/modules/project/strings.json b/modules/project/strings.json new file mode 100644 index 0000000..6c8119f --- /dev/null +++ b/modules/project/strings.json @@ -0,0 +1,36 @@ +{ + "dbotspeaks": { + "en": "{name} speaks {lang} ({langen})", + "de": "{name} spricht {lang} ({langen})", + "fr": "{name} parle {lang} ({langen})" + }, + "en": { + "en": "English", + "fr": "anglais", + "de": "Englisch" + }, + "fr": { + "en": "French", + "fr": "français", + "de": "Französisch" + }, + "de": { + "en": "German", + "fr": "allemande", + "de": "Deutsch" + }, + "projectstatus": { + "en": "Project Status", + "fr": "Situation du Projet", + "de": "Projektstatus" + }, + "revnum": { + "en": "{name} is at revision {rev} ({ver})", + "fr": "{name} est à révision {rev} ({ver})", + "de": "{name} ist in der Revision {rev} ({ver})" + }, + "loadedmodules": { + "en": "Loaded modules", + "fr": "Modules chargés" + } +} diff --git a/views/project/project.jade b/views/project/project.jade new file mode 100644 index 0000000..70a81ee --- /dev/null +++ b/views/project/project.jade @@ -0,0 +1,19 @@ +extends ../layout + +block content + h2 #{projectstatus} + section#git + h3 Git + p + #{revnum} + section#config + h3 Configuration + ul + li #{currlang} + h4 #{loadmod} + ul + each module in modules + li #{module} + section#footer + p + #{currver} From d3f8e295beff8a14a2b92ce67d7967398e122208 Mon Sep 17 00:00:00 2001 From: Douglas Gardner Date: Thu, 18 Apr 2013 11:45:15 +0000 Subject: [PATCH 02/10] convert to dbot.t; add Italian; add debugMode --- modules/project/pages.js | 28 +++++++------------- modules/project/strings.json | 51 +++++++++++++++++++++++++++++------- views/project/project.jade | 1 + 3 files changed, 51 insertions(+), 29 deletions(-) diff --git a/modules/project/pages.js b/modules/project/pages.js index c35ac54..eb6149c 100644 --- a/modules/project/pages.js +++ b/modules/project/pages.js @@ -1,39 +1,29 @@ var exec = require('child_process').exec; var pages = function(dbot) { - var lang = dbot.config.language; - /* - var modules = function() { - var modlist = dbot.config.moduleNames; - var formatted = "" - return formatted; - } */ var rev; exec("git rev-list --all | wc -l", function(a,b,c){rev = b}); return { '/project': function(req, res) { res.render('project', { "name": dbot.config.name, - "curr839": lang, + "curr839": dbot.config.language, "currver": dbot.config.version, - "currlang": dbot.strings["dbotspeaks"][lang].format({ // dbot.t won't work s; - "lang839": lang, - "langen": dbot.strings[lang]["en"], - "lang": dbot.strings[lang][lang], + "currlang": dbot.t("dbotspeaks",{ + "lang839": dbot.config.language, + "langen": dbot.strings[dbot.config.language]["en"], + "lang": dbot.t(dbot.config.language), "name": dbot.config.name }), - "projectstatus": dbot.strings["projectstatus"][lang], - "revnum": dbot.strings["revnum"][lang].format({ + "projectstatus": dbot.t("projectstatus"), + "revnum": dbot.t("revnum",{ "name": dbot.config.name, "rev": rev, "ver": "abcdef" // TODO, obviously }), "modules": dbot.config.moduleNames, - "loadmod": dbot.strings["loadedmodules"][lang] + "loadmod": dbot.t("loadedmodules"), + "debugmode": dbot.t("debugmode-" + dbot.config.debugMode) }); }, }; diff --git a/modules/project/strings.json b/modules/project/strings.json index 6c8119f..592ba0c 100644 --- a/modules/project/strings.json +++ b/modules/project/strings.json @@ -2,35 +2,66 @@ "dbotspeaks": { "en": "{name} speaks {lang} ({langen})", "de": "{name} spricht {lang} ({langen})", - "fr": "{name} parle {lang} ({langen})" + "fr": "{name} parle {lang} ({langen})", + "it": "{name} parla {lang} ({langen})" }, "en": { "en": "English", "fr": "anglais", - "de": "Englisch" + "de": "Englisch", + "it": "inglese" }, "fr": { "en": "French", "fr": "français", - "de": "Französisch" + "de": "Französisch", + "it": "francese" }, "de": { "en": "German", "fr": "allemande", - "de": "Deutsch" + "de": "Deutsch", + "it": "tedesco" + }, + "it": { + "en": "Italian", + "fr": "italien", + "de": "Italienier", + "it": "italiano" }, "projectstatus": { - "en": "Project Status", - "fr": "Situation du Projet", - "de": "Projektstatus" + "en": "project status", + "fr": "situation du projet", + "de": "Projektstatus", + "it": "stato del progetto" }, "revnum": { "en": "{name} is at revision {rev} ({ver})", "fr": "{name} est à révision {rev} ({ver})", - "de": "{name} ist in der Revision {rev} ({ver})" + "de": "{name} ist in der Revision {rev} ({ver})", + "it": "{name} è il numero di revisione {rev} ({ver})" }, "loadedmodules": { - "en": "Loaded modules", - "fr": "Modules chargés" + "en": "loaded modules", + "fr": "modules chargés", + "it": "moduli caricati" + }, + "configuration": { + "en": "Configuration", + "fr": "Configuration", + "de": "Konfiguration", + "it": "configuazione" + }, + "debugmode-true": { + "en": "Debug mode active", + "fr": "debug actif", + "de": "Debug aktiv", + "it": "debug attivo" + }, + "debugmode-false": { + "en": "Debug off", + "fr": "debug éteint", + "de": "Debug ausgeschaltet", + "it": "debug spento" } } diff --git a/views/project/project.jade b/views/project/project.jade index 70a81ee..ecfe3f7 100644 --- a/views/project/project.jade +++ b/views/project/project.jade @@ -10,6 +10,7 @@ block content h3 Configuration ul li #{currlang} + li #{debugmode} h4 #{loadmod} ul each module in modules From 985b53c768dcbe1eb42b3119699f295b451fc5c7 Mon Sep 17 00:00:00 2001 From: Douglas Gardner Date: Thu, 18 Apr 2013 14:30:00 +0000 Subject: [PATCH 03/10] Add milestone + Bump github + Fix Italian translation of revision count + Add translation of git to strings.json (bonus points if you find a language that needs it) --- modules/github | 2 +- modules/project/pages.js | 25 ++++++++++++++++++++++--- modules/project/strings.json | 36 +++++++++++++++++++++++++++++++++--- views/project/project.jade | 15 +++++++++++++-- 4 files changed, 69 insertions(+), 9 deletions(-) diff --git a/modules/github b/modules/github index e9e9089..7e38c6b 160000 --- a/modules/github +++ b/modules/github @@ -1 +1 @@ -Subproject commit e9e9089f282b0455a481460ebec17a4672617ceb +Subproject commit 7e38c6be750a071724763872175f1a9445297b76 diff --git a/modules/project/pages.js b/modules/project/pages.js index eb6149c..c5b64ca 100644 --- a/modules/project/pages.js +++ b/modules/project/pages.js @@ -1,8 +1,19 @@ -var exec = require('child_process').exec; +var exec = require('child_process').exec, + request = require('request'); var pages = function(dbot) { var rev; - exec("git rev-list --all | wc -l", function(a,b,c){rev = b}); + exec("git rev-list --all | wc -l", function(a,b,c){rev = b}); + var gstatus; + dbot.api.github.githubStatus(function(a){gstatus = a}); + + /* TODO: merge back into github module */ + var milestones; + request("https://api.github.com/repos/" + dbot.config.github.defaultrepo + "/milestones", function(e, r, b){ + milestones = JSON.parse(b); + }); + + return { '/project': function(req, res) { res.render('project', { @@ -23,7 +34,15 @@ var pages = function(dbot) { }), "modules": dbot.config.moduleNames, "loadmod": dbot.t("loadedmodules"), - "debugmode": dbot.t("debugmode-" + dbot.config.debugMode) + "debugmode": dbot.t("debugmode-" + dbot.config.debugMode), + "githubstatus": gstatus, + "milestones": milestones, + "milestoneprog": dbot.t("milestoneprog"), + "config": dbot.t("configoptions"), + "milestonename": dbot.t("milestonename"), + "openmilestone": dbot.t("openmilestone"), + "closedmilestone": dbot.t("closedmilestone") + }); }, }; diff --git a/modules/project/strings.json b/modules/project/strings.json index 592ba0c..1214a67 100644 --- a/modules/project/strings.json +++ b/modules/project/strings.json @@ -39,18 +39,18 @@ "en": "{name} is at revision {rev} ({ver})", "fr": "{name} est à révision {rev} ({ver})", "de": "{name} ist in der Revision {rev} ({ver})", - "it": "{name} è il numero di revisione {rev} ({ver})" + "it": "{name} il numero di revisione {rev} ({ver})" }, "loadedmodules": { "en": "loaded modules", "fr": "modules chargés", "it": "moduli caricati" }, - "configuration": { + "configoptions": { "en": "Configuration", "fr": "Configuration", "de": "Konfiguration", - "it": "configuazione" + "it": "Configuazione" }, "debugmode-true": { "en": "Debug mode active", @@ -63,5 +63,35 @@ "fr": "debug éteint", "de": "Debug ausgeschaltet", "it": "debug spento" + }, + "milestoneprog": { + "en": "Progress", + "fr": "Progression", + "de": "Fortschritt", + "it": "sviluppo" + }, + "openmilestone": { + "en": "Open", + "fr": "Ouvert", + "de": "Offen", + "it": "Aperto" + }, + "closedmilestone": { + "en": "Closed", + "fr": "Fermé", + "de": "Gesperrt", + "it": "Chiuso" + }, + "milestonename": { + "en": "Name", + "fr": "Nom", + "de": "Name", + "it": "Nome" + }, + "git": { + "en": "Git", + "fr": "Git", + "de": "Git", + "it": "Git" } } diff --git a/views/project/project.jade b/views/project/project.jade index ecfe3f7..2f1c7ed 100644 --- a/views/project/project.jade +++ b/views/project/project.jade @@ -5,9 +5,20 @@ block content section#git h3 Git p - #{revnum} + #{revnum} + h4 #{milestoneprog} + table + tr + th #{milestonename} + th #{openmilestone} + th #{closedmilestone} + each milestone in milestones + tr + td #{milestone.title} + td #{milestone.open_issues} + td #{milestone.closed_issues} section#config - h3 Configuration + h3 #{config} ul li #{currlang} li #{debugmode} From f7dbe778389e4a539d5105971522b997b7ad1b0c Mon Sep 17 00:00:00 2001 From: Douglas Gardner Date: Thu, 18 Apr 2013 16:12:01 +0000 Subject: [PATCH 04/10] Format stuff ## Changelog: - Remove Github status call. + Closed issues + Localised

+ Add introductory paragraph + Add last diff to page - Remove jade include to layout.jade + Dynamic language metadata + CSS + Progress bars ## Known issues: * Loading the closed milestones raises an exception for some reason; in a try-catch for now, unsure how to fix. ## Still to do: * Style loaded modules section (columns?) * Shrink footer * Do we need a shorthand hash by the revision? * Pull req count? (low priority) --- modules/project/pages.js | 24 ++++++--- modules/project/strings.json | 15 +++--- views/project/project.jade | 96 ++++++++++++++++++++++++------------ 3 files changed, 92 insertions(+), 43 deletions(-) diff --git a/modules/project/pages.js b/modules/project/pages.js index c5b64ca..d39444b 100644 --- a/modules/project/pages.js +++ b/modules/project/pages.js @@ -3,14 +3,21 @@ var exec = require('child_process').exec, var pages = function(dbot) { var rev; - exec("git rev-list --all | wc -l", function(a,b,c){rev = b}); - var gstatus; - dbot.api.github.githubStatus(function(a){gstatus = a}); + exec("git rev-list --all | wc -l", function(a,b,c){rev = b}); + var diff; + exec("git log -1", function(a, b, c){diff = b}); /* TODO: merge back into github module */ var milestones; request("https://api.github.com/repos/" + dbot.config.github.defaultrepo + "/milestones", function(e, r, b){ milestones = JSON.parse(b); + request("https://api.github.com/repos/" + dbot.config.github.defaultrepo + "/milestones?state=closed", function (a, c, d){ + var milestones2 = []; + try{ + milestones2 = JSON.parse(c); + } catch(e){} + milestones = milestones.concat(milestones2) + }); }); @@ -18,6 +25,9 @@ var pages = function(dbot) { '/project': function(req, res) { res.render('project', { "name": dbot.config.name, + "intro": dbot.t("dbotintro", { + "botname": dbot.config.name + }), "curr839": dbot.config.language, "currver": dbot.config.version, "currlang": dbot.t("dbotspeaks",{ @@ -35,14 +45,16 @@ var pages = function(dbot) { "modules": dbot.config.moduleNames, "loadmod": dbot.t("loadedmodules"), "debugmode": dbot.t("debugmode-" + dbot.config.debugMode), - "githubstatus": gstatus, "milestones": milestones, "milestoneprog": dbot.t("milestoneprog"), "config": dbot.t("configoptions"), "milestonename": dbot.t("milestonename"), "openmilestone": dbot.t("openmilestone"), - "closedmilestone": dbot.t("closedmilestone") - + "closedmilestone": dbot.t("closedmilestone"), + "diff": diff, + "pagetitle": dbot.t("pagetitle", { + "botname": dbot.config.name + }) }); }, }; diff --git a/modules/project/strings.json b/modules/project/strings.json index 1214a67..fcbd253 100644 --- a/modules/project/strings.json +++ b/modules/project/strings.json @@ -1,10 +1,19 @@ { + "dbotintro": { + "en": "{botname} lorem ipsum dolor sit amet" + }, "dbotspeaks": { "en": "{name} speaks {lang} ({langen})", "de": "{name} spricht {lang} ({langen})", "fr": "{name} parle {lang} ({langen})", "it": "{name} parla {lang} ({langen})" }, + "pagetitle": { + "en": "{botname} web interface", + "fr": "{botname} interface réseau", + "de": "{botname} Web-Interface", + "it": "{botname} interfaccia web" + }, "en": { "en": "English", "fr": "anglais", @@ -29,12 +38,6 @@ "de": "Italienier", "it": "italiano" }, - "projectstatus": { - "en": "project status", - "fr": "situation du projet", - "de": "Projektstatus", - "it": "stato del progetto" - }, "revnum": { "en": "{name} is at revision {rev} ({ver})", "fr": "{name} est à révision {rev} ({ver})", diff --git a/views/project/project.jade b/views/project/project.jade index 2f1c7ed..e822db3 100644 --- a/views/project/project.jade +++ b/views/project/project.jade @@ -1,31 +1,65 @@ -extends ../layout - -block content - h2 #{projectstatus} - section#git - h3 Git - p - #{revnum} - h4 #{milestoneprog} - table - tr - th #{milestonename} - th #{openmilestone} - th #{closedmilestone} - each milestone in milestones - tr - td #{milestone.title} - td #{milestone.open_issues} - td #{milestone.closed_issues} - section#config - h3 #{config} - ul - li #{currlang} - li #{debugmode} - h4 #{loadmod} - ul - each module in modules - li #{module} - section#footer - p - #{currver} +!!! +html(lang='#{curr839}') + head + meta(charset='utf-8') + script(type="text/javascript", src="//ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js") + link(rel="stylesheet", type="text/css", href="http://fonts.googleapis.com/css?family=Source+Sans+Pro") + link(rel="stylesheet", type="text/css", href="/bootstrap/css/bootstrap.min.css") + link(rel='stylesheet', type='text/css', href='/styles.css') + link(rel="stylesheet", href="/project.css") + title #{pagetitle} + script(type="text/javascript", src="/project.js") + - var mstone = "milestone" + style(type="text/css") + each milestone in milestones + - current = mstone+milestone.number + - wdth = ((milestone.open_issues/(milestone.open_issues + milestone.closed_issues))*100) + .current { width: wdth% } + body + div.container + div#page + div#title #{pagetitle} + div.container#main + p.intro + #{intro} + section#git + h3 Git + p.center + #{revnum} + pre#gitdiff + #{diff} + h4 #{milestoneprog} + table#milestones.center + tr + th #{milestonename} + th #{milestoneprog} + th #{openmilestone} + th #{closedmilestone} + each milestone in milestones + - var mstone = "milestone" + - var wd = "width:" + - var pc = "%" + - var wdth = ((milestone.closed_issues/(milestone.open_issues + milestone.closed_issues))*100) + tr(id=mstone+milestone.number) + td #{milestone.title} + td + div.progress(class=milestone.state) + div.progress-inner(style=wd+wdth+pc)(class=milestone.state) +   + td #{milestone.open_issues} + td #{milestone.closed_issues} + section#config + h3 #{config} + ul + li #{currlang} + li #{debugmode} + h4 #{loadmod} + ul + each module in modules + li #{module} + section#footer + p + #{currver} + script(type="text/javascript", src="/bootstrap/js/bootstrap.min.js") + script(type="text/javascript", src="/d3/d3.v3.min.js") + script(type="text/javascript", src="/script.js") From ef2b50863c19bd4b99dc3c151f765f8d4e1fb275 Mon Sep 17 00:00:00 2001 From: Douglas Gardner Date: Thu, 18 Apr 2013 16:27:07 +0000 Subject: [PATCH 05/10] Renamed "git" "development" (because I thought having "Development" / "Configuration" would look cool. --- modules/project/pages.js | 1 + modules/project/strings.json | 10 +++++----- views/project/project.jade | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/project/pages.js b/modules/project/pages.js index d39444b..fc5e281 100644 --- a/modules/project/pages.js +++ b/modules/project/pages.js @@ -51,6 +51,7 @@ var pages = function(dbot) { "milestonename": dbot.t("milestonename"), "openmilestone": dbot.t("openmilestone"), "closedmilestone": dbot.t("closedmilestone"), + "development": dbot.t("development"), "diff": diff, "pagetitle": dbot.t("pagetitle", { "botname": dbot.config.name diff --git a/modules/project/strings.json b/modules/project/strings.json index fcbd253..b130b3d 100644 --- a/modules/project/strings.json +++ b/modules/project/strings.json @@ -91,10 +91,10 @@ "de": "Name", "it": "Nome" }, - "git": { - "en": "Git", - "fr": "Git", - "de": "Git", - "it": "Git" + "development": { + "en": "Development", + "fr": "Développement", + "de": "Entwicklung", + "it": "Sviluppo" } } diff --git a/views/project/project.jade b/views/project/project.jade index e822db3..bf19ab5 100644 --- a/views/project/project.jade +++ b/views/project/project.jade @@ -23,7 +23,7 @@ html(lang='#{curr839}') p.intro #{intro} section#git - h3 Git + h3 #{development} p.center #{revnum} pre#gitdiff From c157ddf08c51f79e58bef0d87ea64c581433c797 Mon Sep 17 00:00:00 2001 From: Douglas Gardner Date: Thu, 18 Apr 2013 16:54:09 +0000 Subject: [PATCH 06/10] Added random quote to header --- modules/project/pages.js | 3 +++ views/project/project.jade | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/project/pages.js b/modules/project/pages.js index fc5e281..637a284 100644 --- a/modules/project/pages.js +++ b/modules/project/pages.js @@ -2,6 +2,8 @@ var exec = require('child_process').exec, request = require('request'); var pages = function(dbot) { + var depression = dbot.db.quoteArrs[dbot.config.project.quotecat]; + var rev; exec("git rev-list --all | wc -l", function(a,b,c){rev = b}); var diff; @@ -52,6 +54,7 @@ var pages = function(dbot) { "openmilestone": dbot.t("openmilestone"), "closedmilestone": dbot.t("closedmilestone"), "development": dbot.t("development"), + "dquote": depression[Math.floor(Math.random()*depression.length)], "diff": diff, "pagetitle": dbot.t("pagetitle", { "botname": dbot.config.name diff --git a/views/project/project.jade b/views/project/project.jade index bf19ab5..a648b02 100644 --- a/views/project/project.jade +++ b/views/project/project.jade @@ -21,7 +21,7 @@ html(lang='#{curr839}') div#title #{pagetitle} div.container#main p.intro - #{intro} + #{dquote} section#git h3 #{development} p.center From 54beca150191e970b8603727fa5595535922bd7a Mon Sep 17 00:00:00 2001 From: Douglas Gardner Date: Thu, 18 Apr 2013 17:06:25 +0000 Subject: [PATCH 07/10] Add config options; remove closed milestone count --- modules/project/config.json | 4 ++++ modules/project/pages.js | 9 +-------- 2 files changed, 5 insertions(+), 8 deletions(-) create mode 100644 modules/project/config.json diff --git a/modules/project/config.json b/modules/project/config.json new file mode 100644 index 0000000..f31a1c9 --- /dev/null +++ b/modules/project/config.json @@ -0,0 +1,4 @@ +{ + "quotecat":"depressionbot", + "dependencies": ["web", "quotes", "github"] +} diff --git a/modules/project/pages.js b/modules/project/pages.js index 637a284..e2dfd3c 100644 --- a/modules/project/pages.js +++ b/modules/project/pages.js @@ -11,15 +11,8 @@ var pages = function(dbot) { /* TODO: merge back into github module */ var milestones; - request("https://api.github.com/repos/" + dbot.config.github.defaultrepo + "/milestones", function(e, r, b){ + request("https://api.github.com/repos/" + dbot.config.github.defaultrepo + "/milestones?state=open", function(e, r, b){ milestones = JSON.parse(b); - request("https://api.github.com/repos/" + dbot.config.github.defaultrepo + "/milestones?state=closed", function (a, c, d){ - var milestones2 = []; - try{ - milestones2 = JSON.parse(c); - } catch(e){} - milestones = milestones.concat(milestones2) - }); }); From abac2fd97a72b26e84dbd781e0d4fb730503bb3c Mon Sep 17 00:00:00 2001 From: Douglas Gardner Date: Thu, 18 Apr 2013 17:33:46 +0000 Subject: [PATCH 08/10] Commit CSS. Remove text shadow. --- public/project.css | 63 ++++++++++++++++++++++++++++++++++++++ public/styles.css | 2 -- views/project/project.jade | 2 +- 3 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 public/project.css diff --git a/public/project.css b/public/project.css new file mode 100644 index 0000000..7f769ef --- /dev/null +++ b/public/project.css @@ -0,0 +1,63 @@ +pre#gitdiff { + text-align:left; + width:80; + margin:auto; +} +div#main { + text-align:inherit; + font-size:18px; +} +h2,h3,h4,h5,h6,.center { + text-align:center; +} +table#milestones { + margin:auto; + width:80%; +} +table#milestones td { + padding:5px; +} +p.intro { + text-align:center; + border:1px solid #ccc; + padding:20px; + border-radius:4px; +} +div.progress.open { + background-image: linear-gradient(to bottom,#f4fff4,#f9fff9); +} +div.progress { + margin-top:auto; + margin-bottom:auto; +} +div.progress-inner.open { + width:20%; + background-image: linear-gradient(to bottom,#3fff3f,#7fff7f); +} +div.progress.closed { + background-image: linear-gradient(to bottom,#fff5f5,#fff9f9); +} +div.progress-inner.closed { + background-image: linear-gradient(to bottom,#ff3f3f,#ff7f7f); + width:20%; +} + +#config { + text-align:center; +} + +li { + background-image: linear-gradient(to bottom, #f5ebe2, #f5e6d8); + border:1px solid #f5dcc5; + padding:5px; + margin:5px; + display:inline-block; +} + +* { + text-shadow:none; +} + +#footer { + font-size:80%; +} diff --git a/public/styles.css b/public/styles.css index 50f73bd..5786bcc 100644 --- a/public/styles.css +++ b/public/styles.css @@ -13,7 +13,6 @@ body { margin: 0; font-family: "Source Sans Pro", sans-serif; color: #444; - text-shadow: 1px 1px 2px #2B2B2B; background: url("background.jpg") no-repeat center center fixed; -webkit-background-size: cover; -moz-background-size: cover; @@ -133,7 +132,6 @@ li.quote { padding: 6px; font-size: 18px; width: 40%; - text-shadow: 1px 1px 1px black; } img { diff --git a/views/project/project.jade b/views/project/project.jade index a648b02..903eb3c 100644 --- a/views/project/project.jade +++ b/views/project/project.jade @@ -54,7 +54,7 @@ html(lang='#{curr839}') li #{currlang} li #{debugmode} h4 #{loadmod} - ul + ul#modules each module in modules li #{module} section#footer From 1534d1451c648989866442010f5b48d7dc5862cf Mon Sep 17 00:00:00 2001 From: Douglas Gardner Date: Thu, 18 Apr 2013 17:36:43 +0000 Subject: [PATCH 09/10] Remove cruft. - Removed abcdef placeholder from revision total (as the commit is on the line below (in longform). - Removed the English translation of English. --- modules/project/strings.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/project/strings.json b/modules/project/strings.json index b130b3d..a720281 100644 --- a/modules/project/strings.json +++ b/modules/project/strings.json @@ -3,7 +3,7 @@ "en": "{botname} lorem ipsum dolor sit amet" }, "dbotspeaks": { - "en": "{name} speaks {lang} ({langen})", + "en": "{name} speaks {lang})", "de": "{name} spricht {lang} ({langen})", "fr": "{name} parle {lang} ({langen})", "it": "{name} parla {lang} ({langen})" @@ -39,10 +39,10 @@ "it": "italiano" }, "revnum": { - "en": "{name} is at revision {rev} ({ver})", - "fr": "{name} est à révision {rev} ({ver})", - "de": "{name} ist in der Revision {rev} ({ver})", - "it": "{name} il numero di revisione {rev} ({ver})" + "en": "{name} is at revision {rev}", + "fr": "{name} est à révision {rev}", + "de": "{name} ist in der Revision {rev}", + "it": "{name} il numero di revisione {rev}" }, "loadedmodules": { "en": "loaded modules", From 6cf19669676b80e42a20a3e1b6f37f3861c8976a Mon Sep 17 00:00:00 2001 From: Douglas Gardner Date: Thu, 18 Apr 2013 17:53:13 +0000 Subject: [PATCH 10/10] rm overlooked .js call --- views/project/project.jade | 1 - 1 file changed, 1 deletion(-) diff --git a/views/project/project.jade b/views/project/project.jade index 903eb3c..d86f06a 100644 --- a/views/project/project.jade +++ b/views/project/project.jade @@ -8,7 +8,6 @@ html(lang='#{curr839}') link(rel='stylesheet', type='text/css', href='/styles.css') link(rel="stylesheet", href="/project.css") title #{pagetitle} - script(type="text/javascript", src="/project.js") - var mstone = "milestone" style(type="text/css") each milestone in milestones