You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@community.apache.org by hu...@apache.org on 2016/02/12 12:09:21 UTC
svn commit: r1729989 - in /comdev/helpwanted.apache.org/site: js/hw.js
widget.js
Author: humbedooh
Date: Fri Feb 12 11:09:21 2016
New Revision: 1729989
URL: http://svn.apache.org/viewvc?rev=1729989&view=rev
Log:
allow for tags, reset task items when navigating wizard panel
Modified:
comdev/helpwanted.apache.org/site/js/hw.js
comdev/helpwanted.apache.org/site/widget.js
Modified: comdev/helpwanted.apache.org/site/js/hw.js
URL: http://svn.apache.org/viewvc/comdev/helpwanted.apache.org/site/js/hw.js?rev=1729989&r1=1729988&r2=1729989&view=diff
==============================================================================
--- comdev/helpwanted.apache.org/site/js/hw.js (original)
+++ comdev/helpwanted.apache.org/site/js/hw.js Fri Feb 12 11:09:21 2016
@@ -109,6 +109,7 @@ var wstate = {}
function wizard(step, arg) {
var obj = document.getElementById('innerpicker')
+ document.getElementById('hwitems').innerHTML = ""
if (!step) {
step = 1
}
@@ -116,9 +117,9 @@ function wizard(step, arg) {
wstate = {}
obj.innerHTML = "<h2 style='text-align: center;'>What sort of work would you like to do?</h2>"
for (var i in types) {
- obj.innerHTML += "<img style='vertical-align: middle;' src='images/icon_" + types[i].replace(/\s+/g, "") + ".png'/><big> <a href='javascript:void(0);' onclick='wizard(2, \"" + types[i] + "\");'>" + types_long[types[i]] + "</a></big><br/><br/>"
+ obj.innerHTML += "<div onclick='wizard(2, \"" + types[i] + "\");' class=\"wizitem\" style=\"float: left; width: 235px; height: 300px;\"><img style='height: 128px; padding: 8px; vertical-align: middle;' src='images/" + types[i].replace(/\s+/g, "") + "_large.png'/><br/><b style='font-size:11pt;'>" + types_long[types[i]] + "</b></div>"
}
- obj.innerHTML += "<br/><a href='javascript:void(0);' onclick='fetchItems();'><big>...Just show me everything</big></a>"
+ obj.innerHTML += "<div style='text-align: center;'><a href='javascript:void(0);' onclick='fetchItems();'><big>...Just show me everything</big></a></div>"
}
if (step == 2 && arg) {
wstate = {
@@ -347,7 +348,7 @@ function displayItems(json, state) {
if (state.admin) {
add = " <a href='/admin/close.lua?id=" + item.request_id + "'>Mark as done</a>"
}
-
+ item.description = item.description.replace(/\n/g, "<br/>").replace(hw_weburl, function(a) { return "<a href='"+a+"'>"+a+"</a>"})
tbl += "<tr style='cursor: pointer;' onclick=\"sw('details_" + i + "');\"><td><div class='itemNumber-yellow'>" + z + "</div><img title='" + item.type + "' style='float: left;' src='/images/icon_" + ptype + ".png'/></td>" +
"<td>" + item.project + "</td>"+
"<td style='text-align: left;'>" + item.title + "</td>" +
Modified: comdev/helpwanted.apache.org/site/widget.js
URL: http://svn.apache.org/viewvc/comdev/helpwanted.apache.org/site/widget.js?rev=1729989&r1=1729988&r2=1729989&view=diff
==============================================================================
--- comdev/helpwanted.apache.org/site/widget.js (original)
+++ comdev/helpwanted.apache.org/site/widget.js Fri Feb 12 11:09:21 2016
@@ -127,8 +127,13 @@ function displayItemsWidget(json, state)
}
+ var tags = ""
+ if (state.tags && state.tags.length > 0) {
+ tags = ", tagged " + state.tags
+ }
+
obj.innerHTML = ""
- var tbl = "<table style='width: 100%; text-align: left;'><tr><td colspan='5' style='text-align: center;'><img src='https://helpwanted.apache.org/images/cube.png'/> Tasks " + widgettitle + " would like help with:</td></tr>" +
+ var tbl = "<table style='width: 100%; text-align: left;'><tr><td colspan='5' style='text-align: center;'><img src='https://helpwanted.apache.org/images/cube.png'/> Tasks " + widgettitle + " would like help with"+tags+":</td></tr>" +
"<tr style='cursor: pointer' title='Click on a column to sort'><th onclick='displayItemsWidget(null, \"title\");'>Title</th>" +
"<th onclick='displayItemsWidget(null, \"languages\");'>Languages</th>" +
"<th onclick='displayItemsWidget(null, \"difficulty\");'>Difficulty</th>" +
@@ -177,16 +182,18 @@ function displayItemsWidget(json, state)
obj.innerHTML += tbl
}
-function fetchItemsWidget(languages, types, projects, sortBy) {
+function fetchItemsWidget(languages, types, projects, sortBy, tags) {
if (!languages) languages = []
if (!types) types = []
if (!projects) projects = []
- getAsyncJSON("https://helpwanted.apache.org/listitems.lua?lang=" + languages.join(",") + "&type=" + types.join(",") +"&project=" + projects.join(","),
+ if (!tags) tags = []
+ getAsyncJSON("https://helpwanted.apache.org/listitems.lua?lang=" + languages.join(",") + "&type=" + types.join(",") +"&project=" + projects.join(",") +"&tags=" + tags.join(","),
{
languages: languages,
types: types,
projects: projects,
- sortBy: sortBy
+ sortBy: sortBy,
+ tags: tags.join(", ")
}, displayItemsWidget)
}
@@ -201,15 +208,22 @@ for (var i in divs) {
var dt = divs[i].getAttribute("type")
var dn = divs[i].getAttribute("project")
var dti = divs[i].getAttribute("description")
+ var dtag = divs[i].getAttribute("tags")
+ if (dtag) {
+ dtag = dtag.split(/,\s*/)
+ }
if (dt && dt == "helpwanted" && dn) {
widgetobj = divs[i]
widgetproject = dn
widgettitle = dti ? dti : dn
+ if (widgettitle == '*' || dn == '*') {
+ widgettitle = "the Apache Software Foundation"
+ }
var css = document.createElement('link')
css.rel = "stylesheet";
css.href = "https://helpwanted.apache.org/css/hw2.css";
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(css)
- fetchItemsWidget([],[],[dn])
+ fetchItemsWidget([],[],[dn], null, dtag)
break
}
}
\ No newline at end of file