Changeset 9572 for extensions/ContestResults/admin

Timestamp:

Mar 8, 2011, 1:19:06 PM (13 years ago)

Author:

mistic100

Message:

[extensions] ContestResults 1.3

• Add error and success messages on admin page
• Add Spain (es_ES) thanks to jpr928
• Contest status is automatic and shows remaining days
• More flexibility for description fields
• Compatibility with Piwigo 2.2.0

Location:

extensions/ContestResults/admin

Files:

• get_tn.php (modified) (1 diff)
• manage.php (modified) (1 diff)
• new.php (modified) (11 diffs)
• template/config.tpl (modified) (3 diffs)
• template/manage.tpl (modified) (2 diffs)
• template/new.tpl (modified) (7 diffs)
• template/results.tpl (modified) (5 diffs)
• template/style.css (modified) (2 diffs)

extensions/ContestResults/admin/get_tn.php

@@ -10 +10 @@
 if (!pwg_db_num_rows($image)) {
         $themeconf = $template->get_template_vars('themeconf');
-        $data['TN_SRC'] = $themeconf['admin_icon_dir'] . '/errors.png';
+        //$data['TN_SRC'] = $themeconf['admin_icon_dir'] . '/errors.png';
+        $data['TN_SRC'] = 'admin/themes/default/icon/errors.png';
         $data['IMAGE_NAME'] = 'N/A';
         

extensions/ContestResults/admin/manage.php

@@ -18 +18 @@
 //                              Affichage des concours
 // +-----------------------------------------------------------------------+
-foreach (array('pending','finished') AS $status) {
-        $result = pwg_query("SELECT id, name, visible, date_begin, date_end, logo
-                FROM " . CR_TABLE_1 . "
-                WHERE status = '" . $status . "'
-                ORDER BY date_begin DESC;");
+$contests = pwg_query("SELECT 
+                id, 
+                name, 
+                visible, 
+                date_begin, 
+                date_end, 
+                logo
+        FROM " . CR_TABLE_1 . "
+        ORDER BY date_begin DESC;");
 
-        while ($contest = pwg_db_fetch_assoc($result)) {
-                $template->append('contests_'.$status, array(
-                        'NAME' => trigger_event('render_CR_content', $contest['name']),
-                        'VISIBLE' => $contest['visible'],
-                        'DATE_BEGIN' => format_date($contest['date_begin']),
-                        'DATE_END' => format_date($contest['date_end']),
-                        'LOGO' => $contest['logo'],
-                        'U_RESULTS' => CR_ADMIN . '&tab=results&contest_id=' . $contest['id'],
-                        'U_EDIT' => CR_ADMIN . '&tab=edit&contest_id=' . $contest['id'],
-                        'U_DELETE' => CR_ADMIN . '&delete_contest=' . $contest['id'],
-                        'URL' => CR_PUBLIC . $contest['id'] . '-' . str2url(trigger_event('render_CR_content', $contest['name'])),
-                ));
+while ($contest = pwg_db_fetch_assoc($contests)) {
+        if (is_date_passed($contest['date_end'])) {
+                $contest['status'] = 'finished';
+        } else { 
+                $contest['status'] = 'pending';
         }
+        $template->append('contests_'.$contest['status'], array(
+                'NAME' => trigger_event('render_CR_content', $contest['name']),
+                'VISIBLE' => $contest['visible'],
+                'DATE_BEGIN' => format_date($contest['date_begin']),
+                'DATE_END' => format_date($contest['date_end']),
+                'LOGO' => $contest['logo'],
+                'U_RESULTS' => CR_ADMIN . '&tab=results&contest_id=' . $contest['id'],
+                'U_EDIT' => CR_ADMIN . '&tab=edit&contest_id=' . $contest['id'],
+                'U_DELETE' => CR_ADMIN . '&delete_contest=' . $contest['id'],
+                'URL' => CR_PUBLIC . $contest['id'] . '-' . str2url(trigger_event('render_CR_content', $contest['name'])),
+                'DAYS' => DateDiff($contest['date_end'],date('Y-m-d')),
+        ));
 }
 

extensions/ContestResults/admin/new.php

@@ -1 +1 @@
 <?php
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
-
-// Les quatre zones de texte principales
-$textareas = array('presentation','rules','prices','final');
 
 // +-----------------------------------------------------------------------+
@@ -10 +7 @@
 if (isset($_POST['new_submit'])) {
         if ($_POST['name'] != null) {
+                // Mise en forme des descriptions
+                if (isset($_POST['description'])) {
+                        $new_description = array();
+                        foreach ($_POST['description'] as $data) {
+                                $new_description[] = array(
+                                        'name' => $data['name'],
+                                        'content' => $data['content']
+                                );
+                        }
+                        // encoder le tableau sérialisé est le seul moyen que j'ai trouvé pour pas perdre les caractères spéciaux et planter unserialize
+                        $_POST['description'] = base64_encode(serialize($new_description));
+                }
+                        
                 // Modification d'un concours
-                if (isset($_GET['contest_id'])) {
+                if (isset($_GET['contest_id'])) {       
                         pwg_query("UPDATE " . CR_TABLE_1 . " SET
                                 `name` = '" . $_POST['name'] ."',
-                                `status` = '" . $_POST['status'] ."',
                                 `visible` = '" . $_POST['visible'] ."',
                                 `date_begin` = '" . $_POST['date_begin'] ."',
@@ -21 +30 @@
                                 `banner` = '" . $_POST['banner'] ."',
                                 `summary` = '" . $_POST['summary'] ."',
-                                `presentation` = '" . $_POST['presentation'] ."',
-                                `rules` = '" . $_POST['rules'] ."',
-                                `prices` = '" . $_POST['prices'] ."',
-                                `final` = '" . $_POST['final'] ."'
+                                `description` = '" . $_POST['description'] ."'
                         WHERE `id` = " . $_GET['contest_id'] .";");
                         
@@ -41 +47 @@
                                         date_begin,
                                         date_end,
-                                        status,
                                         visible,
                                         logo,
                                         banner,
                                         summary,
-                                        presentation,
-                                        rules,
-                                        prices,
-                                        final
+                                        description
                                 )
                                 VALUES(
@@ -55 +57 @@
                                         '" . $_POST['date_begin'] ."',
                                         '" . $_POST['date_end'] ."',
-                                        '" . $_POST['status'] ."',
                                         '" . $_POST['visible'] ."',
                                         '" . $_POST['logo'] ."',
                                         '" . $_POST['banner'] ."',
                                         '" . $_POST['summary'] ."',
-                                        '" . $_POST['presentation'] ."',
-                                        '" . $_POST['rules'] ."',
-                                        '" . $_POST['prices'] ."',
-                                        '" . $_POST['final'] ."'
+                                        '" . $_POST['description'] ."'
                                 );");
                         redirect(CR_ADMIN .'&amp;tab=manage&amp;msg=added');
@@ -77 +75 @@
 //                              Définition des variables template
 // +-----------------------------------------------------------------------+    
-// Formulaire incomplet
+// Formulaire incomplet ##############################################################################################################################################################
 if ($page['errors']) {
         $template->assign(array(
                 'NAME' => $_POST['name'],
-                'STATUS' => $_POST['status'],
                 'VISIBLE' => $_POST['visible'],
                 'DATE_BEGIN' => $_POST['date_begin'],
@@ -90 +87 @@
         ));
         
-        foreach ($textareas AS $key) {
-                $template->assign(strtoupper($key), $_POST[$key]);
+        if (isset($_POST['description'])) {
+                $i=0;
+                foreach ($_POST['description'] as $data) {
+                        $template->append('description', array(
+                                        'NAME' => $data['name'],
+                                        'CONTENT' => $data['content'],
+                                        'RANK' => $i,
+                        ));
+                        $i++;
+                }
         }
 
@@ -102 +107 @@
                 'ID' => $contest['id'],
                 'NAME' => $contest['name'],
-                'STATUS' => $contest['status'],
                 'VISIBLE' => $contest['visible'],
                 'DATE_BEGIN' => $contest['date_begin'],
@@ -111 +115 @@
         ));
         
-        foreach ($textareas AS $key) {
-                $template->assign(strtoupper($key), $contest[$key]);
+        if ($contest['description'] != null) {
+                $contest['description'] = unserialize(base64_decode($contest['description']));
+                $i=0;
+                foreach ($contest['description'] AS $desc) {
+                        $template->append('description', array(
+                                'NAME' => stripslashes($desc['name']),
+                                'CONTENT' => stripslashes($desc['content']),
+                                'RANK' => $i,
+                        ));
+                        $i++;
+                }
         }
 
@@ -119 +132 @@
         $template->assign(array(
                 'NAME' => null,
-                'STATUS' => 'pending',
                 'VISIBLE' => 1,
                 'DATE_BEGIN' => date('Y-m-d'),
@@ -127 +139 @@
                 'SUMMARY' => null,
         ));
-        
-        foreach ($textareas AS $key) {
-                $template->assign(strtoupper($key), null);
-        }
 }
 

extensions/ContestResults/admin/template/config.tpl

@@ -1 @@
-{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
+{combine_script id='jquery' path='themes/default/js/jquery.min.js'}
+{combine_css id='cr_admin_style' path=$CR_PATH|@cat:'admin/template/style.css'}
 
 {html_head}
-        <link rel="stylesheet" type="text/css" href="{$CR_PATH}admin/template/style.css">
         <style type="text/css">
                 tr td:first-child {ldelim} 
@@ -9 +9 @@
                 }
         </style>
+        
         <script type="text/javascript">
-                function ToggleConfig(sel, section, fast){ldelim}
-                        var obj = $('#config_'+section);
+                function ToggleConfig(sel, section){ldelim}
+                        var obj = jQuery('#config_'+section);
                         if(sel.checked){ldelim}
-                                if(fast) obj.show();
-                                else obj.slideDown("slow");
+                                obj.show();
                         }else{ldelim}
-                                if(fast) obj.hide();
-                                else obj.slideUp("slow");
+                                obj.hide();
                         }
                 }
@@ -66 +65 @@
 
 <script type="text/javascript">
-        ToggleConfig(document.forms[0].elements['menubar_mode_link'], 'link', 1);
-        ToggleConfig(document.forms[0].elements['menubar_mode_block'], 'block', 1);
+        ToggleConfig(document.forms[0].elements['menubar_mode_link'], 'link');
+        ToggleConfig(document.forms[0].elements['menubar_mode_block'], 'block');
 </script>

extensions/ContestResults/admin/template/manage.tpl

@@ -1 @@
-{html_head}
-        <link rel="stylesheet" type="text/css" href="{$CR_PATH}admin/template/style.css">
-{/html_head}
+{combine_css id='cr_admin_style' path=$CR_PATH|@cat:'admin/template/style.css'}
 
 <h2 style="float:right;top:-24px;position:relative;font-style:italic;margin-bottom:-20px;font-size:12px;font-weight:normal;">{$CR_VERSION}</h2>
@@ -41 +39 @@
                                                         {if !empty($contest.LOGO)}<img src="{$contest.LOGO}" width="13px" class="button"/>{/if}
                                                         <strong><a href="{$contest.URL}" title="{'CR_go'|@translate}">{$contest.NAME}</a></strong> - {$contest.DATE_BEGIN} | {$contest.DATE_END}
+                                                        <span class="CR_finished">{$contest.DAYS} {'CR_days'|@translate}</span>
                                                 </p>
                                         </li>

extensions/ContestResults/admin/template/new.tpl

@@ -1 @@
-{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
-{known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"}
-
+{combine_script id='jquery' path='themes/default/js/jquery.min.js'}
+{combine_script id='jquery.ui' path='themes/default/js/ui/minified/jquery.ui.core.min.js'}
+{combine_script id='jquery.ui.sortable' path='themes/default/js/ui/minified/jquery.ui.sortable.min.js'}
+{combine_script id='jquery.cluetip' path='themes/default/js/plugins/jquery.cluetip.packed.js'}
+{combine_css id='cr_admin_style' path=$CR_PATH|@cat:'admin/template/style.css'}
 {include file='include/autosize.inc.tpl'}
 {include file='include/datepicker.inc.tpl'}
 
 {html_head}
-        <link rel="stylesheet" type="text/css" href="{$CR_PATH}admin/template/style.css">
+        <script type="text/javascript">
+                // AJOUTE UN CHAMP DE RESULTAT
+                function CreateDescField(j, new_contest){ldelim}
+                        // Si il n'y a aucun résultats on efface le message
+                        if(new_contest) document.getElementById('categoryUl').innerHTML = '';
+                        
+                        // Ajoute à la fin de la liste une nouvelle ligne de résultat vide
+                        var new_result = document.createElement('li');
+                        new_result.setAttribute('id', 'desc_'+(j));
+                        new_result.setAttribute('class', 'categoryLi virtual_cat');
+                        document.getElementById('categoryUl').appendChild(new_result);
+                        
+                        // Contenu de la ligne
+                        new_result.innerHTML = '<ul class="categoryActions"> '+
+                                        '<li> '+
+                                                '<a href="#" title="{'CR_delete_desc'|@translate}" onclick="DeleteDescField('+ j +');return false;"> '+
+                                                        '<img src="{$themeconf.admin_icon_dir}/category_delete.png" class="button" alt="{'CR_delete_result'|@translate}"/> '+
+                                                '</a> '+
+                                        '</li> '+
+                                '</ul> '+
+                                '<p> '+
+                                        '<img src="{$themeconf.admin_icon_dir}/cat_move.png" class="button drag_button" style="display:none;" title="{'Drag to re-order'|@translate}"> '+
+                                        '<input type="text" size="65" name="description['+ j +'][name]" value=""/> '+
+                                        '<textarea class="result_comment" name="description['+ j +'][content]"></textarea> '+
+                                '</p> '+
+                                '<p class="catPos">{'CR_rank'|@translate} : <input type="text" name="description['+ j +'][rank]" value=""/></p>';
+                        
+                        // Remplace le lien de création
+                        document.getElementById('AddLink').innerHTML = '<input class="submit" type="reset" onclick="CreateDescField('+ (j+1) +');return false;" value="{'CR_addfield'|@translate}"/>';
+                        
+                        // Réinitiliase les fonctions jQuery
+                        jQuery('.catPos').hide();
+                        jQuery('.drag_button').show();
+                        jQuery('.categoryLi').css('cursor', 'move');
+                        jQuery('textarea').autogrow();
+                        jQuery('textarea').css('overflow-y', 'hidden');
+                        vtip();
+                }
+                
+                // SUPPRIME UN CHAMP DE RESULTAT
+                function DeleteDescField(k){ldelim}
+                        var result = document.getElementById('desc_'+k);
+                        var parent = result.parentNode;
+                        parent.removeChild(result);
+                }
+
+                jQuery().ready(function(){ldelim}
+                        //  Drag-and-Drop
+                        jQuery('.catPos').hide();
+                        jQuery('.drag_button').show();
+                        jQuery('.categoryLi').css('cursor', 'move');
+                        jQuery('.categoryUl').sortable({ldelim}
+                                axis: 'y',
+                                opacity: 0.8
+                        });
+                        jQuery('#categoryOrdering').submit(function(){ldelim}
+                                ar = jQuery('.categoryUl').sortable('toArray');
+                                for(i=0; i<ar.length; i++) {ldelim}
+                                        cat = ar[i].split('desc_');
+                                        document.getElementsByName('description[' + cat[1] + '][rank]')[0].value = i+1;
+                                }
+                        });
+                        // Cluetip
+                        jQuery('.cluetip').cluetip({ldelim}
+                                width: 550,
+                                splitTitle: '|'
+                        });
+                });
+
+                $(function() {ldelim}
+                        $('#DateBegin').datepicker({ldelim}dateFormat:'yy-mm-dd', firstDay:1});
+                        $('#DateEnd').datepicker({ldelim}dateFormat:'yy-mm-dd', firstDay:1});
+                });
+        </script>
+
         <style type="text/css">
                 .cluetip:after {ldelim}
@@ -12 +88 @@
                 }
         </style>
-        <script type="text/javascript">
-                $(function() {ldelim}
-                        $('#DateBegin').datepicker({ldelim}dateFormat:'yy-mm-dd', firstDay:1});
-                        $('#DateEnd').datepicker({ldelim}dateFormat:'yy-mm-dd', firstDay:1});
-                });
-
-                jQuery().ready(function(){ldelim}
-                        jQuery('.cluetip').cluetip({ldelim}
-                                width: 550,
-                                splitTitle: '|'
-                        });
-                });
-        </script>
 {/html_head}
 
@@ -39 +102 @@
 </div>
 
-<form method="post" action="" class="properties">
+<form method="post" action="" class="properties" id="categoryOrdering">
         <fieldset>
                 <legend>{'Configuration'|@translate}</legend>
@@ -52 +115 @@
                         
                         <tr>
-                                <td><span class="title cluetip" title="{'CR_status'|@translate}|{'CR_help_status'|@translate}">{'CR_status'|@translate}</span></td>
-                                <td>
-                                        <label><input type="radio" name="status" value="pending" {if $STATUS == 'pending'}checked="checked"{/if}> {'CR_pending'|@translate}</label>
-                                        <label><input type="radio" name="status" value="finished" {if $STATUS == 'finished'}checked="checked"{/if}> {'CR_finished'|@translate}</label>
-                                </td>
                                 <td><span class="title cluetip" title="{'CR_visible'|@translate}|{'CR_help_visible'|@translate}">{'CR_visible'|@translate}</span></td>
                                 <td>
@@ -62 +120 @@
                                         <label><input type="radio" name="visible" value="0" {if $VISIBLE == 0}checked="checked"{/if}> {'No'|@translate}</label>
                                 </td>
+                                <td colspan="2"></td>
                         </tr>
                         <tr>
@@ -85 +144 @@
                         <tr>
                                 <td><span class="title cluetip" title="{'CR_summary'|@translate}|{'CR_help_summary'|@translate}">{'CR_summary'|@translate}</span></td>
-                                <td colspan="3"><textarea name="summary" id ="textarea" rows="4" style="width:100%;">{$SUMMARY}</textarea></td>
+                                <td colspan="3"><textarea name="summary" rows="4" style="width:100%;">{$SUMMARY}</textarea></td>
                         </tr>
                 </table>
@@ -93 +152 @@
                 <legend><span class="title cluetip" title="{'CR_textareas'|@translate}|{'CR_help_textareas'|@translate}">{'CR_textareas'|@translate}</span></legend>
                 
-                <table>                 
-                        <tr>
-                                <td><span class="title">{'CR_presentation'|@translate}</span></td>
-                                <td style="width:75%;"><textarea name="presentation" id ="textarea" rows="4" style="width:100%;">{$PRESENTATION}</textarea></td>
-                        </tr>
-                        
-                        <tr><td colspan="2"><br/></td></tr>
-                        
-                        <tr>
-                                <td><span class="title">{'CR_rules'|@translate}</span></td>
-                                <td><textarea name="rules" id ="textarea" rows="4" style="width:100%;">{$RULES}</textarea></td>
-                        </tr>
-                        
-                        <tr><td colspan="2"><br/></td></tr>
-                        
-                        <tr>
-                                <td><span class="title">{'CR_prices'|@translate}</span></td>
-                                <td><textarea name="prices" id ="textarea" rows="4" style="width:100%;">{$PRICES}</textarea></td>
-                        </tr>
-                        
-                        <tr><td colspan="2"><br/></td></tr>
-                        
-                        <tr>
-                                <td><span class="title">{'CR_final'|@translate}</span></td>
-                                <td><textarea name="final" id ="textarea" rows="4" style="width:100%;">{$FINAL}</textarea></td>
-                        </tr>
-                </table>
+                <ul class="categoryUl" id="categoryUl">
+                {counter start=0 assign=i}
+                {if isset($description)}
+                        {foreach from=$description item=desc}
+                                <li class="categoryLi" id="desc_{$i}">
+                                        <ul class="categoryActions">
+                                                <li>
+                                                        <a href="#" title="{'CR_delete_desc'|@translate}" onclick="DeleteDescField({$i});return false;">
+                                                                <img src="{$themeconf.admin_icon_dir}/category_delete.png" class="button" alt="{'CR_delete_result'|@translate}"/>
+                                                        </a>
+                                                </li>
+                                        </ul>
+                                        
+                                        <p>
+                                                <img src="{$themeconf.admin_icon_dir}/cat_move.png" class="button drag_button" style="display:none;" title="{'Drag to re-order'|@translate}">
+                                                <input type="text" size="65" name="description[{$i}][name]" value="{$desc.NAME}"/>
+                                                <textarea class="result_comment" name="description[{$i}][content]">{$desc.CONTENT}</textarea>
+                                        </p>
+                                        <p class="catPos">{'CR_rank'|@translate} : <input type="text" name="description[{$i}][rank]" value="{$desc.RANK}"/></p>
+                                </li>
+                                {counter}
+                        {/foreach}
+                {else}
+                        {'CR_no_result'|@translate}
+                {/if}
+                </ul>
+                
+                <span id="AddLink"><input class="submit" type="reset" onclick="CreateDescField({$i}{if !isset($description)}, true{/if});return false;" value="{'CR_addfield'|@translate}"/></span>
         </fieldset>
 

extensions/ContestResults/admin/template/results.tpl

@@ +1 @@
+{combine_script id='jquery' path='themes/default/js/jquery.min.js'}
+{combine_script id='jquery.ui' path='themes/default/js/ui/minified/jquery.ui.core.min.js'}
+{combine_script id='jquery.ui.sortable' path='themes/default/js/ui/minified/jquery.ui.sortable.min.js'}
+{combine_script id='jquery.cluetip' path='themes/default/js/plugins/jquery.cluetip.packed.js'}
+{combine_script id='jquery.vtip' path=$CR_PATH|@cat:'admin/template/vtip.js'}
+{combine_css id='cr_admin_style' path=$CR_PATH|@cat:'admin/template/style.css'}
 {include file='include/autosize.inc.tpl'}
 
-{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
-{known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js" }
-{known_script id="jquery.ui.sortable" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.sortable.packed.js" }
-{known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"}
-
 {html_head}
-        <link rel="stylesheet" type="text/css" href="{$CR_PATH}admin/template/style.css">
-        <script type="text/javascript" src="{$CR_PATH}admin/template/vtip.js"></script>
-
         <script type="text/javascript">
                 // AJOUTE UN CHAMP DE RESULTAT
@@ -34 +32 @@
                                         '{'CR_image_no'|@translate} <input type="text" size="6" name="results['+ j +'][image_id]" value="" onkeyup="UpdatePreview('+ j +', this);"/> '+
                                         '<span id="preview-'+ j +'"> '+
-                                                '<span class="vtip" title="<img src=\'{$themeconf.admin_icon_dir}/errors.png\'/><br>N/A"> '+
+                                                '<span class="vtip" title="<img src=\'admin/themes/default/icon/errors.png\'/><br>N/A"> '+
                                                         '<img src="{$CR_PATH}admin/template/image/images.png"/> '+
                                                 '</span> '+
@@ -44 +42 @@
                         
                         // Remplace le lien de création
-                        document.getElementById('AddLink').innerHTML = '<input class="submit" type="submit" onclick="CreateResultField('+ (j+1) +');return false;" value="{'CR_addfield'|@translate}"/>';
+                        document.getElementById('AddLink').innerHTML = '<input class="submit" type="reset" onclick="CreateResultField('+ (j+1) +');return false;" value="{'CR_addfield'|@translate}"/>';
                         
                         // Réinitiliase les fonctions jQuery
@@ -97 +95 @@
                 }
         </script>
+        
         <style type="text/css">
                 .cluetip:after {ldelim}
@@ -112 +111 @@
 <form method="post" id="categoryOrdering" action="">
         <ul class="categoryUl" id="categoryUl">
-                {counter start=0 assign=i}
-                {if isset($results)}
-                        {foreach from=$results item=result name=result_loop}
-                                <li class="categoryLi {if $result.IMAGE_NAME == 'N/A'}error_cat{/if}" id="result_{$i}">
-                                        <ul class="categoryActions">
-                                                <li>
-                                                        <a href="#" title="{'CR_delete_result'|@translate}" onclick="DeleteResultField({$i});return false;">
-                                                                <img src="{$themeconf.admin_icon_dir}/category_delete.png" class="button" alt="{'CR_delete_result'|@translate}"/>
-                                                        </a>
-                                                </li>
-                                        </ul>
+        {counter start=0 assign=i}
+        {if isset($results)}
+                {foreach from=$results item=result}
+                        <li class="categoryLi {if $result.IMAGE_NAME == 'N/A'}error_cat{/if}" id="result_{$i}">
+                                <ul class="categoryActions">
+                                        <li>
+                                                <a href="#" title="{'CR_delete_result'|@translate}" onclick="DeleteResultField({$i});return false;">
+                                                        <img src="{$themeconf.admin_icon_dir}/category_delete.png" class="button" alt="{'CR_delete_result'|@translate}"/>
+                                                </a>
+                                        </li>
+                                </ul>
+                                
+                                <p>
+                                        <img src="{$themeconf.admin_icon_dir}/cat_move.png" class="button drag_button" style="display:none;" title="{'Drag to re-order'|@translate}">
+                                        {'CR_image_no'|@translate} <input type="text" size="6" name="results[{$i}][image_id]" value="{$result.IMAGE_ID}" onkeyup="UpdatePreview({$i}, this);"/>
                                         
-                                        <p>
-                                                <img src="{$themeconf.admin_icon_dir}/cat_move.png" class="button drag_button" style="display:none;" title="{'Drag to re-order'|@translate}">
-                                                {'CR_image_no'|@translate} <input type="text" size="6" name="results[{$i}][image_id]" value="{$result.IMAGE_ID}" onkeyup="UpdatePreview({$i}, this);"/>
-                                                
-                                                <span id="preview-{$i}">
-                                                        <span class="vtip" title="<img src='{$result.TN_SRC}'/><br>{$result.IMAGE_NAME}">
-                                                                <img src="{$CR_PATH}admin/template/image/images.png"/>
-                                                        </span>
+                                        <span id="preview-{$i}">
+                                                <span class="vtip" title="<img src='{$result.TN_SRC}'/><br>{$result.IMAGE_NAME}">
+                                                        <img src="{$CR_PATH}admin/template/image/images.png"/>
                                                 </span>
-                                                
-                                                {'CR_author'|@translate} : <input type="text" name="results[{$i}][author]" value="{$result.AUTHOR}"/>
-                                                <textarea class="result_comment" name="results[{$i}][comment]">{$result.COMMENT}</textarea>
-                                        </p>
-                                        <p class="catPos">{'CR_rank'|@translate} : <input type="text" name="results[{$i}][rank]" value="{$result.RANK}"/></p>
-                                </li>
-                                {counter}
-                        {/foreach}
-                {else}
-                        {'CR_no_result'|@translate}
-                {/if}
+                                        </span>
+                                        
+                                        {'CR_author'|@translate} : <input type="text" name="results[{$i}][author]" value="{$result.AUTHOR}"/>
+                                        <textarea class="result_comment" name="results[{$i}][comment]">{$result.COMMENT}</textarea>
+                                </p>
+                                <p class="catPos">{'CR_rank'|@translate} : <input type="text" name="results[{$i}][rank]" value="{$result.RANK}"/></p>
+                        </li>
+                        {counter}
+                {/foreach}
+        {else}
+                {'CR_no_result'|@translate}
+        {/if}
         </ul>
         
         <p>
+                <span id="AddLink"><input class="submit" type="reset" onclick="CreateResultField({$i}{if !isset($results)}, true{/if});return false;" value="{'CR_addfield'|@translate}"/></span>
                 <input class="submit" type="submit" value="{'Submit'|@translate}" name="results_modify"/>
-                <span id="AddLink"><input class="submit" type="submit" onclick="CreateResultField({$i}{if !isset($results)}, true{/if});return false;" value="{'CR_addfield'|@translate}"/></a>
         </p>
 </form>

extensions/ContestResults/admin/template/style.css

@@ -9 +9 @@
         width:95%;
         min-height:40px;
-        margin-left:5%;
+        margin:0 30px;
 }
 
@@ -63 +63 @@
         z-index: 9999;
 }
+
+.CR_finished {
+        font-weight:normal;
+        font-size:0.8em;
+        letter-spacing:0.2em;
+        padding-left:10px;
+        color:#a00;
+}