[dev] [commit] r922 - templates/admin wwwbase/admin wwwbase/elfinder-connector wwwbase/styles
automailer at dexonline.ro
automailer at dexonline.ro
Fri Aug 2 13:57:39 EEST 2013
Author: cata
Date: Fri Aug 2 13:57:39 2013
New Revision: 922
Log:
Minor fixes for r921.
Modified:
templates/admin/visualTag.ihtml
wwwbase/admin/visualTag.php
wwwbase/elfinder-connector/visual_connector.php
wwwbase/styles/flex.css
Modified: templates/admin/visualTag.ihtml
==============================================================================
--- templates/admin/visualTag.ihtml Wed Jul 31 21:22:33 2013 (r921)
+++ templates/admin/visualTag.ihtml Fri Aug 2 13:57:39 2013 (r922)
@@ -1,55 +1,55 @@
<br/>
-<div class="floatMe">
- {if count($msg) == 0}
- <img src="{$imagePath}" id="jcrop"/>
- <label>Coordonatele centrului selecției:
- <input id="x" type="text" size="4" name="x"/>
- <input id="y" type="text" size="4" name="y"/>
- </label>
- <button type="button" id="clrSel">Șterge selecția</button>
- <form action="visualTag.php" method="post">
- <input type="hidden" value="{$imageId}" name="imageId"/>
- <button type="submit" name="action" value="finishedTagging">
- Etichetarea este completă
- </button>
- </form>
-</div>
-
-<div>
- <form action="visualTag.php" method="post">
- <label>Id imagine:
- <input type="text" size="4" value="{$imageId}" name="imageId"/>
- </label><br/>
- <label>Cuvânt:
- <input type="text" size="15" name="lexem"/>
- </label><br/>
- <label>Coordonatele centrului etichetei:
- <input id="xTag" type="text" size="4" name="xTag"/>
- <input id="yTag" type="text" size="4" name="yTag"/>
- <button id="setCoordTag" type="button">Setează coordonatele</button>
- </label><br/>
- <label>Coordonatele centrului zonei indicate:
- <input id="xImg" type="text" size="4" name="xImg"/>
- <input id="yImg" type="text" size="4" name="yImg"/>
- <button id="setCoordImg" type="button">Setează coordonatele</button>
- </label><br/>
- <label>Tag principal?
- <input type="radio" name="isMain" value="1"/>Da
- <input type="radio" name="isMain" value="0"/>Nu
- </label><br/>
- <button id="saveSel" type="submit" name="action" value="save">Salvează eticheta</button>
- </form>
-
- <h3>Etichete salvate</h3>
- <form action="visualTag.php" method="post">
- {foreach from=$savedTags item=tag}
- <label>{$tag->label}
- <input type="hidden" name="savedTagId" value="{$tag->id}"/>
- <button type="submit" name="action" value="delete">Șterge eticheta</button>
+{if $anyUntaggedImages}
+ <div class="visualTagCanvas">
+ <img src="{$imagePath}" id="jcrop"/>
+ <label>Coordonatele centrului selecției:
+ <input id="x" type="text" size="4" name="x"/>
+ <input id="y" type="text" size="4" name="y"/>
+ </label>
+ <button type="button" id="clrSel">Șterge selecția</button>
+ <form action="visualTag.php" method="post">
+ <input type="hidden" value="{$imageId}" name="imageId"/>
+ <button type="submit" name="action" value="finishedTagging">
+ Etichetarea este completă
+ </button>
+ </form>
+ </div>
+
+ <div>
+ <form action="visualTag.php" method="post">
+ <label>Id imagine:
+ <input type="text" size="4" value="{$imageId}" name="imageId"/>
</label><br/>
- {/foreach}
- </form>
- {else}
- <p>{$msg}</p>
- {/if}
-</div>
+ <label>Cuvânt:
+ <input type="text" size="15" name="lexem"/>
+ </label><br/>
+ <label>Coordonatele centrului etichetei:
+ <input id="xTag" type="text" size="4" name="xTag"/>
+ <input id="yTag" type="text" size="4" name="yTag"/>
+ <button id="setCoordTag" type="button">Setează coordonatele</button>
+ </label><br/>
+ <label>Coordonatele centrului zonei indicate:
+ <input id="xImg" type="text" size="4" name="xImg"/>
+ <input id="yImg" type="text" size="4" name="yImg"/>
+ <button id="setCoordImg" type="button">Setează coordonatele</button>
+ </label><br/>
+ <label>Etichetă principală?
+ <input type="radio" name="isMain" value="1"/>Da
+ <input type="radio" name="isMain" value="0"/>Nu
+ </label><br/>
+ <button id="saveSel" type="submit" name="action" value="save">Salvează eticheta</button>
+ </form>
+
+ <h3>Etichete salvate</h3>
+ <form action="visualTag.php" method="post">
+ {foreach from=$savedTags item=tag}
+ <label>{$tag->label}
+ <input type="hidden" name="savedTagId" value="{$tag->id}"/>
+ <button type="submit" name="action" value="delete">Șterge eticheta</button>
+ </label><br/>
+ {/foreach}
+ </form>
+ </div>
+{else}
+ <p>Toate imaginile au fost revizuite. Mulțumim!</p>
+{/if}
Modified: wwwbase/admin/visualTag.php
==============================================================================
--- wwwbase/admin/visualTag.php Wed Jul 31 21:22:33 2013 (r921)
+++ wwwbase/admin/visualTag.php Fri Aug 2 13:57:39 2013 (r922)
@@ -45,6 +45,7 @@
//$line = Model::factory('Visual')->where('revised', 0)->find_one();
$line = Visual::get_by_revised(0);
+SmartyWrap::assign('anyUntaggedImages', !empty($line));
if(!empty($line)) {
$imagePath = $rootPath . $line->path;
$imageId = $line->id;
@@ -54,13 +55,9 @@
SmartyWrap::assign('savedTags', $tags);
SmartyWrap::assign('imagePath', $imagePath);
SmartyWrap::assign('imageId', $imageId);
-
-} else {
- $msg = 'Toate imaginile au fost revizuite. Mulțumim!';
- SmartyWrap::assign('msg', $msg);
}
-SmartyWrap::assign('sectionTitle', 'Tăguire imagini pentru definiții');
+SmartyWrap::assign('sectionTitle', 'Etichetare imagini pentru definiții');
SmartyWrap::addCss('jcrop');
SmartyWrap::addJs('jquery', 'jcrop', 'visualTag');
SmartyWrap::displayAdminPage('admin/visualTag.ihtml');
Modified: wwwbase/elfinder-connector/visual_connector.php
==============================================================================
--- wwwbase/elfinder-connector/visual_connector.php Wed Jul 31 21:22:33 2013 (r921)
+++ wwwbase/elfinder-connector/visual_connector.php Fri Aug 2 13:57:39 2013 (r922)
@@ -50,9 +50,9 @@
'path' => '../img/visual/', // path to files (REQUIRED)
'URL' => util_getFullServerUrl() . '/img/visual/', // URL to files (REQUIRED)
'accessControl' => 'access', // disable and hide dot starting files (OPTIONAL)
- 'alias' => 'Imagini cuvântul zilei', // display this instead of root directory name
+ 'alias' => 'Imagini pentru definiții', // display this instead of root directory name
'uploadAllow' => array('image'), // mimetypes allowed to upload
- 'disabled' => array('resize, mkfile, duplicate'), // list of not allowed commands
+ 'disabled' => array('resize', 'mkfile', 'duplicate'), // list of not allowed commands
'imgLib' => 'gd', // image manipulation library (imagick, mogrify, gd)
'tmbPath' => '.tmb', // directory name for image thumbnails. Set to "" to avoid thumbnails generation
)
Modified: wwwbase/styles/flex.css
==============================================================================
--- wwwbase/styles/flex.css Wed Jul 31 21:22:33 2013 (r921)
+++ wwwbase/styles/flex.css Fri Aug 2 13:57:39 2013 (r922)
@@ -391,6 +391,6 @@
}
/* VisualTag */
-.floatMe {
+.visualTagCanvas {
float: left;
}
More information about the Dev
mailing list