[dev] [commit] r1031 - templates/admin wwwbase/ajax wwwbase/js wwwbase/styles

[Cătălin Frâncu]

Arată bine.

On 10/23/2013 11:22 AM, automailer at dexonline.ro wrote:
> Author: grigoroiualex
> Date: Wed Oct 23 11:22:02 2013
> New Revision: 1031
>
> Log:
> Made some minor changes and fixed some bugs
>
> Modified:
>     templates/admin/visualTagging.ihtml
>     wwwbase/ajax/visualGetImageTags.php
>     wwwbase/ajax/visualImagesEdit.php
>     wwwbase/ajax/visualTagsEdit.php
>     wwwbase/js/visualTag.js
>     wwwbase/styles/visualDict.css
>
> Modified: templates/admin/visualTagging.ihtml
> ==============================================================================
> --- templates/admin/visualTagging.ihtml	Tue Oct 22 20:34:18 2013	(r1030)
> +++ templates/admin/visualTagging.ihtml	Wed Oct 23 11:22:02 2013	(r1031)
> @@ -1,6 +1,6 @@
>   <br/>
>   {if !$imgLexemeId}
> -  <div id="visualTagCanvas">
> +  <div id="fixedCanvas" class="imageHolder">
>       <img class="visualTagImg" src="{$imagePath}"/>
>     </div>
>     <div>
> @@ -18,8 +18,8 @@
>
>   {else}
>     {include file="common/bits/prototypes.ihtml"}
> -  <div id="visualTagCanvas">
> -    <img  id="jcrop" class="visualTagImg" src="{$imagePath}" title="{$imageId}"/>
> +  <div id="jCropCanvas" class="imageHolder">
> +    <img id="jcrop" class="visualTagImg" src="{$imagePath}" title="{$imageId}"/>
>       <div id="selectionOptions">
>         <label>Coordonatele centrului selecției:
>           <input id="x" type="text" size="4" name="x"/>
> @@ -104,7 +104,8 @@
>     Dacă imaginea nu apare după un refresh, înseamnă că ea lipsește din
>     din sistemul de fișiere. Pentru a te asigura că aceasta este
>     situația, mergi la pagina cu tabelele centralizatoare și verifică
> -  dacă ea se găsește la linkul specificat.
> +  dacă ea se găsește la linkul specificat. Dacă într-adevăr lipsește,
> +  te rog șterge-o din tabelul centralizator în care se află.
>   </p>
>
>   <div class="extraAdminHeaderLinks">
>
> Modified: wwwbase/ajax/visualGetImageTags.php
> ==============================================================================
> --- wwwbase/ajax/visualGetImageTags.php	Tue Oct 22 20:34:18 2013	(r1030)
> +++ wwwbase/ajax/visualGetImageTags.php	Wed Oct 23 11:22:02 2013	(r1031)
> @@ -6,7 +6,7 @@
>   $page = util_getRequestParameter('page');
>   $limit = util_getRequestParameter('rows');
>   $usage = util_getRequestParameter('usage');
> -$resp = array();
> +$resp = array(); $tags = array();
>
>   if($usage == 'table') {
>     $total = Model::factory('VisualTag')->where('imageId', $imageId)->count();
> @@ -34,4 +34,4 @@
>   }
>
>   echo json_encode($resp);
> -?>
> \ No newline at end of file
> +?>
>
> Modified: wwwbase/ajax/visualImagesEdit.php
> ==============================================================================
> --- wwwbase/ajax/visualImagesEdit.php	Tue Oct 22 20:34:18 2013	(r1030)
> +++ wwwbase/ajax/visualImagesEdit.php	Wed Oct 23 11:22:02 2013	(r1031)
> @@ -12,6 +12,8 @@
>         $line->delete();
>       }
>       break;
> -}
>
> -?>
> \ No newline at end of file
> +  default:
> +    break;
> +}
> +?>
>
> Modified: wwwbase/ajax/visualTagsEdit.php
> ==============================================================================
> --- wwwbase/ajax/visualTagsEdit.php	Tue Oct 22 20:34:18 2013	(r1030)
> +++ wwwbase/ajax/visualTagsEdit.php	Wed Oct 23 11:22:02 2013	(r1031)
> @@ -30,10 +30,10 @@
>       $line = VisualTag::get_by_id($id);
>     	
>       if(!empty($line)){
> -      $line->textXCoord = util_getRequestParameter('xTag');
> -      $line->textYCoord = util_getRequestParameter('yTag');;
> -      $line->imgXCoord = util_getRequestParameter('xImg');
> -      $line->imgYCoord = util_getRequestParameter('yImg');
> +      $line->textXCoord = util_getRequestParameter('textX');
> +      $line->textYCoord = util_getRequestParameter('textY');;
> +      $line->imgXCoord = util_getRequestParameter('imgX');
> +      $line->imgYCoord = util_getRequestParameter('imgY');
>         $line->label = util_getRequestParameter('label');
>         $line->save();
>     	}
>
> Modified: wwwbase/js/visualTag.js
> ==============================================================================
> --- wwwbase/js/visualTag.js	Tue Oct 22 20:34:18 2013	(r1030)
> +++ wwwbase/js/visualTag.js	Wed Oct 23 11:22:02 2013	(r1031)
> @@ -257,6 +257,6 @@
>      missing from the database */
>   function imageLoadError() {
>     $('.visualTagImg').error(function() {
> -    $('#visualTagCanvas').html($('.missingImageError').css('display', 'block'));
> +    $('.imageHolder').html($('.missingImageError').css('display', 'block'));
>     });
>   }
>
> Modified: wwwbase/styles/visualDict.css
> ==============================================================================
> --- wwwbase/styles/visualDict.css	Tue Oct 22 20:34:18 2013	(r1030)
> +++ wwwbase/styles/visualDict.css	Wed Oct 23 11:22:02 2013	(r1031)
> @@ -1,14 +1,9 @@
> -#visualTagCanvas {
> -  float: left;
> -  width: 500px;
> -  height: 500px;
> -}
> -
>   .jcrop-holder {
>     border: 1px solid black;
>   }
>
> -#visualTagCanvas img {
> +#jCropCanvas,
> +#fixedCanvas img {
>     float: left;
>     max-width: 500px;
>     max-height: 500px;
> _______________________________________________
> Dev mailing list
> Dev at dexonline.ro
> http://list.dexonline.ro/listinfo/dev
>