");
} else {
- echo("
");
}
?>
@@ -305,13 +320,26 @@
-
-
-
-
-
-
-
+
+
+
+
diff -r 9bbd4e653f16 -r d38805d89dd5 web/common.php
--- a/web/common.php Tue Feb 14 14:23:18 2012 +0100
+++ b/web/common.php Tue Feb 14 14:24:36 2012 +0100
@@ -13,7 +13,7 @@
/**
* Base configuration
*/
-$C_default_rep = 'bpi-des-livres-aux-machines';
+$C_default_rep = '2011-2012-museo-contribution';
$C_feedback_form_url = 'https://spreadsheets.google.com/spreadsheet/viewform?hl=en_US&formkey=dDZILVdXVHRzd0xhWGVZXzkweHN2RGc6MQ#gid=0';
$archives_list = array(
diff -r 9bbd4e653f16 -r d38805d89dd5 web/res/css/archives-iframe.css
--- a/web/res/css/archives-iframe.css Tue Feb 14 14:23:18 2012 +0100
+++ b/web/res/css/archives-iframe.css Tue Feb 14 14:24:36 2012 +0100
@@ -15,6 +15,9 @@
max-width: 266px;
text-align: center;
}
+.archivesTitleActionsContainer {
+ margin-bottom: 10px;
+}
.archivesTitleContainer {
width: 270px;
padding: 0;
@@ -76,7 +79,7 @@
.scrollable .items {
/* this cannot be too large */
position: absolute;
- top: 22px;
+ top: 27px;
width: 20000em;
}
.item {
diff -r 9bbd4e653f16 -r d38805d89dd5 web/res/css/twcx-img/tweetbuttons.png
Binary file web/res/css/twcx-img/tweetbuttons.png has changed
diff -r 9bbd4e653f16 -r d38805d89dd5 web/res/css/tweetcast.css
--- a/web/res/css/tweetcast.css Tue Feb 14 14:23:18 2012 +0100
+++ b/web/res/css/tweetcast.css Tue Feb 14 14:24:36 2012 +0100
@@ -175,7 +175,7 @@
a#sendTweet {
background: transparent url('../../images/bg_button_a_w.png') no-repeat top right;
color: #444; display: block; font-size: 12px; height: 24px; line-height: 14px;
- float:right; margin-left: 50px; padding: 0 18px 0 0; text-decoration: none;
+ float:right; margin: 2px 0 0 5px; padding: 0 18px 0 0; text-decoration: none;
}
a#sendTweet span {
background: transparent url('../../images/bg_button_span_w.png') no-repeat; display: block; height: 14px;
@@ -187,26 +187,59 @@
a#sendTweet:hover span, a#sendTweet:active span {
background-position: 0 -24px;
}
-a.tweetButton {
- float:right; margin: 2px 10px 0 0; width:32px; height:20px; text-decoration: none; font: normal 12px;
- color: #444; text-align:center; cursor: pointer; cursor: hand;
+.tweetButton {
+ float:left; margin: 2px 8px 0 0; width:75px; height:24px; text-decoration: none;
+ background: url('twcx-img/tweetbuttons.png');
+ color: #333; text-align:center; cursor: pointer; cursor: hand;
+}
+.twbSyntax {
+ font-weight: normal; font-size: 14px;
+}
+.twbSeparator {
+ color: #999; font-size: 12px;
}
-
-#question {
- background: transparent url('../../images/bt_blue.png') no-repeat;
+.twbLabel {
+ font-weight: bold; font-size: 10px;
+}
+.tweetButton.twbGreen {
+ background-position: 0 0;
+}
+.tweetButton.twbGreen.selected {
+ background-position: 0 -48px;
+}
+.tweetButton.twbGreen:hover {
+ background-position: 0 -24px;
+}
+.tweetButton.twbRed {
+ background-position: -75px 0;
}
-#reference{
- background: transparent url('../../images/bt_yellow.png') no-repeat;
+.tweetButton.twbRed.selected {
+ background-position: -75px -48px;
+}
+.tweetButton.twbRed:hover {
+ background-position: -75px -24px;
}
-#positive{
- background: transparent url('../../images/bt_green.png') no-repeat;
+.tweetButton.twbYellow {
+ background-position: -150px 0;
+}
+.tweetButton.twbYellow.selected {
+ background-position: -150px -48px;
}
-#negative{
- background: transparent url('../../images/bt_red.png') no-repeat;
+.tweetButton.twbYellow:hover {
+ background-position: -150px -24px;
+}
+.tweetButton.twbBlue {
+ background-position: -225px 0;
}
-
+.tweetButton.twbBlue.selected {
+ background-position: -225px -48px;
+}
+.tweetButton.twbBlue:hover {
+ background-position: -225px -24px;
+}
#tweetCounter{
- float: left; background: transparent; border: none;font-weight:bold; margin-top: 2px; padding: 0;
+ float: right; background: transparent; border: none; font-size: 13px;
+ font-weight:bold; margin: 4px 0 0; padding: 0; color: #666;
}
.tweetCounterNegative{
color:red;
diff -r 9bbd4e653f16 -r d38805d89dd5 web/res/js-tweetcast/live-polemic.js
--- a/web/res/js-tweetcast/live-polemic.js Tue Feb 14 14:23:18 2012 +0100
+++ b/web/res/js-tweetcast/live-polemic.js Tue Feb 14 14:24:36 2012 +0100
@@ -7,7 +7,7 @@
}
},
"positive" : {
- "display_name" : "++",
+ "display_name" : "++ | accord",
"keywords" : [ /\+\+/ ],
"colors" : {
"h" : .3,
@@ -15,7 +15,7 @@
}
},
"negative" : {
- "display_name" : "--",
+ "display_name" : "-- | désaccord",
"keywords" : [ /\-\-/ ],
"colors" : {
"h" : 0,
@@ -23,7 +23,7 @@
}
},
"reference" : {
- "display_name" : "==",
+ "display_name" : "== | référence",
"keywords" : [ /\=\=/ ],
"colors" : {
"h" : .16,
@@ -31,7 +31,7 @@
}
},
"question" : {
- "display_name" : "??",
+ "display_name" : "?? | question",
"keywords" : [ /\?\?/ ],
"colors" : {
"h" : .6,
@@ -90,9 +90,9 @@
urlRegExp : /https?:\/\/[0-9a-zA-Z\.%\/-_]+/g,
wordRegExp : /[^ \.&;,'"!\?\d\(\)\+\[\]\\\…\-«»:\/]{3,}/g,
stopWords : [
- 'aussi', 'and', 'avec', 'aux', 'car', 'cette', 'comme', 'dans', 'donc', 'des', 'elle', 'est',
- 'être', 'eux', 'fait', 'ici', 'ils', 'les', 'leur', 'leurs', 'mais', 'mes', 'même', 'mon', 'notre',
- 'non', 'nos', 'nous', 'ont', 'par', 'pas', 'peu', 'pour', 'que', 'qui', 'ses' ,'son', 'sont', 'sur',
+ 'aussi', 'and', 'avec', 'aux', 'bien', 'car', 'cette', 'comme', 'dans', 'donc', 'des', 'elle', 'encore', 'est',
+ 'être', 'eux', 'faire', 'fait', 'ici', 'ils', 'les', 'leur', 'leurs', 'mais', 'mes', 'même', 'mon', 'notre',
+ 'non', 'nos', 'nous', 'ont', 'par', 'pas', 'peu', 'peut', 'plus', 'pour', 'que', 'qui', 'ses' ,'son', 'sont', 'sur',
'tes', 'très', 'the', 'ton', 'tous', 'tout', 'une', 'votre', 'vos', 'vous'
],
}
@@ -277,7 +277,7 @@
var tab = tweet.text.replace(twCx.urlRegExp,'').match(twCx.wordRegExp);
for (var i in tab) {
var word = tab[i].toLowerCase();
- if (twCx.stopWords.indexOf(word) == -1 && tracking_keywords.indexOf(word) == -1) {
+ if (twCx.stopWords.indexOf(word) == -1 && tracking_keywords.indexOf(word) == -1 && word[0] != '@') {
if (twCx.globalWords[word]) {
twCx.globalWords[word].freq++;
} else {