'
+ '
<%= title %>
<%= description %>
' + + '<%= title %>
<%= shortenText(description) %>
' + '<%= gettext("Duration:") %> <%= duration.toString() %>
'
+ '
<%= annotation.title %>
' - + '<%= annotation.description %>
<% if (annotation.keywords.length) { print("" + gettext("Tags:") + " " + annotation.keywords.join(", ") + "
"); } %>' + + '<%= shortenText(annotation.description) %>
<% if (annotation.keywords.length) { print("" + gettext("Tags:") + " " + annotation.keywords.join(", ") + "
"); } %>' + '<%= gettext("Clone segment") %>' + '<%= gettext("From:") %> <%= annotation.begin.toString() %> <%= gettext("to:") %> <%= annotation.end.toString() %> (<%= gettext("duration:") %> <%= annotation.getDuration().toString() %>)
' + ''
- + '
'
),
mediafoundlisttemplate = _.template(
''
+ + '
'
+ + ''
+ '
<%= title %>
' + '<%= description %>
<% if (tags) { print("" + gettext("Tags:") + " " + tags + "
"); } %>' + '<%= gettext("Clone segment") %>' - + '<%= segments %>
'
@@ -67,12 +74,6 @@
},
{
validate: function(_s) {
- return (_s.getDuration() < 180000);
- },
- message: gettext("A segment must be at most three minutes long")
- },
- {
- validate: function(_s) {
return (!!_s.title && _s.title !== gettext("Untitled segment"));
},
message: gettext("A segment must have a title")
@@ -167,7 +168,7 @@
media = directory.getElement(mediaid);
if (!val) {
li.find(".title-video").text(media.title);
- li.find(".description").text(media.description);
+ li.find(".description").text(shortenText(media.description));
li.find(".media-found-segments").html("");
li.show();
} else {
@@ -180,7 +181,7 @@
var found = find.test(media.title) || find.test(media.description) || annotations.length;
if (found) {
li.find(".title-video").html(media.title.replace(replace, '$1'));
- li.find(".description").html(media.description.replace(replace, '$1'));
+ li.find(".description").html(shortenText(media.description).replace(replace, '$1'));
var html = '',
k = 230 / media.duration,
lines = [];
@@ -204,7 +205,7 @@
top: 8 * line.index,
color: IriSP.vizcolors[i % IriSP.vizcolors.length],
title: _a.title.replace(replace, '$1'),
- description: _a.description.replace(replace, '$1'),
+ description: shortenText(_a.description).replace(replace, '$1'),
tags: _a.keywords.join(", ").replace(replace, '$1'),
popleft : corrpos,
pointerpos : (pos - corrpos),
diff -r 3a2f9993c6cb -r 57f1d252b8f9 integration/js/model.js
--- a/integration/js/model.js Tue Jan 29 17:26:56 2013 +0100
+++ b/integration/js/model.js Mon May 06 16:06:47 2013 +0200
@@ -19,11 +19,12 @@
var uidbase = rand16(8) + "-" + rand16(4) + "-", uidincrement = Math.floor(Math.random()*0x10000);
var charsub = [
- [ 'a', 'á', 'à', 'â', 'ä' ],
- [ 'c', 'ç' ],
- [ 'e', 'é', 'è', 'ê', 'ë' ],
- [ 'i', 'í', 'ì', 'î', 'ï' ],
- [ 'o', 'ó', 'ò', 'ô', 'ö' ]
+ '[aáàâä]',
+ '[cç]',
+ '[eéèêë]',
+ '[iíìîï]',
+ '[oóòôö]',
+ '[uùûü]'
];
var removeChars = [
@@ -71,10 +72,7 @@
remrx = new RegExp(remsrc,"gm"),
txt = _text.toLowerCase().replace(remrx,"")
res = [],
- charsrc = ns._(charsub).map(function(c) {
- return "(" + c.join("|") + ")";
- }),
- charsrx = ns._(charsrc).map(function(c) {
+ charsrx = ns._(charsub).map(function(c) {
return new RegExp(c);
}),
src = "";
@@ -83,7 +81,7 @@
src += remsrc + "*";
}
var l = txt[j];
- ns._(charsrc).each(function(v, k) {
+ ns._(charsub).each(function(v, k) {
l = l.replace(charsrx[k], v);
});
src += l;
@@ -223,7 +221,7 @@
*/
Model.List.prototype.searchByTitle = function(_text, _iexact) {
var _iexact = _iexact || false,
- _rgxp = Model.regexpFromTextOrArray(_text, true);
+ _rgxp = Model.regexpFromTextOrArray(_text, true, _iexact);
return this.filter(function(_element) {
return _rgxp.test(_element.title);
});
@@ -231,7 +229,7 @@
Model.List.prototype.searchByDescription = function(_text, _iexact) {
var _iexact = _iexact || false,
- _rgxp = Model.regexpFromTextOrArray(_text, true);
+ _rgxp = Model.regexpFromTextOrArray(_text, true, _iexact);
return this.filter(function(_element) {
return _rgxp.test(_element.description);
});
@@ -239,7 +237,7 @@
Model.List.prototype.searchByTextFields = function(_text, _iexact) {
var _iexact = _iexact || false,
- _rgxp = Model.regexpFromTextOrArray(_text, true);
+ _rgxp = Model.regexpFromTextOrArray(_text, true, _iexact);
return this.filter(function(_element) {
var keywords = (_element.keywords || _element.getTagTexts() || []).join(", ");
return _rgxp.test(_element.description) || _rgxp.test(_element.title) || _rgxp.test(keywords);
diff -r 3a2f9993c6cb -r 57f1d252b8f9 src/hashcut/static/hashcut/bpi/css/edition.css
--- a/src/hashcut/static/hashcut/bpi/css/edition.css Tue Jan 29 17:26:56 2013 +0100
+++ b/src/hashcut/static/hashcut/bpi/css/edition.css Mon May 06 16:06:47 2013 +0200
@@ -206,12 +206,18 @@
}
.media-found-popin {
- top: 2px; width: 170px; display: none;
+ width: 170px; display: none;
margin-left: -86px;
}
.media-found-popin .pointer {
margin-left: 75px;
+ position: absolute; top: -15px; background: url(../img/inv-triangle.png);
+ width: 20px; height: 13px;
+}
+
+.media-found-popin .popin-content {
+ position: absolute; bottom: 14px;
}
.reprendre-segment{
diff -r 3a2f9993c6cb -r 57f1d252b8f9 src/hashcut/static/hashcut/iri/css/edition.css
--- a/src/hashcut/static/hashcut/iri/css/edition.css Tue Jan 29 17:26:56 2013 +0100
+++ b/src/hashcut/static/hashcut/iri/css/edition.css Mon May 06 16:06:47 2013 +0200
@@ -206,12 +206,18 @@
}
.media-found-popin {
- top: 2px; width: 170px; display: none;
+ width: 170px; display: none;
margin-left: -86px;
}
.media-found-popin .pointer {
margin-left: 75px;
+ position: absolute; top: -15px; background: url(../img/inv-triangle.png);
+ width: 20px; height: 13px;
+}
+
+.media-found-popin .popin-content {
+ position: absolute; bottom: 14px;
}
.reprendre-segment{
diff -r 3a2f9993c6cb -r 57f1d252b8f9 src/hashcut/static/hashcut/js/hashcut.js
--- a/src/hashcut/static/hashcut/js/hashcut.js Tue Jan 29 17:26:56 2013 +0100
+++ b/src/hashcut/static/hashcut/js/hashcut.js Mon May 06 16:06:47 2013 +0200
@@ -60,11 +60,12 @@
var uidbase = rand16(8) + "-" + rand16(4) + "-", uidincrement = Math.floor(Math.random()*0x10000);
var charsub = [
- [ 'a', 'á', 'à', 'â', 'ä' ],
- [ 'c', 'ç' ],
- [ 'e', 'é', 'è', 'ê', 'ë' ],
- [ 'i', 'í', 'ì', 'î', 'ï' ],
- [ 'o', 'ó', 'ò', 'ô', 'ö' ]
+ '[aáàâä]',
+ '[cç]',
+ '[eéèêë]',
+ '[iíìîï]',
+ '[oóòôö]',
+ '[uùûü]'
];
var removeChars = [
@@ -112,10 +113,7 @@
remrx = new RegExp(remsrc,"gm"),
txt = _text.toLowerCase().replace(remrx,"")
res = [],
- charsrc = ns._(charsub).map(function(c) {
- return "(" + c.join("|") + ")";
- }),
- charsrx = ns._(charsrc).map(function(c) {
+ charsrx = ns._(charsub).map(function(c) {
return new RegExp(c);
}),
src = "";
@@ -124,7 +122,7 @@
src += remsrc + "*";
}
var l = txt[j];
- ns._(charsrc).each(function(v, k) {
+ ns._(charsub).each(function(v, k) {
l = l.replace(charsrx[k], v);
});
src += l;
@@ -264,7 +262,7 @@
*/
Model.List.prototype.searchByTitle = function(_text, _iexact) {
var _iexact = _iexact || false,
- _rgxp = Model.regexpFromTextOrArray(_text, true);
+ _rgxp = Model.regexpFromTextOrArray(_text, true, _iexact);
return this.filter(function(_element) {
return _rgxp.test(_element.title);
});
@@ -272,7 +270,7 @@
Model.List.prototype.searchByDescription = function(_text, _iexact) {
var _iexact = _iexact || false,
- _rgxp = Model.regexpFromTextOrArray(_text, true);
+ _rgxp = Model.regexpFromTextOrArray(_text, true, _iexact);
return this.filter(function(_element) {
return _rgxp.test(_element.description);
});
@@ -280,7 +278,7 @@
Model.List.prototype.searchByTextFields = function(_text, _iexact) {
var _iexact = _iexact || false,
- _rgxp = Model.regexpFromTextOrArray(_text, true);
+ _rgxp = Model.regexpFromTextOrArray(_text, true, _iexact);
return this.filter(function(_element) {
var keywords = (_element.keywords || _element.getTagTexts() || []).join(", ");
return _rgxp.test(_element.description) || _rgxp.test(_element.title) || _rgxp.test(keywords);
@@ -2281,6 +2279,13 @@
IriSP.editor = function(options) {
+ window.shortenText = function(text, minlength, maxlength) {
+ var min = (typeof minlength === "undefined" ? 100 : minlength),
+ max = (typeof maxlength === "undefined" ? min + 20 : maxlength),
+ rx = new RegExp("(^.{" + min + "," + max + "})[\s].+$");
+ return text.replace(/[\n\r\s]+/mg,' ').replace(rx,'$1…');
+ }
+
/* Load Media List */
var directory = new IriSP.Model.Directory(),
@@ -2294,7 +2299,7 @@
mediatemplate = _.template(
'