take-action-svn Mailing List for Take Action
Status: Pre-Alpha
Brought to you by:
jorgevillalobos
Menu
▾
▴
take-action-svn — Take Action SVN mailing list
You can subscribe to this list here.
| 2009 |
Jan
|
Feb
|
Mar
(14) |
Apr
(29) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
|---|
|
From: <jen...@us...> - 2009-09-08 16:38:27
|
Revision: 48
http://take-action.svn.sourceforge.net/take-action/?rev=48&view=rev
Author: jenrique7
Date: 2009-09-08 16:38:18 +0000 (Tue, 08 Sep 2009)
Log Message:
-----------
Tagged the 1.1 release.
Added Paths:
-----------
tags/1.1/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jen...@us...> - 2009-09-08 16:35:01
|
Revision: 47
http://take-action.svn.sourceforge.net/take-action/?rev=47&view=rev
Author: jenrique7
Date: 2009-09-08 16:34:51 +0000 (Tue, 08 Sep 2009)
Log Message:
-----------
- Added the keyword extractor class, taken from SocialActions. This greatly improves the relevance of the API results.
- The search terms of the current page are now displayed in the sidebar.
- Bumped the version to 1.1 and increased the max supported version.
Modified Paths:
--------------
trunk/implementation/src/chrome/content/taBrowserOverlay.js
trunk/implementation/src/chrome/content/taSidebar.js
trunk/implementation/src/chrome/content/taSidebar.xul
trunk/implementation/src/install.rdf
Added Paths:
-----------
trunk/implementation/src/resources/taKeywordExtractor.js
Modified: trunk/implementation/src/chrome/content/taBrowserOverlay.js
===================================================================
--- trunk/implementation/src/chrome/content/taBrowserOverlay.js 2009-04-05 16:21:32 UTC (rev 46)
+++ trunk/implementation/src/chrome/content/taBrowserOverlay.js 2009-09-08 16:34:51 UTC (rev 47)
@@ -16,6 +16,7 @@
Components.utils.import("resource://takeaction/taCommon.js");
Components.utils.import("resource://takeaction/taAPI.js");
+Components.utils.import("resource://takeaction/taKeywordExtractor.js");
/**
* TakeAction chrome namespace.
@@ -112,7 +113,8 @@
// Check whether this page already has injected results (actions)
if (currentDoc.TakeActionResults) {
- this._notifySearchResults(currentDoc.TakeActionResults);
+ this._notifySearchResults(
+ currentDoc.TakeActionKeywords, currentDoc.TakeActionResults);
return;
}
@@ -121,37 +123,9 @@
let title = String(currentDoc.title);
if (title.length > 0) {
- let metaNodes;
- let metaName;
- let searchTerms = null;
+ let extractor = new TakeAction.KeywordExtractor(currentDoc);
+ let searchTerms = extractor.makeList(" ", 3);
- // Look for the keywords meta tag
- metaNodes = currentDoc.getElementsByTagName("meta");
- for (let i = 0; i < metaNodes.length; i++) {
- metaName = String(metaNodes[i].getAttribute("name"));
-
- if (metaName.match(/keywords/i)) {
- searchTerms = metaNodes[i].getAttribute("content");
- break;
- }
- }
-
- // If no keywords, use the doc title as a last resort
- if (!searchTerms) {
- searchTerms = currentDoc.title;
- }
-
- // Split terms by comma, and add only the first 3 at the most
- let searchTermsArray = searchTerms.split(",");
- searchTerms = "";
- for (let i = 0; i < searchTermsArray.length && i < 3; i++) {
- searchTerms += searchTermsArray[i] + " ";
- }
-
- // Convert search terms string as space-separated
- searchTerms = searchTerms.replace(/[^a-z0-9]/gi, " ");
- searchTerms = searchTerms.replace(/\s+/gi, " ");
-
// Do the search
let that = this;
let searchQuery = new TakeAction.SearchQuery();
@@ -165,9 +139,11 @@
that._searchLoad(aSearchResults, currentDoc);
});
- // Set a temporary flag in the document to avoid multiple API calls
+ // Set some temporary flags in the document to avoid multiple API calls
+ currentDoc.TakeActionKeywords = searchTerms;
currentDoc.TakeActionResults = true;
- this._notifySearchResults(true);
+
+ this._notifySearchResults(searchTerms, true);
}
},
@@ -193,11 +169,12 @@
/**
* Notifies the sidebar and the toolbar button of the search results for the
* current page.
+ * @param aSearchTerms The terms which were used to do the search.
* @param aSearchResults The array of search results for the current page.
* May be anything other than an array though, which means that the search
* results are pending.
*/
- _notifySearchResults : function(aSearchResults) {
+ _notifySearchResults : function(aSearchTerms, aSearchResults) {
this._logger.trace("_notifySearchResults");
// Get sidebar and verify that it is opened at this moment
@@ -205,9 +182,9 @@
if (sidebarWindow.location.href ==
"chrome://takeaction/content/taSidebar.xul") {
- // Pass the search results to the sidebar
+ // Pass the search terms and results to the sidebar
sidebarWindow.TakeActionChrome.Sidebar.
- loadThisPageActions(aSearchResults);
+ loadThisPageActions(aSearchTerms, aSearchResults);
}
// Set the search result count in the toolbar button
Modified: trunk/implementation/src/chrome/content/taSidebar.js
===================================================================
--- trunk/implementation/src/chrome/content/taSidebar.js 2009-04-05 16:21:32 UTC (rev 46)
+++ trunk/implementation/src/chrome/content/taSidebar.js 2009-09-08 16:34:51 UTC (rev 47)
@@ -67,14 +67,17 @@
/**
* Loads the social actions search results in the "This Page" tab.
+ * @param aSearchTerms The terms which were used to do the search.
* @param aSearchResults The search results for this (the current) page.
*/
- loadThisPageActions : function(aSearchResults) {
+ loadThisPageActions : function(aSearchTerms, aSearchResults) {
this._logger.debug("loadThisPageActions");
let container =
document.getElementById("takeaction-sidebar-thisPage-actions");
+ document.getElementById("takeaction-keywords-box").value = aSearchTerms;
+
if (typeof(aSearchResults) == 'object') {
this._loadActions(aSearchResults, container);
} else {
Modified: trunk/implementation/src/chrome/content/taSidebar.xul
===================================================================
--- trunk/implementation/src/chrome/content/taSidebar.xul 2009-04-05 16:21:32 UTC (rev 46)
+++ trunk/implementation/src/chrome/content/taSidebar.xul 2009-09-08 16:34:51 UTC (rev 47)
@@ -48,6 +48,22 @@
<tabpanels>
<tabpanel>
<!-- On this page panel. -->
+ <grid class="takeaction-form">
+ <columns>
+ <column/>
+ <column flex="1"/>
+ </columns>
+ <rows>
+ <row class="takeaction-form-row">
+ <label id="takeaction-keywords-label"
+ value="&takeaction.search.label;"
+ accesskey="&takeaction.search.accesskey;"
+ control="takeaction-keywords-box" />
+ <textbox id="takeaction-keywords-box"
+ cocoa-size="small" flex="1" readonly="true" />
+ </row>
+ </rows>
+ </grid>
<vbox id="takeaction-sidebar-thisPage-actions"
class="takeaction-results" flex="1" />
</tabpanel>
Modified: trunk/implementation/src/install.rdf
===================================================================
--- trunk/implementation/src/install.rdf 2009-04-05 16:21:32 UTC (rev 46)
+++ trunk/implementation/src/install.rdf 2009-09-08 16:34:51 UTC (rev 47)
@@ -23,7 +23,7 @@
<em:id>{74402389-E0EE-4252-8C6A-7DA54D7F21F4}</em:id>
<em:name>Take Action</em:name>
<em:description>Social Actions in your browser!</em:description>
- <em:version>1.0</em:version>
+ <em:version>1.1</em:version>
<em:creator>Jose Enrique Bolaños & Jorge Villalobos</em:creator>
<em:developer>Jose Enrique Bolaños</em:developer>
<em:developer>Jorge Villalobos</em:developer>
@@ -37,7 +37,7 @@
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
<em:minVersion>3.0</em:minVersion>
- <em:maxVersion>3.5b4pre</em:maxVersion>
+ <em:maxVersion>3.5.*</em:maxVersion>
</Description>
</em:targetApplication>
Added: trunk/implementation/src/resources/taKeywordExtractor.js
===================================================================
--- trunk/implementation/src/resources/taKeywordExtractor.js (rev 0)
+++ trunk/implementation/src/resources/taKeywordExtractor.js 2009-09-08 16:34:51 UTC (rev 47)
@@ -0,0 +1,407 @@
+/* SocialUnderstanding Page Interpreter
+ * Copyright 2008 Social Actions (email : pe...@so...)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ *
+ * @author Social Actions <peter[at]socialactions[dot]com>
+ * @author E. Cooper <smirkingsisyphus[at]gmail[dot]com>
+ * @copyright 2008 Social Actions
+ * @license http://www.gnu.org/licenses/gpl-3.0.html
+ * @link http://www.socialactions.com/labs/wordpress-donorschoose-plugin
+ *
+ */
+
+var EXPORTED_SYMBOLS = [];
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Ce = Components.Exception;
+
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+Components.utils.import("resource://takeaction/taCommon.js");
+
+/**
+ * Keyword Extractor object. Extracts relevant keywords from an HTML document.
+ */
+TakeAction.KeywordExtractor = function(aDocument) {
+ this.doc = aDocument;
+
+ this.addIgnore(
+ "\", ”, ″, ', count, action, round, september, member, peter, deitz, " +
+ "address, posted, friend, favorite, person, email, views, remove, mdash, " +
+ "src, var, minewidget, ct, week, posted, copy, data, 4data, expr, " +
+ "moneybox, document, write, hubspot, html, apache, any, page, google, " +
+ "feed, test, download, readt. a, company, del, ic, ous, raquo, begin, " +
+ "unit, sphere, user, companies, event, pdt, site, product, about, edit, " +
+ "reply, service, http, www, url, px, address, link, wikipedia, demand, " +
+ "dark, discussion, admin, log, rss, agree, work, push, recognize, " +
+ "should, professional, shift, above, across, after, afterwards, again, " +
+ "against, all, almost, alone, along, already, also, although, always, " +
+ "am, among, amongst, amoungst, amount, an, and, another, any, anyhow, " +
+ "anyone, anything, anyway, anywhere, are, around, as, at, back, be, " +
+ "became, because, become, becomes, becoming, been, before, beforehand, " +
+ "behind, being, below, beside, besides, between, beyond, bill, both, " +
+ "bottom, but, by, call, can, cannot, cant, co, computer, con, could, " +
+ "couldnt, cry, de, describe, detail, do, done, down, due, during, each, " +
+ "eg, eight, either, eleven, else, elsewhere, empty, enough, etc, even, " +
+ "ever, every, everyone, everything, everywhere, except, few, fifteen, " +
+ "fify, fill, find, fire, first, five, for, former, formerly, forty, " +
+ "found, four, from, front, full, further, get, give, go, had, has, " +
+ "hasnt, have, he, hence, her, here, hereafter, hereby, herein, hereupon, " +
+ "hers, herself, him, himself, his, how, however, hundred, i, ie, if, in, " +
+ "inc, indeed, interest, into, is, it, its, itself, keep, last, latter, " +
+ "latterly, least, less, ltd, made, many, may, me, meanwhile, might, " +
+ "mill, mine, more, moreover, most, mostly, move, much, must, my, " +
+ "myself, name, namely, neither, never, nevertheless, next, nine, no, " +
+ "nobody, none, noone, nor, not, nothing, now, nowhere, of, off, often, " +
+ "on, once, one, only, onto, or, other, others, otherwise, our, ours, " +
+ "ourselves, out, over, own, part, per, perhaps, please, put, rather, " +
+ "re, same, see, seem, seemed, seeming, seems, serious, several, she, " +
+ "should, show, side, since, sincere, six, sixty, so, some, somehow, " +
+ "someone, something, sometime, sometimes, somewhere, still, such, " +
+ "system, take, ten, than, that, the, their, them, themselves, then, " +
+ "thence, there, thereafter, thereby, therefore, therein, thereupon, " +
+ "these, they, thick, thin, third, this, those, though, three, through, " +
+ "throughout, thru, thus, to, together, too, top, toward, towards, " +
+ "twelve, twenty, two, un, under, until, up, upon, us, very, via, was, " +
+ "we, well, were, what, whatever, when, whence, whenever, where, " +
+ "whereafter, whereas, whereby, wherein, whereupon, wherever, whether, " +
+ "which, while, whither, who, whoever, whole, whom, whose, why, will, " +
+ "with, within, without, would, yet, you, your, yours, yourself, " +
+ "yourselves, post, social, don’t, sort, able, page, am, pm, comment, " +
+ "comments, students, classroom, projects, challenge, children, shop, " +
+ "speak, it's, education, its, ning, session, message, conference, own, " +
+ "flat, face, district, build, net, com, org, ms, miss, mr, sir, north, " +
+ "south, said, loss, give, , his, people, always, ever, —, -, vs, " +
+ "nor, %, percent, poll, illicit, add, ad, oh, must, like, liking, liked, " +
+ "trying, never, i’ve, learning, i, information, comment, before, more, " +
+ "less, thanks, before, night, day, monday, tuesday, thursday, friday, " +
+ "saturday, sunday, april, may, june, july, december, january, november, " +
+ "august, current, wordpress, wp, key, a, an, the, and, of, i, to, is, " +
+ "in, with, for, as, that, on, at, this, my, was, our, it, you, we, 1, 2, " +
+ "3, 4, 5, 6, 7, 8, 9, 0, 10, about, after, all, almost, along, also, " +
+ "amp, another, any, are, area, around, available, back, be, because, " +
+ "been, being, best, better, big, bit, both, but, by, c, came, can, " +
+ "capable, control, could, course, d, dan, day, decided, did, didn, " +
+ "different, div, do, doesn, don, down, drive, e, each, easily, easy, " +
+ "edition, end, enough, even, every, example, few, find, first, found, " +
+ "from, get, go, going, good, got, gt, had, hard, has, have, he, her, " +
+ "here, how, if, into, isn, just, know, last, left, li, like, little, " +
+ "ll, long, look, lot, lt, m, made, make, many, mb, me, menu, might, mm, " +
+ "more, most, much, name, nbsp, need, new, no, not, now, number, off, " +
+ "old, one, only, or, original, other, out, over, part, place, point, " +
+ "pretty, probably, problem, put, quite, quot, r, re, really, results, " +
+ "right, s, same, saw, see, set, several, she, sherree, should, since, " +
+ "size, small, so, some, something, special, still, stuff, such, sure, " +
+ "system, t, take, than, their, them, then, there, these, they, thing, " +
+ "things, think, those, though, through, time, today, together, too, " +
+ "took, two, up, us, use, used, using, ve, very, want, way, well, went, " +
+ "were, what, when, where, which, while, white, who, will, would, your");
+
+ try {
+ this.addKeywords(
+ this.doc.getElementsByTagName("body")[0].innerHTML, 1);
+ } catch (ex) {
+ }
+};
+
+/**
+ * Keyword extractor object methods.
+ */
+TakeAction.KeywordExtractor.prototype = {
+
+ keywords : {},
+ keywordsSorted : [],
+ ignore : {},
+ hot : {},
+ hotWt : 1,
+
+ keywordMap : [
+ {
+ name: 'links',
+ tag: ['a'],
+ //class: [],
+ //id: [],
+ value: ['innerHTML'],
+ weight: 1.2
+ },
+ /* title: {
+ tag: ['title'],
+ class: [],
+ id: [],
+ value: ['innerHTML'],
+ weight: 1.1,
+ },*/
+ {
+ name: 'bold',
+ tag: ['b', 'strong', 'h1', 'h2', 'h3'],
+ //class: [],
+ //id: [],
+ value: ['innerHTML'],
+ weight: 1.3
+ },
+ {
+ name: 'img',
+ tag: ['img'],
+ //class: [],
+ //id: [],
+ value: ['alt'],
+ weight: 1.1
+ }
+ ],
+
+ ignoreTags : {
+ tag: { script: 1, style: 1, meta: 1, object: 1, param: 1, embed: 1, link: 1, form: 1 },
+ id: [ /ads/i, /comment/i, /advert/i, /sphere/i ]
+ },
+
+ addIgnore : function (list) {
+ this.ignore = this._makeWordArray(list);
+ },
+
+ /*
+ * Adds keywords to current pool from a given chunk of text. Can optionally give section name.
+ * @param text a string of text to extract keywords from.
+ * @returns bool
+ */
+ addKeywords : function(text, wt, section) {
+ if (!section)
+ section = 'default';
+
+ textNode = this.doc.createElement('div');
+ textNode.innerHTML = text;
+
+ delete text;
+
+ textNode = this._killScript( textNode, this.ignoreTags );
+
+ this.keywords[section] = [];
+
+ for ( var x in this.keywordMap ) {
+ if ( this.keywordMap[x].tag.length >= 1 || this.keywordMap[x].value.length >= 1 ) {
+ var name = this.keywordMap[x].name;
+ for ( var i in this.keywordMap[x].tag ) {
+ var nodes = textNode.getElementsByTagName( this.keywordMap[x].tag[i] );
+ if ( nodes && nodes.length >= 1 ) {
+ for ( var z in nodes ) {
+ if ( nodes.length < 1 || z > 1000 )
+ break;
+ if ( !this.keywords[section][name] )
+ this.keywords[section][name] = [];
+ for ( var y in this.keywordMap[x].value ) {
+ var attr = this.keywordMap[x].value[y];
+ var tmpStr = '';
+ if ( this.keywordMap[x].value[y] == "innerHTML" ) {
+ var tmpStr = nodes[0].innerHTML;
+ } else {
+ var tmpStr = nodes[0].getAttribute( attr );
+ }
+ var tmpWt = this.keywordMap[x].weight;
+ if ( tmpStr ) {
+ tmpStr = tmpStr.replace(/&(lt|gt);/g, function (strMatch, p1){ return (p1 == "lt")? "<" : ">"; });
+ tmpStr = tmpStr.replace( /<[\/\!]*?[^<>]*?>/gi, "");
+ tmpWt = tmpWt * wt;
+ if ( !this.keywords[section][name] )
+ this.keywords[section][name] = [];
+ this.keywords[section][name] = this._updateKeywords( this.keywords[section][name], tmpStr, tmpWt );
+ }
+ }
+
+ nodes[0].parentNode.removeChild( nodes[0] );
+ }
+ }
+ }
+ }
+ }
+ if ( !this.keywords[section]['default'] )
+ this.keywords[section]['default'] = [];
+
+ var tmpStr = textNode.innerHTML;
+ tmpStr = tmpStr.replace(/&(lt|gt);/g, function (strMatch, p1){ return (p1 == "lt")? "<" : ">"; });
+ tmpStr = tmpStr.replace( /<[\/\!]*?[^<>]*?>/gi, "");
+ tmpStr = tmpStr.replace( /<[^>]+>/g, "");
+
+ this.keywords[section]['default'] = this._updateKeywords( this.keywords[section]['default'], tmpStr, wt );
+ },
+
+ makeList : function (delim, limit, section) {
+ delim = delim || ", ";
+ limit = limit || 1;
+ section = section || 'default';
+
+ this._sortKeywords( section );
+
+ var i = 1;
+ var list = '';
+ var keywords = this.keywordsSorted;
+
+ list = keywords.splice( 0, (limit--) ).join( delim );
+
+ return list;
+ },
+
+ _updateKeywords : function (keywords, str, wt) {
+ str = this._trim( str.toLowerCase() );
+ var words = str.split( /\s*[\s+\.|\?|,|\[|\]|\!|(|)|\-+|\"|\'|\"|=|;|×|»|\$|\/|:|{|}]\s*/i );
+ var ignore = this.ignore;
+ var hot = this.hot;
+ var hotWt = this.hotWt;
+ chkWords:
+ for ( var x in words ) {
+ var tmpHotWt = 0;
+ var word = words[x];
+ var sWord = word.replace(/^(.+)(d|ed|ly|s|es|ing)$/gi, "$1");
+
+ if ( ignore[word] || word == "" || word.length <= 3 || word.match(/^([0-9])+$/) || word.match( /[^a-z0-9]/) || ignore[sWord] )
+ continue chkWords;
+
+ if ( hot[word] || hot[sWord] )
+ tmpHotWt = hotWt;
+
+ if ( this._isSuffixed( word ) ) {
+ if ( keywords[word.replace( /(.+)(e?s)/, "$1")] ) {
+ word = word.replace( /(.+)(e?s)/, "$1");
+ }
+ } else {
+ if ( keywords[word + "s"] ) {
+ word = word + "s";
+ }
+ }
+
+ if ( keywords[word] ) {
+ keywords[word] += ( 1 * (wt + tmpHotWt ) );
+ } else {
+ keywords[word] = ( 1 * ( wt + tmpHotWt ) );
+ }
+ }
+
+ return keywords;
+ },
+
+ _sortKeywords : function(section) {
+ var keywords = this.keywords
+ var kSorted = [];
+ var unSorted = [];
+ var fArr = [];
+
+ if ( !keywords[section] )
+ section = 'default';
+
+ for ( var i in keywords[section] ) {
+ var subSection = keywords[section][i];
+ for ( var k in subSection ) {
+ var word = k;
+ if ( this._isSuffixed( word ) ) {
+ if ( unSorted[word.replace( /(.+)(e?s)/, "$1")] ) {
+ word = word.replace( /(.+)(e?s)/, "$1");
+ }
+ }
+
+ if ( unSorted[word] ) {
+ unSorted[word] += subSection[k];
+ } else {
+ unSorted[word] = subSection[k];
+ }
+ }
+ }
+
+ for ( var i in unSorted ) {
+ fArr.unshift( unSorted[i] );
+ }
+
+ fArr.sort( function(a,b){return b - a} );
+
+ sortedWords:
+ for ( var i in fArr ) {
+ for ( var k in unSorted ) {
+ if ( unSorted[k] == fArr[i] ) {
+ kSorted.push(k);
+ delete unSorted[k];
+ continue sortedWords;
+ }
+ }
+ }
+
+ this.keywordsSorted = kSorted;
+
+ return true;
+ },
+
+ _makeWordArray : function(list) {
+ ///if ( !list instanceof Array )
+ list = list.toLowerCase().split(", ");
+
+ var ignore = {};
+
+ for (var i in list ) {
+ ignore[list[i]] = 1;
+ }
+
+ return ignore;
+ },
+
+ _makeValidWt : function (wt) {
+ if ( !wt ) {
+ return 1;
+ } else {
+ if ( wt < 0 ) {
+ wt *= -1;
+ return wt;
+ } else if ( wt >= 5 ) {
+ wt = 5;
+ return wt;
+ }
+ }
+
+ return wt;
+ },
+
+ _isSuffixed : function (word) {
+ if ( !word.match( /(.+)(e?)s$/i ) )
+ return false;
+
+ return true;
+ },
+
+ _trim : function (str) {
+ str = str.replace(/^\s\s*/, '');
+ var ws = /\s/;
+ var i = str.length;
+ while (ws.test(str.charAt(--i)));
+ return str.slice(0, i + 1);
+ },
+
+ _killScript : function(node, tags) {
+ var e = node.getElementsByTagName("*");
+
+ for ( var i in e ) {
+ if ( e[i] ) {
+ if ( e[i].tagName && tags.tag[e[i].tagName.toLowerCase()] ) {
+ e[i].parentNode.removeChild(e[i]);
+ } else {
+ for ( var t in tags.id ) {
+ if ( e[i].id && e[i].id.match(tags.id[t]) ) {
+ e[i].parentNode.removeChild(e[i]);
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ return node;
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jor...@us...> - 2009-04-05 16:21:34
|
Revision: 46
http://take-action.svn.sourceforge.net/take-action/?rev=46&view=rev
Author: jorgevillalobos
Date: 2009-04-05 16:21:32 +0000 (Sun, 05 Apr 2009)
Log Message:
-----------
Site update. Added a feedback section encouraging people to vote and review our add-on.
Modified Paths:
--------------
trunk/site/build/index.html
trunk/site/build/skin/skin.css
trunk/site/index.html
trunk/site/skin/skin.css
Modified: trunk/site/build/index.html
===================================================================
--- trunk/site/build/index.html 2009-04-03 18:18:59 UTC (rev 45)
+++ trunk/site/build/index.html 2009-04-05 16:21:32 UTC (rev 46)
@@ -113,6 +113,16 @@
</tr>
</table>
+ <p class="feedback">
+ Did you like it? Please vote for our submission at the
+ <a href="http://netsquared.org/projects/take-action">Change
+ the Web Challenge site.</a> You can also help us by adding a
+ review in the
+ <a href="https://addons.mozilla.org/en-US/firefox/addon/11330">
+ Take Action add-on page.</a>
+ Thanks!
+ </p>
+
<p align="center">
<a href="http://www.socialactions.com/changetheweb"
alt="Change the Web Challenge" title="Change the Web Challenge">
Modified: trunk/site/build/skin/skin.css
===================================================================
--- trunk/site/build/skin/skin.css 2009-04-03 18:18:59 UTC (rev 45)
+++ trunk/site/build/skin/skin.css 2009-04-05 16:21:32 UTC (rev 46)
@@ -110,3 +110,8 @@
.link:hover {
cursor: pointer;
}
+
+.feedback {
+ font-size: 0.9em;
+ margin: 0.8em;
+}
Modified: trunk/site/index.html
===================================================================
--- trunk/site/index.html 2009-04-03 18:18:59 UTC (rev 45)
+++ trunk/site/index.html 2009-04-05 16:21:32 UTC (rev 46)
@@ -113,6 +113,16 @@
</tr>
</table>
+ <p class="feedback">
+ Did you like it? Please vote for our submission at the
+ <a href="http://netsquared.org/projects/take-action">Change
+ the Web Challenge site.</a> You can also help us by adding a
+ review in the
+ <a href="https://addons.mozilla.org/en-US/firefox/addon/11330">
+ Take Action add-on page.</a>
+ Thanks!
+ </p>
+
<p align="center">
<a href="http://www.socialactions.com/changetheweb"
alt="Change the Web Challenge" title="Change the Web Challenge">
Modified: trunk/site/skin/skin.css
===================================================================
--- trunk/site/skin/skin.css 2009-04-03 18:18:59 UTC (rev 45)
+++ trunk/site/skin/skin.css 2009-04-05 16:21:32 UTC (rev 46)
@@ -110,3 +110,8 @@
.link:hover {
cursor: pointer;
}
+
+.feedback {
+ font-size: 0.9em;
+ margin: 0.8em;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jor...@us...> - 2009-04-03 18:19:14
|
Revision: 45
http://take-action.svn.sourceforge.net/take-action/?rev=45&view=rev
Author: jorgevillalobos
Date: 2009-04-03 18:18:59 +0000 (Fri, 03 Apr 2009)
Log Message:
-----------
Minor site update.
Modified Paths:
--------------
trunk/site/build/skin/skin.css
trunk/site/skin/skin.css
Modified: trunk/site/build/skin/skin.css
===================================================================
--- trunk/site/build/skin/skin.css 2009-04-03 18:15:33 UTC (rev 44)
+++ trunk/site/build/skin/skin.css 2009-04-03 18:18:59 UTC (rev 45)
@@ -20,9 +20,9 @@
}
.corner {
- width: 25px;
- height: 25px;
- background-color: none !important;
+ width: 24px;
+ height: 24px;
+ background-color: transparent;
}
#main {
@@ -83,7 +83,7 @@
.box .boxCorner {
width: 21px;
height: 21px;
- background-color: none !important;
+ background-color: transparent;
}
.box .topLeft {
@@ -109,4 +109,4 @@
.link:hover {
cursor: pointer;
-}
\ No newline at end of file
+}
Modified: trunk/site/skin/skin.css
===================================================================
--- trunk/site/skin/skin.css 2009-04-03 18:15:33 UTC (rev 44)
+++ trunk/site/skin/skin.css 2009-04-03 18:18:59 UTC (rev 45)
@@ -20,9 +20,9 @@
}
.corner {
- width: 25px;
- height: 25px;
- background-color: none !important;
+ width: 24px;
+ height: 24px;
+ background-color: transparent;
}
#main {
@@ -83,7 +83,7 @@
.box .boxCorner {
width: 21px;
height: 21px;
- background-color: none !important;
+ background-color: transparent;
}
.box .topLeft {
@@ -109,4 +109,4 @@
.link:hover {
cursor: pointer;
-}
\ No newline at end of file
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jor...@us...> - 2009-04-03 18:15:43
|
Revision: 44
http://take-action.svn.sourceforge.net/take-action/?rev=44&view=rev
Author: jorgevillalobos
Date: 2009-04-03 18:15:33 +0000 (Fri, 03 Apr 2009)
Log Message:
-----------
Added site build system and updated some of it.
Modified Paths:
--------------
trunk/site/index.html
Added Paths:
-----------
trunk/site/Makefile
trunk/site/Site.kpf
trunk/site/build/
trunk/site/build/index.html
trunk/site/build/skin/
trunk/site/build/skin/box-bottom-left.gif
trunk/site/build/skin/box-bottom-right.gif
trunk/site/build/skin/box-top-left.gif
trunk/site/build/skin/box-top-right.gif
trunk/site/build/skin/footer-bottom-left.gif
trunk/site/build/skin/footer-bottom-right.gif
trunk/site/build/skin/header-bottom-left.gif
trunk/site/build/skin/header-bottom-right.gif
trunk/site/build/skin/header-top-left.gif
trunk/site/build/skin/header-top-right.gif
trunk/site/build/skin/logo.png
trunk/site/build/skin/logo32.png
trunk/site/build/skin/skin.css
Added: trunk/site/Makefile
===================================================================
--- trunk/site/Makefile (rev 0)
+++ trunk/site/Makefile 2009-04-03 18:15:33 UTC (rev 44)
@@ -0,0 +1,62 @@
+###
+# Copyright 2009 Jose Enrique Bolanos, Jorge Villalobos
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+###
+
+build_dir := build
+
+source_files := $(wildcard *.html) \
+ $(wildcard *.js) \
+ $(wildcard *.ico) \
+ $(filter-out $(build_dir)/%,$(wildcard */*.html)) \
+ $(filter-out $(build_dir)/%,$(wildcard */*.js)) \
+ $(wildcard skin/*.css) \
+ $(wildcard skin/*.jpg) \
+ $(wildcard skin/*.png) \
+ $(wildcard skin/*.gif)
+
+target_files := $(addprefix $(build_dir)/,$(source_files))
+
+# This copies all files to the server.
+.PHONY: all
+all: session $(target_files)
+ @echo
+ @echo "Files uploaded successfully."
+
+# This cleans all temporary files and directories created by 'make'.
+.PHONY: clean
+clean:
+ @rm -rf $(build_dir)/*
+ @echo "Cleanup is done."
+
+.PHONY: session
+session:
+ @echo "Creating session."
+ @ssh-add $(TAKEACTION_KEY)
+ @echo "Session created successfully."
+
+# XXX: the remote folder creation part only works with one level of
+# sub-directories
+$(build_dir)/%: %
+ @echo "Uploading $<"
+ @scp -B $< $(TAKEACTION_USER),tak...@we...:/home/groups/t/ta/take-action/htdocs/$(dir $<)
+ @cp -Rf $< $@
+
+# TODO: This used to work, but now ssh is completely disabled. We need to find
+# a way to do it with the current system.
+# @if [ ! -x $(dir $@) ]; \
+# then \
+ # ssh -i $(TAKEACTION_KEY) $(TAKEACTION_USER),fi...@we... "mkdir /home/groups/t/ta/take-action/htdocs/$(dir $<)"; \
+# mkdir -p $(dir $@); \
+# fi
Property changes on: trunk/site/Makefile
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/site/Site.kpf
===================================================================
--- trunk/site/Site.kpf (rev 0)
+++ trunk/site/Site.kpf 2009-04-03 18:15:33 UTC (rev 44)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Komodo Project File - DO NOT EDIT -->
+<project id="5f803254-3833-b14d-8c42-e8f54bffaabe" kpf_version="4" name="Site.kpf">
+<preference-set idref="5f803254-3833-b14d-8c42-e8f54bffaabe">
+ <boolean id="import_live">1</boolean>
+</preference-set>
+</project>
Added: trunk/site/build/index.html
===================================================================
--- trunk/site/build/index.html (rev 0)
+++ trunk/site/build/index.html 2009-04-03 18:15:33 UTC (rev 44)
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+ <meta name="description"
+ content="Take Action Firefox Extension - Social Actions in your browser!" />
+ <meta name="keywords"
+ content="Take Action, Social Actions, Mozilla, Firefox, Extension, Add-ons, Addons, Open Source" />
+ <!-- <link rel="shortcut icon" type="image/x-icon" href="favicon.ico" /> -->
+ <link rel="stylesheet" type="text/css" href="skin/skin.css" />
+ <title>Take Action - Social Actions in your browser!</title>
+ </head>
+ <body>
+
+ <table id="main" align="center" cellpadding="0" cellspacing="0">
+ <tr class="header">
+ <td class="corner headerTopLeft"/>
+ <td/>
+ <td class="corner headerTopRight"/>
+ </tr>
+ <tr class="header">
+ <td/>
+ <td id="logo"/>
+ <td/>
+ </tr>
+ <tr class="header">
+ <td class="corner headerBottomLeft"/>
+ <td/>
+ <td class="corner headerBottomRight"/>
+ </tr>
+ <tr class="contentArea">
+ <td/>
+ <td>
+
+ <table>
+ <tr>
+ <td width="90%">
+
+ <p><strong><a href="link a AMO">Take Action</a></strong>
+ is a <a href="http://www.firefox.com">Firefox</a> add-on that takes
+ advantage of the open
+ <strong><a href="http://www.socialactions.com">Social Actions</a></strong>
+ database, giving you access to thousands of ways in which you can make
+ a real difference in the world.</p>
+
+ <p>Take Action was created to participate in the
+ <a href="http://www.socialactions.com/changetheweb">Change the Web
+ Challenge.</a>
+ The purpose of the competition is find new, innovative
+ ways to bring social actions closer to those interested in helping.
+ </p>
+
+ <p>With the Take Action add-on you'll get:</p>
+ <ul>
+ <li>
+ A new toolbar button which will let you know if the topics of the
+ sites you're visiting are related to current social actions.
+ </li>
+ <li>
+ A new sidebar that will show you the actions associated with the
+ site you're seeing, the most recent actions, and the option to
+ freely search the Social Actions database.
+ </li>
+ <li>
+ You'll be a few clicks away from making a real difference, all the
+ time!
+ </li>
+ <li>
+ Completely free, open-source, no strings attached software.
+ </li>
+ </ul>
+
+ <p>The Take Action add-on is a top quality product, brought to you by
+ developers Jose Enrique Bolaños and Jorge Villalobos. This is
+ the same team who created the very popular
+ <a href="http://firefm.sourceforge.net" target="_blank">Fire.fm add-on,</a>
+ winner of the Best Music Add-on category in the Extend Firefox
+ competition.<p>
+
+ <p>If you're interested in giving something back to the world, like
+ us, give Take Action a spin. We hope you like it!</p>
+
+ </td>
+ <td width="10%">
+ <br>
+
+ <table class="box link" align="right" cellpadding="0" cellspacing="0"
+ onclick="window.location='https://addons.mozilla.org/en-US/firefox/downloads/file/50267/take_action-1.0-fx.xpi'">
+ <tr>
+ <td class="boxCorner topLeft"/>
+ <td/>
+ <td class="boxCorner topRight"/>
+ </tr>
+ <tr>
+ <td/>
+ <td>
+
+ <strong>Install Take Action</strong><br>
+ <div class="details">
+ <img src="skin/logo32.png" style="float:left; padding-right: 5px;">
+ Version 1.0 for Firefox 3.0 and above.
+ </div>
+
+ </td>
+ <td/>
+ </tr>
+ <tr>
+ <td class="boxCorner bottomLeft"/>
+ <td/>
+ <td class="boxCorner bottomRight"/>
+ </tr>
+ </table>
+
+ <p align="center">
+ <a href="http://www.socialactions.com/changetheweb"
+ alt="Change the Web Challenge" title="Change the Web Challenge">
+ <img src="http://www.socialactions.com/images/change-the-web-challenge-logo-sm.gif" style="border: none">
+ </a>
+ </p>
+
+ </td>
+ </tr>
+ </table>
+
+ </td>
+ <td/>
+ </tr>
+ <tr class="footer">
+ <td class="corner footerBottomLeft"/>
+ <td/>
+ <td class="corner footerBottomRight"/>
+ </tr>
+ </table>
+
+ </body>
+</html>
Added: trunk/site/build/skin/box-bottom-left.gif
===================================================================
(Binary files differ)
Property changes on: trunk/site/build/skin/box-bottom-left.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/site/build/skin/box-bottom-right.gif
===================================================================
(Binary files differ)
Property changes on: trunk/site/build/skin/box-bottom-right.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/site/build/skin/box-top-left.gif
===================================================================
(Binary files differ)
Property changes on: trunk/site/build/skin/box-top-left.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/site/build/skin/box-top-right.gif
===================================================================
(Binary files differ)
Property changes on: trunk/site/build/skin/box-top-right.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/site/build/skin/footer-bottom-left.gif
===================================================================
(Binary files differ)
Property changes on: trunk/site/build/skin/footer-bottom-left.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/site/build/skin/footer-bottom-right.gif
===================================================================
(Binary files differ)
Property changes on: trunk/site/build/skin/footer-bottom-right.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/site/build/skin/header-bottom-left.gif
===================================================================
(Binary files differ)
Property changes on: trunk/site/build/skin/header-bottom-left.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/site/build/skin/header-bottom-right.gif
===================================================================
(Binary files differ)
Property changes on: trunk/site/build/skin/header-bottom-right.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/site/build/skin/header-top-left.gif
===================================================================
(Binary files differ)
Property changes on: trunk/site/build/skin/header-top-left.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/site/build/skin/header-top-right.gif
===================================================================
(Binary files differ)
Property changes on: trunk/site/build/skin/header-top-right.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/site/build/skin/logo.png
===================================================================
(Binary files differ)
Property changes on: trunk/site/build/skin/logo.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/site/build/skin/logo32.png
===================================================================
(Binary files differ)
Property changes on: trunk/site/build/skin/logo32.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/site/build/skin/skin.css
===================================================================
--- trunk/site/build/skin/skin.css (rev 0)
+++ trunk/site/build/skin/skin.css 2009-04-03 18:15:33 UTC (rev 44)
@@ -0,0 +1,112 @@
+
+body {
+ background-color: #4D8A00;
+ padding-top: 10px;
+ padding-bottom: 10px;
+ font-family: Georgia, sans-serif;
+ color: #333333;
+}
+
+td {
+ vertical-align: top;
+}
+
+a {
+ color: #4D8A00;
+ text-decoration: none;
+}
+a:hover {
+ text-decoration: underline;
+}
+
+.corner {
+ width: 25px;
+ height: 25px;
+ background-color: none !important;
+}
+
+#main {
+ width: 650px;
+}
+
+.header {
+ background-color: #ABEF38;
+}
+
+.footer {
+ background-color: #FFFFFF;
+}
+
+#logo {
+ background: #ABEF38 url("logo.png") no-repeat;
+ width: 565px;
+ height: 123px;
+}
+
+.contentArea {
+ min-height: 400px;
+ background-color: #FFFFFF;
+}
+
+.headerTopLeft {
+ background: url("header-top-left.gif") no-repeat;
+}
+
+.headerTopRight {
+ background: url("header-top-right.gif") no-repeat;
+}
+
+.headerBottomLeft {
+ background: url("header-bottom-left.gif") no-repeat;
+}
+
+.headerBottomRight {
+ background: url("header-bottom-right.gif") no-repeat;
+}
+
+.footerBottomLeft {
+ background: url("footer-bottom-left.gif") no-repeat;
+}
+
+.footerBottomRight {
+ background: url("footer-bottom-right.gif") no-repeat;
+}
+
+.box {
+ width: 210px;
+}
+
+.box td {
+ background-color: #ABEF38;
+}
+
+.box .boxCorner {
+ width: 21px;
+ height: 21px;
+ background-color: none !important;
+}
+
+.box .topLeft {
+ background: url("box-top-left.gif") no-repeat;
+}
+
+.box .topRight {
+ background: url("box-top-right.gif") no-repeat;
+}
+
+.box .bottomLeft {
+ background: url("box-bottom-left.gif") no-repeat;
+}
+
+.box .bottomRight {
+ background: url("box-bottom-right.gif") no-repeat;
+}
+
+.box .details {
+ font-size: 0.8em;
+ vertical-align: center;
+}
+
+.link:hover {
+ cursor: pointer;
+}
\ No newline at end of file
Modified: trunk/site/index.html
===================================================================
--- trunk/site/index.html 2009-04-03 17:22:45 UTC (rev 43)
+++ trunk/site/index.html 2009-04-03 18:15:33 UTC (rev 44)
@@ -87,7 +87,7 @@
<br>
<table class="box link" align="right" cellpadding="0" cellspacing="0"
- onclick="alert('download the xpi')">
+ onclick="window.location='https://addons.mozilla.org/en-US/firefox/downloads/file/50267/take_action-1.0-fx.xpi'">
<tr>
<td class="boxCorner topLeft"/>
<td/>
@@ -100,8 +100,8 @@
<strong>Install Take Action</strong><br>
<div class="details">
<img src="skin/logo32.png" style="float:left; padding-right: 5px;">
- Version 1.0 for Firefox 3 or above
- </div>
+ Version 1.0 for Firefox 3.0 and above.
+ </div>
</td>
<td/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jor...@us...> - 2009-04-03 17:22:51
|
Revision: 43
http://take-action.svn.sourceforge.net/take-action/?rev=43&view=rev
Author: jorgevillalobos
Date: 2009-04-03 17:22:45 +0000 (Fri, 03 Apr 2009)
Log Message:
-----------
Minor fix in version range in install.rdf
Modified Paths:
--------------
trunk/implementation/src/install.rdf
Modified: trunk/implementation/src/install.rdf
===================================================================
--- trunk/implementation/src/install.rdf 2009-04-03 16:59:04 UTC (rev 42)
+++ trunk/implementation/src/install.rdf 2009-04-03 17:22:45 UTC (rev 43)
@@ -37,7 +37,7 @@
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
<em:minVersion>3.0</em:minVersion>
- <em:maxVersion>3.1b4pre</em:maxVersion>
+ <em:maxVersion>3.5b4pre</em:maxVersion>
</Description>
</em:targetApplication>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jen...@us...> - 2009-04-03 16:59:09
|
Revision: 42
http://take-action.svn.sourceforge.net/take-action/?rev=42&view=rev
Author: jenrique7
Date: 2009-04-03 16:59:04 +0000 (Fri, 03 Apr 2009)
Log Message:
-----------
Increased the font-size just a bit and flipped the description and site-action type labels.
Modified Paths:
--------------
trunk/implementation/src/chrome/content/taSearchResultBox.xml
trunk/implementation/src/chrome/skin/taSearchResultBox.css
Modified: trunk/implementation/src/chrome/content/taSearchResultBox.xml
===================================================================
--- trunk/implementation/src/chrome/content/taSearchResultBox.xml 2009-04-03 16:57:09 UTC (rev 41)
+++ trunk/implementation/src/chrome/content/taSearchResultBox.xml 2009-04-03 16:59:04 UTC (rev 42)
@@ -37,11 +37,11 @@
<xul:vbox class="outerbox" flex="1" onclick="_openActionPage(event)">
<xul:label class="title" crop="end"
xbl:inherits="value=title,tooltiptext" />
- <xul:description anonid="ta-action-description" class="description" />
<xul:hbox>
<xul:label class="site" xbl:inherits="value=site"/>
<xul:label class="actionType" xbl:inherits="value=actionType" />
</xul:hbox>
+ <xul:description anonid="ta-action-description" class="description" />
</xul:vbox>
</content>
Modified: trunk/implementation/src/chrome/skin/taSearchResultBox.css
===================================================================
--- trunk/implementation/src/chrome/skin/taSearchResultBox.css 2009-04-03 16:57:09 UTC (rev 41)
+++ trunk/implementation/src/chrome/skin/taSearchResultBox.css 2009-04-03 16:59:04 UTC (rev 42)
@@ -14,7 +14,9 @@
* limitations under the License.
**/
-.title,
+.title {
+ margin-left: 0.6em !important;
+}
.site,
.description {
margin-left: 0.7em !important;
@@ -35,14 +37,14 @@
}
.description {
- font-size: 0.8em;
+ font-size: 0.9em;
margin-bottom: 0em;
padding: 0em;
}
.actionType {
color: #008000;
- font-size: 0.7em;
+ font-size: 0.8em;
margin-top: 0em;
}
@@ -50,6 +52,6 @@
font-weight: bold;
color: #000080;
margin-right: 0px !important;
- font-size: 0.7em;
+ font-size: 0.8em;
margin-top: 0em;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jor...@us...> - 2009-04-03 16:57:14
|
Revision: 41
http://take-action.svn.sourceforge.net/take-action/?rev=41&view=rev
Author: jorgevillalobos
Date: 2009-04-03 16:57:09 +0000 (Fri, 03 Apr 2009)
Log Message:
-----------
UI fixes for messages in the sidebar.
Modified Paths:
--------------
trunk/implementation/src/chrome/content/taSidebar.js
trunk/implementation/src/chrome/skin/taSidebar.css
Modified: trunk/implementation/src/chrome/content/taSidebar.js
===================================================================
--- trunk/implementation/src/chrome/content/taSidebar.js 2009-04-03 16:43:30 UTC (rev 40)
+++ trunk/implementation/src/chrome/content/taSidebar.js 2009-04-03 16:57:09 UTC (rev 41)
@@ -173,6 +173,7 @@
this._bundle.getString(
(aIsLoading ? "takeaction.loading.label" :
"takeaction.noActions.label"));
+ let textContainer = document.createElement("hbox");
let description = document.createElement("description");
let textNode = document.createTextNode(message);
@@ -181,7 +182,9 @@
}
description.appendChild(textNode);
- aContainer.appendChild(description);
+ textContainer.setAttribute("class", "takeaction-message-container");
+ textContainer.appendChild(description);
+ aContainer.appendChild(textContainer);
},
/**
Modified: trunk/implementation/src/chrome/skin/taSidebar.css
===================================================================
--- trunk/implementation/src/chrome/skin/taSidebar.css 2009-04-03 16:43:30 UTC (rev 40)
+++ trunk/implementation/src/chrome/skin/taSidebar.css 2009-04-03 16:57:09 UTC (rev 41)
@@ -71,10 +71,13 @@
padding-top: 0.5em;
}
-.takeaction-results > description {
+.takeaction-message-container {
+ -moz-box-pack: center;
-moz-box-flex: 1;
+}
+
+.takeaction-message-container > description {
margin-top: 3em;
- margin-left: 7em;
font-size: 1.3em;
font-weight: bold;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jen...@us...> - 2009-04-03 16:43:36
|
Revision: 40
http://take-action.svn.sourceforge.net/take-action/?rev=40&view=rev
Author: jenrique7
Date: 2009-04-03 16:43:30 +0000 (Fri, 03 Apr 2009)
Log Message:
-----------
Added a box for the Install link.
Modified Paths:
--------------
trunk/site/index.html
trunk/site/skin/skin.css
Added Paths:
-----------
trunk/site/skin/box-bottom-left.gif
trunk/site/skin/box-bottom-right.gif
trunk/site/skin/box-top-left.gif
trunk/site/skin/box-top-right.gif
trunk/site/skin/logo32.png
Modified: trunk/site/index.html
===================================================================
--- trunk/site/index.html 2009-04-03 06:24:24 UTC (rev 39)
+++ trunk/site/index.html 2009-04-03 16:43:30 UTC (rev 40)
@@ -84,14 +84,41 @@
</td>
<td width="10%">
+ <br>
- <strong>Install Take Action</strong><br>
- Caja bonita con link a AMO, con numero de version<br><br>
+ <table class="box link" align="right" cellpadding="0" cellspacing="0"
+ onclick="alert('download the xpi')">
+ <tr>
+ <td class="boxCorner topLeft"/>
+ <td/>
+ <td class="boxCorner topRight"/>
+ </tr>
+ <tr>
+ <td/>
+ <td>
+ <strong>Install Take Action</strong><br>
+ <div class="details">
+ <img src="skin/logo32.png" style="float:left; padding-right: 5px;">
+ Version 1.0 for Firefox 3 or above
+ </div>
+
+ </td>
+ <td/>
+ </tr>
+ <tr>
+ <td class="boxCorner bottomLeft"/>
+ <td/>
+ <td class="boxCorner bottomRight"/>
+ </tr>
+ </table>
+
+ <p align="center">
<a href="http://www.socialactions.com/changetheweb"
alt="Change the Web Challenge" title="Change the Web Challenge">
<img src="http://www.socialactions.com/images/change-the-web-challenge-logo-sm.gif" style="border: none">
</a>
+ </p>
</td>
</tr>
Added: trunk/site/skin/box-bottom-left.gif
===================================================================
(Binary files differ)
Property changes on: trunk/site/skin/box-bottom-left.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/site/skin/box-bottom-right.gif
===================================================================
(Binary files differ)
Property changes on: trunk/site/skin/box-bottom-right.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/site/skin/box-top-left.gif
===================================================================
(Binary files differ)
Property changes on: trunk/site/skin/box-top-left.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/site/skin/box-top-right.gif
===================================================================
(Binary files differ)
Property changes on: trunk/site/skin/box-top-right.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/site/skin/logo32.png
===================================================================
(Binary files differ)
Property changes on: trunk/site/skin/logo32.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/site/skin/skin.css
===================================================================
--- trunk/site/skin/skin.css 2009-04-03 06:24:24 UTC (rev 39)
+++ trunk/site/skin/skin.css 2009-04-03 16:43:30 UTC (rev 40)
@@ -70,4 +70,43 @@
.footerBottomRight {
background: url("footer-bottom-right.gif") no-repeat;
+}
+
+.box {
+ width: 210px;
+}
+
+.box td {
+ background-color: #ABEF38;
+}
+
+.box .boxCorner {
+ width: 21px;
+ height: 21px;
+ background-color: none !important;
+}
+
+.box .topLeft {
+ background: url("box-top-left.gif") no-repeat;
+}
+
+.box .topRight {
+ background: url("box-top-right.gif") no-repeat;
+}
+
+.box .bottomLeft {
+ background: url("box-bottom-left.gif") no-repeat;
+}
+
+.box .bottomRight {
+ background: url("box-bottom-right.gif") no-repeat;
+}
+
+.box .details {
+ font-size: 0.8em;
+ vertical-align: center;
+}
+
+.link:hover {
+ cursor: pointer;
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jor...@us...> - 2009-04-03 06:24:34
|
Revision: 39
http://take-action.svn.sourceforge.net/take-action/?rev=39&view=rev
Author: jorgevillalobos
Date: 2009-04-03 06:24:24 +0000 (Fri, 03 Apr 2009)
Log Message:
-----------
Added some content to the main page.
Modified Paths:
--------------
trunk/site/index.html
Modified: trunk/site/index.html
===================================================================
--- trunk/site/index.html 2009-04-03 05:59:31 UTC (rev 38)
+++ trunk/site/index.html 2009-04-03 06:24:24 UTC (rev 39)
@@ -38,18 +38,50 @@
<tr>
<td width="90%">
- <p>
- <strong><a href="link a AMO">Take Action</a></strong>
- is a add-on for <a href="http://www.mozilla.com">Firefox</a>
- that takes advantage of <strong><a href="http://www.socialactions.com">
- Social Actions</a></strong>.</p>
+ <p><strong><a href="link a AMO">Take Action</a></strong>
+ is a <a href="http://www.firefox.com">Firefox</a> add-on that takes
+ advantage of the open
+ <strong><a href="http://www.socialactions.com">Social Actions</a></strong>
+ database, giving you access to thousands of ways in which you can make
+ a real difference in the world.</p>
- <p>SObre el concurso...</p>
+ <p>Take Action was created to participate in the
+ <a href="http://www.socialactions.com/changetheweb">Change the Web
+ Challenge.</a>
+ The purpose of the competition is find new, innovative
+ ways to bring social actions closer to those interested in helping.
+ </p>
- <p>lista rapida de features</p>
+ <p>With the Take Action add-on you'll get:</p>
+ <ul>
+ <li>
+ A new toolbar button which will let you know if the topics of the
+ sites you're visiting are related to current social actions.
+ </li>
+ <li>
+ A new sidebar that will show you the actions associated with the
+ site you're seeing, the most recent actions, and the option to
+ freely search the Social Actions database.
+ </li>
+ <li>
+ You'll be a few clicks away from making a real difference, all the
+ time!
+ </li>
+ <li>
+ Completely free, open-source, no strings attached software.
+ </li>
+ </ul>
- <p>Nosotros<p>
+ <p>The Take Action add-on is a top quality product, brought to you by
+ developers Jose Enrique Bolaños and Jorge Villalobos. This is
+ the same team who created the very popular
+ <a href="http://firefm.sourceforge.net" target="_blank">Fire.fm add-on,</a>
+ winner of the Best Music Add-on category in the Extend Firefox
+ competition.<p>
+ <p>If you're interested in giving something back to the world, like
+ us, give Take Action a spin. We hope you like it!</p>
+
</td>
<td width="10%">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jen...@us...> - 2009-04-03 05:59:41
|
Revision: 38
http://take-action.svn.sourceforge.net/take-action/?rev=38&view=rev
Author: jenrique7
Date: 2009-04-03 05:59:31 +0000 (Fri, 03 Apr 2009)
Log Message:
-----------
Added first draft of the site, unfinished.
Added Paths:
-----------
trunk/site/
trunk/site/index.html
trunk/site/skin/
trunk/site/skin/footer-bottom-left.gif
trunk/site/skin/footer-bottom-right.gif
trunk/site/skin/header-bottom-left.gif
trunk/site/skin/header-bottom-right.gif
trunk/site/skin/header-top-left.gif
trunk/site/skin/header-top-right.gif
trunk/site/skin/logo.png
trunk/site/skin/skin.css
Added: trunk/site/index.html
===================================================================
--- trunk/site/index.html (rev 0)
+++ trunk/site/index.html 2009-04-03 05:59:31 UTC (rev 38)
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+ <meta name="description"
+ content="Take Action Firefox Extension - Social Actions in your browser!" />
+ <meta name="keywords"
+ content="Take Action, Social Actions, Mozilla, Firefox, Extension, Add-ons, Addons, Open Source" />
+ <!-- <link rel="shortcut icon" type="image/x-icon" href="favicon.ico" /> -->
+ <link rel="stylesheet" type="text/css" href="skin/skin.css" />
+ <title>Take Action - Social Actions in your browser!</title>
+ </head>
+ <body>
+
+ <table id="main" align="center" cellpadding="0" cellspacing="0">
+ <tr class="header">
+ <td class="corner headerTopLeft"/>
+ <td/>
+ <td class="corner headerTopRight"/>
+ </tr>
+ <tr class="header">
+ <td/>
+ <td id="logo"/>
+ <td/>
+ </tr>
+ <tr class="header">
+ <td class="corner headerBottomLeft"/>
+ <td/>
+ <td class="corner headerBottomRight"/>
+ </tr>
+ <tr class="contentArea">
+ <td/>
+ <td>
+
+ <table>
+ <tr>
+ <td width="90%">
+
+ <p>
+ <strong><a href="link a AMO">Take Action</a></strong>
+ is a add-on for <a href="http://www.mozilla.com">Firefox</a>
+ that takes advantage of <strong><a href="http://www.socialactions.com">
+ Social Actions</a></strong>.</p>
+
+ <p>SObre el concurso...</p>
+
+ <p>lista rapida de features</p>
+
+ <p>Nosotros<p>
+
+ </td>
+ <td width="10%">
+
+ <strong>Install Take Action</strong><br>
+ Caja bonita con link a AMO, con numero de version<br><br>
+
+ <a href="http://www.socialactions.com/changetheweb"
+ alt="Change the Web Challenge" title="Change the Web Challenge">
+ <img src="http://www.socialactions.com/images/change-the-web-challenge-logo-sm.gif" style="border: none">
+ </a>
+
+ </td>
+ </tr>
+ </table>
+
+ </td>
+ <td/>
+ </tr>
+ <tr class="footer">
+ <td class="corner footerBottomLeft"/>
+ <td/>
+ <td class="corner footerBottomRight"/>
+ </tr>
+ </table>
+
+ </body>
+</html>
Added: trunk/site/skin/footer-bottom-left.gif
===================================================================
(Binary files differ)
Property changes on: trunk/site/skin/footer-bottom-left.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/site/skin/footer-bottom-right.gif
===================================================================
(Binary files differ)
Property changes on: trunk/site/skin/footer-bottom-right.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/site/skin/header-bottom-left.gif
===================================================================
(Binary files differ)
Property changes on: trunk/site/skin/header-bottom-left.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/site/skin/header-bottom-right.gif
===================================================================
(Binary files differ)
Property changes on: trunk/site/skin/header-bottom-right.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/site/skin/header-top-left.gif
===================================================================
(Binary files differ)
Property changes on: trunk/site/skin/header-top-left.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/site/skin/header-top-right.gif
===================================================================
(Binary files differ)
Property changes on: trunk/site/skin/header-top-right.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/site/skin/logo.png
===================================================================
(Binary files differ)
Property changes on: trunk/site/skin/logo.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/site/skin/skin.css
===================================================================
--- trunk/site/skin/skin.css (rev 0)
+++ trunk/site/skin/skin.css 2009-04-03 05:59:31 UTC (rev 38)
@@ -0,0 +1,73 @@
+
+body {
+ background-color: #4D8A00;
+ padding-top: 10px;
+ padding-bottom: 10px;
+ font-family: Georgia, sans-serif;
+ color: #333333;
+}
+
+td {
+ vertical-align: top;
+}
+
+a {
+ color: #4D8A00;
+ text-decoration: none;
+}
+a:hover {
+ text-decoration: underline;
+}
+
+.corner {
+ width: 25px;
+ height: 25px;
+ background-color: none !important;
+}
+
+#main {
+ width: 650px;
+}
+
+.header {
+ background-color: #ABEF38;
+}
+
+.footer {
+ background-color: #FFFFFF;
+}
+
+#logo {
+ background: #ABEF38 url("logo.png") no-repeat;
+ width: 565px;
+ height: 123px;
+}
+
+.contentArea {
+ min-height: 400px;
+ background-color: #FFFFFF;
+}
+
+.headerTopLeft {
+ background: url("header-top-left.gif") no-repeat;
+}
+
+.headerTopRight {
+ background: url("header-top-right.gif") no-repeat;
+}
+
+.headerBottomLeft {
+ background: url("header-bottom-left.gif") no-repeat;
+}
+
+.headerBottomRight {
+ background: url("header-bottom-right.gif") no-repeat;
+}
+
+.footerBottomLeft {
+ background: url("footer-bottom-left.gif") no-repeat;
+}
+
+.footerBottomRight {
+ background: url("footer-bottom-right.gif") no-repeat;
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jor...@us...> - 2009-04-03 05:35:22
|
Revision: 37
http://take-action.svn.sourceforge.net/take-action/?rev=37&view=rev
Author: jorgevillalobos
Date: 2009-04-03 05:35:13 +0000 (Fri, 03 Apr 2009)
Log Message:
-----------
Some CSS tweaks for windows, and fixed a problem with the search box that made it work only in Firefox 3.1 and above.
Modified Paths:
--------------
trunk/implementation/src/chrome/content/taSidebar.xul
trunk/implementation/src/chrome/skin/taSidebar.css
Modified: trunk/implementation/src/chrome/content/taSidebar.xul
===================================================================
--- trunk/implementation/src/chrome/content/taSidebar.xul 2009-04-03 05:15:40 UTC (rev 36)
+++ trunk/implementation/src/chrome/content/taSidebar.xul 2009-04-03 05:35:13 UTC (rev 37)
@@ -69,8 +69,9 @@
value="&takeaction.search.label;"
accesskey="&takeaction.search.accesskey;"
control="takeaction-search-box" />
- <textbox id="takeaction-search-box" type="search" cocoa-size="small"
- flex="1" oncommand="TakeActionChrome.Sidebar.search(event);" />
+ <textbox id="takeaction-search-box" type="timed" timeout="1000"
+ cocoa-size="small" flex="1"
+ oncommand="TakeActionChrome.Sidebar.search(event);" />
</row>
<row class="takeaction-form-row">
<label value="&takeaction.actionType.label;"
Modified: trunk/implementation/src/chrome/skin/taSidebar.css
===================================================================
--- trunk/implementation/src/chrome/skin/taSidebar.css 2009-04-03 05:15:40 UTC (rev 36)
+++ trunk/implementation/src/chrome/skin/taSidebar.css 2009-04-03 05:35:13 UTC (rev 37)
@@ -28,6 +28,10 @@
tab {
-moz-appearance: none;
-moz-border-radius: 0.6em 0.6em 0em 0em;
+ -moz-border-top-colors: none;
+ -moz-border-left-colors: none;
+ -moz-border-bottom-colors: none;
+ -moz-border-right-colors: none;
font-size: 0.9em;
font-weight: bold;
border: 2px solid #3b6604;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jen...@us...> - 2009-04-03 05:15:50
|
Revision: 36
http://take-action.svn.sourceforge.net/take-action/?rev=36&view=rev
Author: jenrique7
Date: 2009-04-03 05:15:40 +0000 (Fri, 03 Apr 2009)
Log Message:
-----------
Changed the descrption in the install rdf
Modified Paths:
--------------
trunk/implementation/src/install.rdf
Modified: trunk/implementation/src/install.rdf
===================================================================
--- trunk/implementation/src/install.rdf 2009-04-03 05:14:12 UTC (rev 35)
+++ trunk/implementation/src/install.rdf 2009-04-03 05:15:40 UTC (rev 36)
@@ -22,7 +22,7 @@
<Description about="urn:mozilla:install-manifest">
<em:id>{74402389-E0EE-4252-8C6A-7DA54D7F21F4}</em:id>
<em:name>Take Action</em:name>
- <em:description>Social Actions Add-on for Firefox</em:description>
+ <em:description>Social Actions in your browser!</em:description>
<em:version>1.0</em:version>
<em:creator>Jose Enrique Bolaños & Jorge Villalobos</em:creator>
<em:developer>Jose Enrique Bolaños</em:developer>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jor...@us...> - 2009-04-03 05:14:17
|
Revision: 35
http://take-action.svn.sourceforge.net/take-action/?rev=35&view=rev
Author: jorgevillalobos
Date: 2009-04-03 05:14:12 +0000 (Fri, 03 Apr 2009)
Log Message:
-----------
Several UI tweaks to the sidebar.
Modified Paths:
--------------
trunk/implementation/src/chrome/content/taSearchResultBox.xml
trunk/implementation/src/chrome/skin/taSearchResultBox.css
trunk/implementation/src/chrome/skin/taSidebar.css
Modified: trunk/implementation/src/chrome/content/taSearchResultBox.xml
===================================================================
--- trunk/implementation/src/chrome/content/taSearchResultBox.xml 2009-04-03 04:55:37 UTC (rev 34)
+++ trunk/implementation/src/chrome/content/taSearchResultBox.xml 2009-04-03 05:14:12 UTC (rev 35)
@@ -42,10 +42,6 @@
<xul:label class="site" xbl:inherits="value=site"/>
<xul:label class="actionType" xbl:inherits="value=actionType" />
</xul:hbox>
- <!-- XXX: workaround to keep results flexible. -->
- <xul:hbox>
- <xul:spacer flex="1" />
- </xul:hbox>
</xul:vbox>
</content>
Modified: trunk/implementation/src/chrome/skin/taSearchResultBox.css
===================================================================
--- trunk/implementation/src/chrome/skin/taSearchResultBox.css 2009-04-03 04:55:37 UTC (rev 34)
+++ trunk/implementation/src/chrome/skin/taSearchResultBox.css 2009-04-03 05:14:12 UTC (rev 35)
@@ -30,23 +30,26 @@
}
.title {
- font-size: 0.9em;
+ font-size: 1em;
font-weight: bold;
}
.description {
font-size: 0.8em;
+ margin-bottom: 0em;
+ padding: 0em;
}
.actionType {
color: #008000;
- font-size: 0.6em;
+ font-size: 0.7em;
margin-top: 0em;
- margin-bottom: 1px;
}
.site {
font-weight: bold;
color: #000080;
margin-right: 0px !important;
+ font-size: 0.7em;
+ margin-top: 0em;
}
Modified: trunk/implementation/src/chrome/skin/taSidebar.css
===================================================================
--- trunk/implementation/src/chrome/skin/taSidebar.css 2009-04-03 04:55:37 UTC (rev 34)
+++ trunk/implementation/src/chrome/skin/taSidebar.css 2009-04-03 05:14:12 UTC (rev 35)
@@ -14,10 +14,6 @@
* limitations under the License.
**/
-tabpanel * {
- border: red thin solid;
-}
-
#takeaction-tabbox,
tabpanels,
tabpanels > tabpanel {
@@ -71,13 +67,10 @@
padding-top: 0.5em;
}
-.takeaction-results {
- -moz-box-align: center;
-}
-
.takeaction-results > description {
-moz-box-flex: 1;
margin-top: 3em;
+ margin-left: 7em;
font-size: 1.3em;
font-weight: bold;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jor...@us...> - 2009-04-03 04:55:50
|
Revision: 34
http://take-action.svn.sourceforge.net/take-action/?rev=34&view=rev
Author: jorgevillalobos
Date: 2009-04-03 04:55:37 +0000 (Fri, 03 Apr 2009)
Log Message:
-----------
Some layout fixes to the sidebar. Haven't been tested yet.
Modified Paths:
--------------
trunk/implementation/src/chrome/content/taSearchResultBox.xml
trunk/implementation/src/chrome/skin/taSearchResultBox.css
trunk/implementation/src/chrome/skin/taSidebar.css
Modified: trunk/implementation/src/chrome/content/taSearchResultBox.xml
===================================================================
--- trunk/implementation/src/chrome/content/taSearchResultBox.xml 2009-04-03 01:48:54 UTC (rev 33)
+++ trunk/implementation/src/chrome/content/taSearchResultBox.xml 2009-04-03 04:55:37 UTC (rev 34)
@@ -42,6 +42,10 @@
<xul:label class="site" xbl:inherits="value=site"/>
<xul:label class="actionType" xbl:inherits="value=actionType" />
</xul:hbox>
+ <!-- XXX: workaround to keep results flexible. -->
+ <xul:hbox>
+ <xul:spacer flex="1" />
+ </xul:hbox>
</xul:vbox>
</content>
@@ -95,9 +99,14 @@
<body><![CDATA[
let result = this._stripHTMLTags(aString);
+ // remove duplicated spaces.
+ result = result.replace(/\s\s+/g, " ");
+
if (aMaxLength < result.length) {
+ // crop description to maintain the maximum length.
result = result.substring(0, (aMaxLength - 3));
- result = result.replace(/\s+$/, "");
+ // removing the trailing space.
+ result = result.replace(/\s$/, "");
result = result + "...";
}
Modified: trunk/implementation/src/chrome/skin/taSearchResultBox.css
===================================================================
--- trunk/implementation/src/chrome/skin/taSearchResultBox.css 2009-04-03 01:48:54 UTC (rev 33)
+++ trunk/implementation/src/chrome/skin/taSearchResultBox.css 2009-04-03 04:55:37 UTC (rev 34)
@@ -30,16 +30,19 @@
}
.title {
- font-size: 1.1em;
+ font-size: 0.9em;
font-weight: bold;
}
.description {
- font-size: 0.9em;
+ font-size: 0.8em;
}
.actionType {
color: #008000;
+ font-size: 0.6em;
+ margin-top: 0em;
+ margin-bottom: 1px;
}
.site {
Modified: trunk/implementation/src/chrome/skin/taSidebar.css
===================================================================
--- trunk/implementation/src/chrome/skin/taSidebar.css 2009-04-03 01:48:54 UTC (rev 33)
+++ trunk/implementation/src/chrome/skin/taSidebar.css 2009-04-03 04:55:37 UTC (rev 34)
@@ -14,6 +14,10 @@
* limitations under the License.
**/
+tabpanel * {
+ border: red thin solid;
+}
+
#takeaction-tabbox,
tabpanels,
tabpanels > tabpanel {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jen...@us...> - 2009-04-03 02:22:50
|
Revision: 32
http://take-action.svn.sourceforge.net/take-action/?rev=32&view=rev
Author: jenrique7
Date: 2009-04-03 01:37:39 +0000 (Fri, 03 Apr 2009)
Log Message:
-----------
Modified the search form css, moved it to a grid.
Modified Paths:
--------------
trunk/implementation/src/chrome/content/taSidebar.xul
trunk/implementation/src/chrome/locale/en-US/taSidebar.dtd
trunk/implementation/src/chrome/skin/taSidebar.css
Modified: trunk/implementation/src/chrome/content/taSidebar.xul
===================================================================
--- trunk/implementation/src/chrome/content/taSidebar.xul 2009-04-03 01:15:55 UTC (rev 31)
+++ trunk/implementation/src/chrome/content/taSidebar.xul 2009-04-03 01:37:39 UTC (rev 32)
@@ -37,13 +37,13 @@
<tabbox id="takeaction-tabbox">
<tabs>
- <tab label="&takeaction.onThisPage.label;"
- accesskey="&takeaction.onThisPage.accesskey;" selected="true" />
- <tab label="&takeaction.recent.label;"
- accesskey="&takeaction.recent.accesskey;"
+ <tab label="&takeaction.tab.onThisPage.label;"
+ accesskey="&takeaction.tab.onThisPage.accesskey;" selected="true" />
+ <tab label="&takeaction.tab.recent.label;"
+ accesskey="&takeaction.tab.recent.accesskey;"
oncommand="TakeActionChrome.Sidebar.loadRecentActions(event);" />
- <tab label="&takeaction.search.label;"
- accesskey="&takeaction.search.accesskey;" />
+ <tab label="&takeaction.tab.search.label;"
+ accesskey="&takeaction.tab.search.accesskey;" />
</tabs>
<tabpanels>
<tabpanel>
@@ -58,54 +58,63 @@
</tabpanel>
<tabpanel>
<!-- Search panel. -->
- <hbox class="takeaction-form">
- <label id="takeaction-search-label" value="&takeaction.search.label;"
- accesskey="&takeaction.search.accesskey;"
- control="takeaction-search-box" />
- <textbox id="takeaction-search-box" type="search" cocoa-size="small"
- flex="1" oncommand="TakeActionChrome.Sidebar.search(event);" />
- </hbox>
- <hbox class="takeaction-form">
- <label value="&takeaction.actionType.label;"
- accesskey="&takeaction.actionType.accesskey;"
- control="takection-action-type" />
- <menulist id="takection-action-type" persist="value"
- oncommand="TakeActionChrome.Sidebar.search(event);">
- <menupopup>
- <menuitem label="&takeaction.actionType.all.label;" value="all"
- selected="true" />
- <menuitem label="&takeaction.actionType.1.label;" value="1" />
- <menuitem label="&takeaction.actionType.2.label;" value="2" />
- <menuitem label="&takeaction.actionType.3.label;" value="3" />
- <menuitem label="&takeaction.actionType.4.label;" value="4" />
- <menuitem label="&takeaction.actionType.5.label;" value="5" />
- <menuitem label="&takeaction.actionType.6.label;" value="6" />
- <menuitem label="&takeaction.actionType.7.label;" value="7" />
- <menuitem label="&takeaction.actionType.8.label;" value="8" />
- <menuitem label="&takeaction.actionType.9.label;" value="9" />
- <menuitem label="&takeaction.actionType.10.label;" value="10" />
- <menuitem label="&takeaction.actionType.11.label;" value="11" />
- <menuitem label="&takeaction.actionType.12.label;" value="12" />
- </menupopup>
- </menulist>
- </hbox>
- <hbox class="takeaction-form">
- <label value="&takeaction.created.label;"
- accesskey="&takeaction.created.accesskey;"
- control="takection-created" />
- <menulist id="takection-created" persist="value"
- oncommand="TakeActionChrome.Sidebar.search(event);">
- <menupopup>
- <menuitem label="&takeaction.created.all.label;" value="all"
- selected="true" />
- <menuitem label="&takeaction.created.30.label;" value="30" />
- <menuitem label="&takeaction.created.14.label;" value="14" />
- <menuitem label="&takeaction.created.7.label;" value="7" />
- <menuitem label="&takeaction.created.1.label;" value="1" />
- <menuitem label="&takeaction.created.0.label;" value="0" />
- </menupopup>
- </menulist>
- </hbox>
+ <grid class="takeaction-form">
+ <columns>
+ <column/>
+ <column flex="1"/>
+ </columns>
+ <rows>
+ <row class="takeaction-form-row">
+ <label id="takeaction-search-label"
+ value="&takeaction.search.label;"
+ accesskey="&takeaction.search.accesskey;"
+ control="takeaction-search-box" />
+ <textbox id="takeaction-search-box" type="search" cocoa-size="small"
+ flex="1" oncommand="TakeActionChrome.Sidebar.search(event);" />
+ </row>
+ <row class="takeaction-form-row">
+ <label value="&takeaction.actionType.label;"
+ accesskey="&takeaction.actionType.accesskey;"
+ control="takection-action-type" />
+ <menulist id="takection-action-type" persist="value"
+ oncommand="TakeActionChrome.Sidebar.search(event);">
+ <menupopup>
+ <menuitem label="&takeaction.actionType.all.label;" value="all"
+ selected="true" />
+ <menuitem label="&takeaction.actionType.1.label;" value="1" />
+ <menuitem label="&takeaction.actionType.2.label;" value="2" />
+ <menuitem label="&takeaction.actionType.3.label;" value="3" />
+ <menuitem label="&takeaction.actionType.4.label;" value="4" />
+ <menuitem label="&takeaction.actionType.5.label;" value="5" />
+ <menuitem label="&takeaction.actionType.6.label;" value="6" />
+ <menuitem label="&takeaction.actionType.7.label;" value="7" />
+ <menuitem label="&takeaction.actionType.8.label;" value="8" />
+ <menuitem label="&takeaction.actionType.9.label;" value="9" />
+ <menuitem label="&takeaction.actionType.10.label;" value="10" />
+ <menuitem label="&takeaction.actionType.11.label;" value="11" />
+ <menuitem label="&takeaction.actionType.12.label;" value="12" />
+ </menupopup>
+ </menulist>
+ </row>
+ <row class="takeaction-form-row">
+ <label value="&takeaction.created.label;"
+ accesskey="&takeaction.created.accesskey;"
+ control="takection-created" />
+ <menulist id="takection-created" persist="value"
+ oncommand="TakeActionChrome.Sidebar.search(event);">
+ <menupopup>
+ <menuitem label="&takeaction.created.all.label;" value="all"
+ selected="true" />
+ <menuitem label="&takeaction.created.30.label;" value="30" />
+ <menuitem label="&takeaction.created.14.label;" value="14" />
+ <menuitem label="&takeaction.created.7.label;" value="7" />
+ <menuitem label="&takeaction.created.1.label;" value="1" />
+ <menuitem label="&takeaction.created.0.label;" value="0" />
+ </menupopup>
+ </menulist>
+ </row>
+ </rows>
+ </grid>
<vbox id="takeaction-sidebar-search-actions" class="takeaction-results"
flex="1" />
</tabpanel>
Modified: trunk/implementation/src/chrome/locale/en-US/taSidebar.dtd
===================================================================
--- trunk/implementation/src/chrome/locale/en-US/taSidebar.dtd 2009-04-03 01:15:55 UTC (rev 31)
+++ trunk/implementation/src/chrome/locale/en-US/taSidebar.dtd 2009-04-03 01:37:39 UTC (rev 32)
@@ -14,14 +14,14 @@
- limitations under the License.
-->
-<!ENTITY takeaction.onThisPage.label "This Page">
-<!ENTITY takeaction.onThisPage.accesskey "P">
+<!ENTITY takeaction.tab.onThisPage.label "This Page">
+<!ENTITY takeaction.tab.onThisPage.accesskey "P">
-<!ENTITY takeaction.search.label "Search">
-<!ENTITY takeaction.search.accesskey "S">
+<!ENTITY takeaction.tab.search.label "Search">
+<!ENTITY takeaction.tab.search.accesskey "S">
-<!ENTITY takeaction.recent.label "Recent">
-<!ENTITY takeaction.recent.accesskey "R">
+<!ENTITY takeaction.tab.recent.label "Recent">
+<!ENTITY takeaction.tab.recent.accesskey "R">
<!ENTITY takeaction.search.label "Search:">
<!ENTITY takeaction.search.accesskey "S">
Modified: trunk/implementation/src/chrome/skin/taSidebar.css
===================================================================
--- trunk/implementation/src/chrome/skin/taSidebar.css 2009-04-03 01:15:55 UTC (rev 31)
+++ trunk/implementation/src/chrome/skin/taSidebar.css 2009-04-03 01:37:39 UTC (rev 32)
@@ -53,18 +53,18 @@
overflow: auto;
}
-#takeaction-search-label {
- display: none;
+.takeaction-form {
+ background-color: #eee;
+ padding-bottom: 0.5em;
}
-.takeaction-form {
- -moz-box-align: baseline;
+.takeaction-form-row {
+ -moz-box-align: center;
}
#takeaction-sidebar-search-actions {
border-top: thin solid #3b6604;
padding-top: 0.5em;
- margin-top: 0.5em;
}
.takeaction-results {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jen...@us...> - 2009-04-03 02:09:09
|
Revision: 33
http://take-action.svn.sourceforge.net/take-action/?rev=33&view=rev
Author: jenrique7
Date: 2009-04-03 01:48:54 +0000 (Fri, 03 Apr 2009)
Log Message:
-----------
Improved the UI of the search result box (site and action type).
Modified Paths:
--------------
trunk/implementation/src/chrome/content/taSearchResultBox.xml
trunk/implementation/src/chrome/skin/taSearchResultBox.css
Modified: trunk/implementation/src/chrome/content/taSearchResultBox.xml
===================================================================
--- trunk/implementation/src/chrome/content/taSearchResultBox.xml 2009-04-03 01:37:39 UTC (rev 32)
+++ trunk/implementation/src/chrome/content/taSearchResultBox.xml 2009-04-03 01:48:54 UTC (rev 33)
@@ -40,7 +40,6 @@
<xul:description anonid="ta-action-description" class="description" />
<xul:hbox>
<xul:label class="site" xbl:inherits="value=site"/>
- <xul:label value="-"/>
<xul:label class="actionType" xbl:inherits="value=actionType" />
</xul:hbox>
</xul:vbox>
Modified: trunk/implementation/src/chrome/skin/taSearchResultBox.css
===================================================================
--- trunk/implementation/src/chrome/skin/taSearchResultBox.css 2009-04-03 01:37:39 UTC (rev 32)
+++ trunk/implementation/src/chrome/skin/taSearchResultBox.css 2009-04-03 01:48:54 UTC (rev 33)
@@ -43,5 +43,7 @@
}
.site {
+ font-weight: bold;
color: #000080;
+ margin-right: 0px !important;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jen...@us...> - 2009-04-03 01:15:59
|
Revision: 31
http://take-action.svn.sourceforge.net/take-action/?rev=31&view=rev
Author: jenrique7
Date: 2009-04-03 01:15:55 +0000 (Fri, 03 Apr 2009)
Log Message:
-----------
Uploaded the logo png (design) file.
Added Paths:
-----------
trunk/art/logo.png
Added: trunk/art/logo.png
===================================================================
(Binary files differ)
Property changes on: trunk/art/logo.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jen...@us...> - 2009-04-03 01:15:14
|
Revision: 30
http://take-action.svn.sourceforge.net/take-action/?rev=30&view=rev
Author: jenrique7
Date: 2009-04-03 01:15:03 +0000 (Fri, 03 Apr 2009)
Log Message:
-----------
Added the logo, now displayed in the addons window.
Removed blank spaces before adding the "..." to cropped action descriptions.
Modified Paths:
--------------
trunk/implementation/src/chrome/content/taSearchResultBox.xml
trunk/implementation/src/install.rdf
Added Paths:
-----------
trunk/implementation/src/chrome/skin/logo32.png
Modified: trunk/implementation/src/chrome/content/taSearchResultBox.xml
===================================================================
--- trunk/implementation/src/chrome/content/taSearchResultBox.xml 2009-04-03 00:45:06 UTC (rev 29)
+++ trunk/implementation/src/chrome/content/taSearchResultBox.xml 2009-04-03 01:15:03 UTC (rev 30)
@@ -97,7 +97,9 @@
let result = this._stripHTMLTags(aString);
if (aMaxLength < result.length) {
- result = result.substring(0, (aMaxLength - 3)) + "...";
+ result = result.substring(0, (aMaxLength - 3));
+ result = result.replace(/\s+$/, "");
+ result = result + "...";
}
return result;
Added: trunk/implementation/src/chrome/skin/logo32.png
===================================================================
(Binary files differ)
Property changes on: trunk/implementation/src/chrome/skin/logo32.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/implementation/src/install.rdf
===================================================================
--- trunk/implementation/src/install.rdf 2009-04-03 00:45:06 UTC (rev 29)
+++ trunk/implementation/src/install.rdf 2009-04-03 01:15:03 UTC (rev 30)
@@ -22,13 +22,13 @@
<Description about="urn:mozilla:install-manifest">
<em:id>{74402389-E0EE-4252-8C6A-7DA54D7F21F4}</em:id>
<em:name>Take Action</em:name>
- <em:description>TODO: Add description</em:description>
- <em:version>0.0.1</em:version>
+ <em:description>Social Actions Add-on for Firefox</em:description>
+ <em:version>1.0</em:version>
<em:creator>Jose Enrique Bolaños & Jorge Villalobos</em:creator>
<em:developer>Jose Enrique Bolaños</em:developer>
<em:developer>Jorge Villalobos</em:developer>
<em:homepageURL>http://take-action.sourceforge.net</em:homepageURL>
- <!--<em:iconURL>chrome://takeaction/skin/logo32.png</em:iconURL>-->
+ <em:iconURL>chrome://takeaction/skin/logo32.png</em:iconURL>
<!--<em:updateURL></em:updateURL>-->
<em:type>2</em:type>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jen...@us...> - 2009-04-03 00:45:10
|
Revision: 29
http://take-action.svn.sourceforge.net/take-action/?rev=29&view=rev
Author: jenrique7
Date: 2009-04-03 00:45:06 +0000 (Fri, 03 Apr 2009)
Log Message:
-----------
The page results are now loaded in the sidebar when it opens.
Modified Paths:
--------------
trunk/implementation/src/chrome/content/taSidebar.js
Modified: trunk/implementation/src/chrome/content/taSidebar.js
===================================================================
--- trunk/implementation/src/chrome/content/taSidebar.js 2009-04-01 20:38:15 UTC (rev 28)
+++ trunk/implementation/src/chrome/content/taSidebar.js 2009-04-03 00:45:06 UTC (rev 29)
@@ -46,6 +46,16 @@
this._logger.debug("init");
this._bundle = document.getElementById("takeaction-string-bundle");
+
+ // Load the current page actions
+ let mainWindow =
+ window.QueryInterface(Components.interfaces.nsIInterfaceRequestor).
+ getInterface(Components.interfaces.nsIWebNavigation).
+ QueryInterface(Components.interfaces.nsIDocShellTreeItem).
+ rootTreeItem.
+ QueryInterface(Components.interfaces.nsIInterfaceRequestor).
+ getInterface(Components.interfaces.nsIDOMWindow);
+ this.loadThisPageActions(mainWindow.content.document.TakeActionResults);
},
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jen...@us...> - 2009-04-01 20:38:17
|
Revision: 28
http://take-action.svn.sourceforge.net/take-action/?rev=28&view=rev
Author: jenrique7
Date: 2009-04-01 20:38:15 +0000 (Wed, 01 Apr 2009)
Log Message:
-----------
The "Loading..." message is now displayed for the "This Page" tab.
Increased the max number of results for each page to 30.
Reduced the search result description text crop to 100, so that the total number of lines for it never goes over 3.
Modified Paths:
--------------
trunk/implementation/src/chrome/content/taBrowserOverlay.js
trunk/implementation/src/chrome/content/taSearchResultBox.xml
trunk/implementation/src/chrome/content/taSidebar.js
Modified: trunk/implementation/src/chrome/content/taBrowserOverlay.js
===================================================================
--- trunk/implementation/src/chrome/content/taBrowserOverlay.js 2009-04-01 20:23:43 UTC (rev 27)
+++ trunk/implementation/src/chrome/content/taBrowserOverlay.js 2009-04-01 20:38:15 UTC (rev 28)
@@ -157,7 +157,7 @@
let searchQuery = new TakeAction.SearchQuery();
searchQuery.setQuery(searchTerms);
searchQuery.setMatch(TakeAction.API.MATCH_ANY);
- searchQuery.setLimit(10);
+ searchQuery.setLimit(30);
searchQuery.setCreatedDays(TakeAction.API.CREATED_DAYS_ALL);
TakeAction.API.search(
searchQuery,
Modified: trunk/implementation/src/chrome/content/taSearchResultBox.xml
===================================================================
--- trunk/implementation/src/chrome/content/taSearchResultBox.xml 2009-04-01 20:23:43 UTC (rev 27)
+++ trunk/implementation/src/chrome/content/taSearchResultBox.xml 2009-04-01 20:38:15 UTC (rev 28)
@@ -85,7 +85,7 @@
description.appendChild(
document.createTextNode(
- this._crop(this._searchResult.description, 150)));
+ this._crop(this._searchResult.description, 100)));
]]>
</setter>
</property>
Modified: trunk/implementation/src/chrome/content/taSidebar.js
===================================================================
--- trunk/implementation/src/chrome/content/taSidebar.js 2009-04-01 20:23:43 UTC (rev 27)
+++ trunk/implementation/src/chrome/content/taSidebar.js 2009-04-01 20:38:15 UTC (rev 28)
@@ -62,10 +62,13 @@
loadThisPageActions : function(aSearchResults) {
this._logger.debug("loadThisPageActions");
+ let container =
+ document.getElementById("takeaction-sidebar-thisPage-actions");
+
if (typeof(aSearchResults) == 'object') {
- let container =
- document.getElementById("takeaction-sidebar-thisPage-actions");
this._loadActions(aSearchResults, container);
+ } else {
+ this._showMessage(container, true);
}
},
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jen...@us...> - 2009-04-01 20:23:49
|
Revision: 27
http://take-action.svn.sourceforge.net/take-action/?rev=27&view=rev
Author: jenrique7
Date: 2009-04-01 20:23:43 +0000 (Wed, 01 Apr 2009)
Log Message:
-----------
Removed commented preference.
Modified Paths:
--------------
trunk/implementation/src/defaults/preferences/takeaction.js
Modified: trunk/implementation/src/defaults/preferences/takeaction.js
===================================================================
--- trunk/implementation/src/defaults/preferences/takeaction.js 2009-04-01 20:22:42 UTC (rev 26)
+++ trunk/implementation/src/defaults/preferences/takeaction.js 2009-04-01 20:23:43 UTC (rev 27)
@@ -14,4 +14,3 @@
* limitations under the License.
**/
-//pref("extensions.takeaction.notification.mode", 1);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jen...@us...> - 2009-04-01 20:22:50
|
Revision: 26
http://take-action.svn.sourceforge.net/take-action/?rev=26&view=rev
Author: jenrique7
Date: 2009-04-01 20:22:42 +0000 (Wed, 01 Apr 2009)
Log Message:
-----------
Removed the preferences window.
Modified Paths:
--------------
trunk/implementation/src/install.rdf
Removed Paths:
-------------
trunk/implementation/src/chrome/content/taPreferencesWindow.js
trunk/implementation/src/chrome/content/taPreferencesWindow.xul
Deleted: trunk/implementation/src/chrome/content/taPreferencesWindow.js
===================================================================
--- trunk/implementation/src/chrome/content/taPreferencesWindow.js 2009-04-01 20:19:45 UTC (rev 25)
+++ trunk/implementation/src/chrome/content/taPreferencesWindow.js 2009-04-01 20:22:42 UTC (rev 26)
@@ -1,71 +0,0 @@
-/**
- * Copyright 2009 Jose Enrique Bolanos, Jorge Villalobos
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
-
-Components.utils.import("resource://takeAction/taCommon.js");
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-
-/**
- * TakeAction chrome namespace.
- */
-if (typeof(TakeActionChrome) == 'undefined') {
- var TakeActionChrome = {};
-};
-
-/**
- * Preferences window controller. Manages UI events that occur in the
- * preferences window.
- */
-TakeActionChrome.PreferencesWindow = {
-
- /* Logger for this object. */
- _logger : null,
-
- /**
- * Initializes the object.
- */
- init : function() {
- let that = this;
- let os;
-
- this._logger = Log4Moz.repository.getLogger("TakeActionChrome.PreferencesWindow");
- this._logger.level = Log4Moz.Level["All"];
- this._logger.debug("init");
-
- os = TakeAction.getOperatingSystem();
-
- if ((TakeAction.OS_WINDOWS == os) || (TakeAction.OS_WINDOWS_VISTA == os)) {
- document.title =
- TakeAction.overlayBundle.GetStringFromName("takeaction.options.title");
- } else {
- document.title =
- TakeAction.overlayBundle.GetStringFromName("takeaction.optionsUnix.title");
- }
- },
-
- /**
- * Unloads the object.
- */
- uninit : function() {
- this._logger.debug("uninit");
- }
-};
-
-window.addEventListener(
- "load", function() { TakeActionChrome.PreferencesWindow.init(); }, false);
-window.addEventListener(
- "unload", function() { TakeActionChrome.PreferencesWindow.uninit(); }, false);
Deleted: trunk/implementation/src/chrome/content/taPreferencesWindow.xul
===================================================================
--- trunk/implementation/src/chrome/content/taPreferencesWindow.xul 2009-04-01 20:19:45 UTC (rev 25)
+++ trunk/implementation/src/chrome/content/taPreferencesWindow.xul 2009-04-01 20:22:42 UTC (rev 26)
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- - Copyright 2009 Jose Enrique Bolanos, Jorge Villalobos
- -
- - Licensed under the Apache License, Version 2.0 (the "License");
- - you may not use this file except in compliance with the License.
- - You may obtain a copy of the License at
- -
- - http://www.apache.org/licenses/LICENSE-2.0
- -
- - Unless required by applicable law or agreed to in writing, software
- - distributed under the License is distributed on an "AS IS" BASIS,
- - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- - See the License for the specific language governing permissions and
- - limitations under the License.
- -->
-
-<?xml-stylesheet type="text/css" href="chrome://global/skin/" ?>
-<?xml-stylesheet type="text/css"
- href="chrome://browser/skin/preferences/preferences.css" ?>
-
-<prefwindow id="takeaction-preferences-window"
- buttons="accept, cancel"
- ondialogaccept="TakeActionChrome.PreferencesWindow.accept(event);"
- xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
- <script type="application/javascript"
- src="chrome://global/content/contentAreaUtils.js" />
- <script type="application/x-javascript"
- src="chrome://takeaction/content/taPreferencesWindow.js" />
-
-</prefwindow>
Modified: trunk/implementation/src/install.rdf
===================================================================
--- trunk/implementation/src/install.rdf 2009-04-01 20:19:45 UTC (rev 25)
+++ trunk/implementation/src/install.rdf 2009-04-01 20:22:42 UTC (rev 26)
@@ -28,7 +28,6 @@
<em:developer>Jose Enrique Bolaños</em:developer>
<em:developer>Jorge Villalobos</em:developer>
<em:homepageURL>http://take-action.sourceforge.net</em:homepageURL>
- <em:optionsURL>chrome://takeaction/content/taPreferencesWindow.xul</em:optionsURL>
<!--<em:iconURL>chrome://takeaction/skin/logo32.png</em:iconURL>-->
<!--<em:updateURL></em:updateURL>-->
<em:type>2</em:type>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jen...@us...> - 2009-04-01 20:19:50
|
Revision: 25
http://take-action.svn.sourceforge.net/take-action/?rev=25&view=rev
Author: jenrique7
Date: 2009-04-01 20:19:45 +0000 (Wed, 01 Apr 2009)
Log Message:
-----------
Clicking search results in the sidebar now opens the social action page in the browser.
Modified Paths:
--------------
trunk/implementation/src/chrome/content/taBrowserOverlay.js
trunk/implementation/src/chrome/content/taSearchResultBox.xml
Modified: trunk/implementation/src/chrome/content/taBrowserOverlay.js
===================================================================
--- trunk/implementation/src/chrome/content/taBrowserOverlay.js 2009-04-01 04:31:50 UTC (rev 24)
+++ trunk/implementation/src/chrome/content/taBrowserOverlay.js 2009-04-01 20:19:45 UTC (rev 25)
@@ -152,8 +152,6 @@
searchTerms = searchTerms.replace(/[^a-z0-9]/gi, " ");
searchTerms = searchTerms.replace(/\s+/gi, " ");
- alert("Search terms for this page: " + searchTerms);
-
// Do the search
let that = this;
let searchQuery = new TakeAction.SearchQuery();
Modified: trunk/implementation/src/chrome/content/taSearchResultBox.xml
===================================================================
--- trunk/implementation/src/chrome/content/taSearchResultBox.xml 2009-04-01 04:31:50 UTC (rev 24)
+++ trunk/implementation/src/chrome/content/taSearchResultBox.xml 2009-04-01 20:19:45 UTC (rev 25)
@@ -34,7 +34,7 @@
</resources>
<content>
- <xul:vbox class="outerbox" flex="1">
+ <xul:vbox class="outerbox" flex="1" onclick="_openActionPage(event)">
<xul:label class="title" crop="end"
xbl:inherits="value=title,tooltiptext" />
<xul:description anonid="ta-action-description" class="description" />
@@ -113,6 +113,30 @@
</body>
</method>
+ <method name="_openActionPage">
+ <parameter name="aEvent"/>
+ <body><![CDATA[
+ this._logger.trace("_openActionPage");
+
+ let mainWindow =
+ window.QueryInterface(Components.interfaces.nsIInterfaceRequestor).
+ getInterface(Components.interfaces.nsIWebNavigation).
+ QueryInterface(Components.interfaces.nsIDocShellTreeItem).
+ rootTreeItem.
+ QueryInterface(Components.interfaces.nsIInterfaceRequestor).
+ getInterface(Components.interfaces.nsIDOMWindow);
+
+
+ if (1 != aEvent.button) {
+ mainWindow.openUILink(this._searchResult.url, aEvent);
+ } else {
+ // checkMiddleClick doesn't work for us in this case.
+ mainWindow.openUILinkIn(this._searchResult.url, "tab");
+ }
+ ]]>
+ </body>
+ </method>
+
</implementation>
</binding>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jor...@us...> - 2009-04-01 04:31:53
|
Revision: 24
http://take-action.svn.sourceforge.net/take-action/?rev=24&view=rev
Author: jorgevillalobos
Date: 2009-04-01 04:31:50 +0000 (Wed, 01 Apr 2009)
Log Message:
-----------
- Some UI fixes to the sidebar.
- Made the Recent tab load its results when selected.
- Made the Search form elements trigger a query when updated.
Modified Paths:
--------------
trunk/implementation/src/chrome/content/taSidebar.js
trunk/implementation/src/chrome/content/taSidebar.xul
trunk/implementation/src/chrome/skin/taSidebar.css
Modified: trunk/implementation/src/chrome/content/taSidebar.js
===================================================================
--- trunk/implementation/src/chrome/content/taSidebar.js 2009-04-01 04:12:48 UTC (rev 23)
+++ trunk/implementation/src/chrome/content/taSidebar.js 2009-04-01 04:31:50 UTC (rev 24)
@@ -46,8 +46,6 @@
this._logger.debug("init");
this._bundle = document.getElementById("takeaction-string-bundle");
-
- this.loadRecentActions();
},
/**
Modified: trunk/implementation/src/chrome/content/taSidebar.xul
===================================================================
--- trunk/implementation/src/chrome/content/taSidebar.xul 2009-04-01 04:12:48 UTC (rev 23)
+++ trunk/implementation/src/chrome/content/taSidebar.xul 2009-04-01 04:31:50 UTC (rev 24)
@@ -40,7 +40,8 @@
<tab label="&takeaction.onThisPage.label;"
accesskey="&takeaction.onThisPage.accesskey;" selected="true" />
<tab label="&takeaction.recent.label;"
- accesskey="&takeaction.recent.accesskey;" />
+ accesskey="&takeaction.recent.accesskey;"
+ oncommand="TakeActionChrome.Sidebar.loadRecentActions(event);" />
<tab label="&takeaction.search.label;"
accesskey="&takeaction.search.accesskey;" />
</tabs>
@@ -68,7 +69,8 @@
<label value="&takeaction.actionType.label;"
accesskey="&takeaction.actionType.accesskey;"
control="takection-action-type" />
- <menulist id="takection-action-type">
+ <menulist id="takection-action-type" persist="value"
+ oncommand="TakeActionChrome.Sidebar.search(event);">
<menupopup>
<menuitem label="&takeaction.actionType.all.label;" value="all"
selected="true" />
@@ -91,7 +93,8 @@
<label value="&takeaction.created.label;"
accesskey="&takeaction.created.accesskey;"
control="takection-created" />
- <menulist id="takection-created">
+ <menulist id="takection-created" persist="value"
+ oncommand="TakeActionChrome.Sidebar.search(event);">
<menupopup>
<menuitem label="&takeaction.created.all.label;" value="all"
selected="true" />
Modified: trunk/implementation/src/chrome/skin/taSidebar.css
===================================================================
--- trunk/implementation/src/chrome/skin/taSidebar.css 2009-04-01 04:12:48 UTC (rev 23)
+++ trunk/implementation/src/chrome/skin/taSidebar.css 2009-04-01 04:31:50 UTC (rev 24)
@@ -22,7 +22,7 @@
}
tabs {
- margin: 0em;
+ margin: 0.3em 0em 0em 0em;
}
tab {
@@ -61,6 +61,12 @@
-moz-box-align: baseline;
}
+#takeaction-sidebar-search-actions {
+ border-top: thin solid #3b6604;
+ padding-top: 0.5em;
+ margin-top: 0.5em;
+}
+
.takeaction-results {
-moz-box-align: center;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
![http://www.socialactions.com/images/change-the-web-challenge-logo-sm.gif"](http://www.socialactions.com/images/change-the-web-challenge-logo-sm.gif"){kind=link}