[dev] [commit] r999 - phplib templates/admin templates/common/bits wwwbase wwwbase/admin wwwbase/js
automailer at dexonline.ro
automailer at dexonline.ro
Sun Sep 22 00:51:50 EEST 2013
Author: grigoroiualex
Date: Sun Sep 22 00:51:50 2013
New Revision: 999
Log:
Tag label can show different text than the lexeme associated. For example: 'arbore cotit' can send to 'vibrochen'.
Modified:
phplib/util.php
templates/admin/visualTag.ihtml
templates/common/bits/tagsInfo.ihtml
wwwbase/admin/visualTag.php
wwwbase/js/dexGallery.js
wwwbase/js/visualTag.js
wwwbase/search.php
Modified: phplib/util.php
==============================================================================
--- phplib/util.php Sat Sep 21 23:24:03 2013 (r998)
+++ phplib/util.php Sun Sep 22 00:51:50 2013 (r999)
@@ -149,7 +149,7 @@
define('PRIV_VIEW_HIDDEN', PRIV_ADMIN);
define('NUM_PRIVILEGES', 8);
$GLOBALS['PRIV_NAMES'] = array('Administrator', 'Moderator LOC', 'Moderator', 'Editor al ghidului de exprimare', 'Editor al cuvântului zilei',
- 'Utilizator privilegiat', '«Structurist» al definițiilor', 'Mderator Imagini Definiții');
+ 'Utilizator privilegiat', '«Structurist» al definițiilor', 'Moderator Imagini Definiții');
# TODO rethink this part
//Source
Modified: templates/admin/visualTag.ihtml
==============================================================================
--- templates/admin/visualTag.ihtml Sat Sep 21 23:24:03 2013 (r998)
+++ templates/admin/visualTag.ihtml Sun Sep 22 00:51:50 2013 (r999)
@@ -64,12 +64,10 @@
<input id="lexemId" type="hidden"/>
</label><br/>
- <label>Id lexem:
- <input id="lexemeId" type="text" size="10" name="lexemeId"/>
- </label><br/>
+ <input id="lexemeId" type="hidden" size="10" name="lexemeId"/>
- <label>Lexem:
- <input id="lexeme" type="text" size="15" name="lexeme"/>
+ <label>Text de afișat
+ <input id="label" type="text" size="20" name="label"/>
</label><br/>
<label>Coordonatele centrului etichetei:
Modified: templates/common/bits/tagsInfo.ihtml
==============================================================================
--- templates/common/bits/tagsInfo.ihtml Sat Sep 21 23:24:03 2013 (r998)
+++ templates/common/bits/tagsInfo.ihtml Sun Sep 22 00:51:50 2013 (r999)
@@ -3,7 +3,7 @@
<div id="{$img.lexeme}">
<p>{$img.width}, {$img.height}</p>
{foreach from=$img.tags item=tag}
- <p>{$tag.textX}, {$tag.textY}, {$tag.imgX}, {$tag.imgY}, "{$tag.label}"</p>
+ <p>{$tag.textX}, {$tag.textY}, {$tag.imgX}, {$tag.imgY}, "{$tag.label}", "{$tag.lexeme}"</p>
{/foreach}
</div>
{/foreach}
Modified: wwwbase/admin/visualTag.php
==============================================================================
--- wwwbase/admin/visualTag.php Sat Sep 21 23:24:03 2013 (r998)
+++ wwwbase/admin/visualTag.php Sun Sep 22 00:51:50 2013 (r999)
@@ -13,7 +13,7 @@
if($action == 'save') {
$imageId = util_getRequestParameter('imageId');
$lexemeId = util_getrequestParameter('lexemeId');
- $lexeme = util_getRequestParameter('lexeme');
+ $label = util_getRequestParameter('label');
$xTag = util_getRequestParameter('xTag');
$yTag = util_getRequestParameter('yTag');
$xImg = util_getRequestParameter('xImg');
@@ -22,7 +22,7 @@
$line = Model::factory('VisualTag')->create();
$line->imageId = $imageId;
$line->lexemeId = $lexemeId;
- $line->label = $lexeme;
+ $line->label = $label;
$line->textXCoord = $xTag;
$line->textYCoord = $yTag;
$line->imgXCoord = $xImg;
Modified: wwwbase/js/dexGallery.js
==============================================================================
--- wwwbase/js/dexGallery.js Sat Sep 21 23:24:03 2013 (r998)
+++ wwwbase/js/dexGallery.js Sun Sep 22 00:51:50 2013 (r999)
@@ -51,7 +51,7 @@
}
// Removes only the dummy text layer, used only for getting dimensions
- canvas.removeLayerGroup('Pre');
+ canvas.removeLayerGroup('DummyText');
}
}
@@ -62,8 +62,8 @@
// Draws a dummy text to get its dimensions
canvas.drawText({
layer: true,
- name: 'pre' + tagNo,
- groups: ['Pre'],
+ name: 'dummyText' + tagNo,
+ groups: ['DummyText'],
fromCenter: true,
strokeStyle: '#fff',
strokeWidth: 2,
@@ -93,15 +93,15 @@
fromCenter: true,
fillStyle: '#fff',
x: tagData[0], y: tagData[1],
- width: canvas.measureText('pre' + tagNo).width + tagNamePadding,
- height: canvas.measureText('pre' + tagNo).height + tagNamePadding
+ width: canvas.measureText('dummyText' + tagNo).width + tagNamePadding,
+ height: canvas.measureText('dummyText' + tagNo).height + tagNamePadding
})
// Rewrites the text over the recatngle
.drawText({
layer: true,
name: 'tagName' + tagNo,
- groups: ['TagNames'],
+ groups: ['TagsName'],
fromCenter: true,
fillStyle: '#000',
strokeWidth: 2,
@@ -114,7 +114,7 @@
mouseover: 'pointer'
},
click: function() {
- window.open('http://www.dexonline.ro/definitie/' + tagData[4], '_self');
+ window.open('http://www.dexonline.ro/definitie/' + tagData[5], '_self');
}
});
}
Modified: wwwbase/js/visualTag.js
==============================================================================
--- wwwbase/js/visualTag.js Sat Sep 21 23:24:03 2013 (r998)
+++ wwwbase/js/visualTag.js Sun Sep 22 00:51:50 2013 (r999)
@@ -83,18 +83,18 @@
text = text.match(/^[^ \(]+/);
$('#lexemeId').val(id);
- $('#lexeme').val(text);
+ $('#label').val(text);
});
}
function validateTag() {
- var lexeme = $('#lexeme').val();
+ var label = $('#label').val();
var xImg = $('#xImg').val();
var yImg = $('#yImg').val();
var xTag = $('#xTag').val();
var yTag = $('#yTag').val();
- if(!lexeme) {
+ if(!label) {
alert('Ai uitat să completezi câmpul Cuvânt');
return false;
Modified: wwwbase/search.php
==============================================================================
--- wwwbase/search.php Sat Sep 21 23:24:03 2013 (r998)
+++ wwwbase/search.php Sun Sep 22 00:51:50 2013 (r999)
@@ -300,7 +300,7 @@
SmartyWrap::assign('paradigmLink', $paradigmLink);
SmartyWrap::assign('advancedSearch', $text || $sourceId);
-/* Test */
+/* Gallery */
if(!empty($lexems)){
$images = array(); $allTags = array(); $size = array();
@@ -327,9 +327,11 @@
if(!empty($rows)) {
foreach($rows as $row) {
// If so, each tag information is stored as an entry in the $tagInfo array
+ $word = Lexem::get_by_id($row->lexemeId);
$tagInfo = array('label' => $row->label, 'textX' => $row->textXCoord,
'textY' => $row->textYCoord, 'imgX' => $row->imgXCoord,
- 'imgY' => $row->imgYCoord);
+ 'imgY' => $row->imgYCoord,
+ 'lexeme' => !empty($word) ? $word->formUtf8General : '');
// and every tag represents an entry in the $imgTags array.
$imgTags[] = $tagInfo;
}
@@ -348,7 +350,7 @@
SmartyWrap::addCss('gallery');
SmartyWrap::addJs('gallery');
}
-/* Test */
+/* Gallery */
if (!$xml) {
SmartyWrap::addCss('paradigm');
More information about the Dev
mailing list