refactoribng

philippK-de · Sep 29, 2016 · 01ba010 · 01ba010
1 parent ce496c7
commit 01ba010
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 23 deletions.
diff --git a/templates/standard/projectCurrentMilestones.tpl b/templates/standard/projectCurrentMilestones.tpl
@@ -89,8 +89,8 @@
                                     <h2 v-if="milestone.hasTasklist">{/literal}{#tasklists#}{literal}</h2>
 
                                     <div v-if="milestone.hasTasklist" class="inwrapper">
-                                        <ul style="list-style-type:none;">
-                                            <li v-for="tasklist in milestone.tasklists">
+                                        <ul class="list-style-none">
+                                            <li class="list-style-none" v-for="tasklist in milestone.tasklists">
                                                 <div class="itemwrapper">
 
                                                     <table cellpadding="0" cellspacing="0" border="0">
@@ -101,7 +101,7 @@
                                                                 <a href="managetasklist.php?action=showtasklist&amp;tlid={{*tasklist.ID}}&amp;id={{*tasklist.project}}"
                                                                    title="{{*tasklist.name}}">
                                                                     <img src="./templates/standard/theme/standard/images/symbols/tasklist.png"
-                                                                         style="width: 32px; height: auto;" alt=""/>
+                                                                         class="fileicon" alt=""/>
                                                                 </a>
                                                             </td>
                                                             <td class="rightmen" valign="top">

diff --git a/templates/standard/projectUpcomingMilestones.tpl b/templates/standard/projectUpcomingMilestones.tpl
@@ -62,9 +62,10 @@
                         <a class="tool_edit" href="managemilestone.php?action=editform&amp;mid={{*milestone.ID}}&amp;id={{*milestone.project}}" title="{/literal}{#edit#}"></a>
                     {/if}
                     {if $userpermissions.milestones.del}
+                    {literal}
                         <a class="tool_del"
-                           href="javascript:confirmfunction('{#confirmdel#}','deleteElement(\'miles_{$upcomingStones[ustone].ID}\',\'managemilestone.php?action=del&amp;mid={$upcomingStones[ustone].ID}&amp;id={$project.ID}\')');"
-                           title="{#delete#}"></a>
+                        href="javascript:confirmDelete('{/literal}{#confirmdel#}{literal}','miles_{{*milestone.ID}}','managemilestone.php?action=del&amp;mid={{*milestone.ID}}&amp;id={{*milestone.project}}', projectMilestonesView);"
+                        title="{/literal}{#delete#}"></a>
                     {/if}
                 </td>
             </tr>
@@ -83,7 +84,7 @@
 
                                     <div class="inwrapper">
                                         <ul class="list-style-none">
-                                            <li v-for="tasklist in milestone.tasklists">
+                                            <li class="list-style-none" v-for="tasklist in milestone.tasklists">
                                                 <div class="itemwrapper">
                                                     <table cellpadding="0" cellspacing="0" border="0">
                                                         <tr>
@@ -92,7 +93,7 @@
                                                             <td class="thumb">
                                                                 <a href="managetasklist.php?action=showtasklist&amp;tlid={{tasklist.ID}}&amp;id={{*tasklist.project}}"
                                                                    title="{{*tasklist.name}}">
-                                                                    <img src="./templates/{$settings.template}/theme/{$settings.theme}/images/symbols/tasklist.png"
+                                                                    <img src="./templates/standard/theme/standard/images/symbols/tasklist.png"
                                                                          alt=""/>
                                                                 </a>
                                                             </td>
@@ -106,20 +107,17 @@
                                                                    title="{{*tasklist.name}}">
                                                                     {{*tasklist.name | truncate '10' }}
                                                                 </a>
-																							</span>
+                                                            </span>
                                                             </td>
                                                         <tr/>
                                                     </table>
 
                                                 </div>
-                                                {*itemwrapper End*}
-                                            </li>
-                                            {/section} <!--loop Tasklists End-->
+                                            </li><!--loop Tasklists End-->
 
                                         </ul>
                                     </div>
                                     <!--inwrapper End-->
-
                                 </template>
                             </div>
                         </div>

diff --git a/templates/standard/projectmilestones.tpl b/templates/standard/projectmilestones.tpl
@@ -62,6 +62,7 @@
 
         addMilestoneForm = document.getElementById("addmilestoneform");
         formView = projectMilestonesView;
+        formView.doUpdate = true;
         addMilestoneForm.addEventListener("submit", submitForm.bind(formView));
     });
 

diff --git a/templates/standard/tasklist.tpl b/templates/standard/tasklist.tpl
@@ -5,17 +5,18 @@
 <div id="content-left-in">
 <div class="tasks">
 
-	<div class="infowin_left" style = "display:none;" id = "systemmsg">
-		{if $mode == "edited"}
-			<span class="info_in_yellow"><img src="templates/standard/img/symbols/tasklist.png" alt=""/>{#tasklistwasedited#}</span>
-		{/if}
-	</div>
-
-	{literal}
-		<script type = "text/javascript">
-			apperar = new Effect.Appear('systemmsg', { duration: 2.0 })
-		</script>
-	{/literal}
+    <div class="infowin_left display-none"
+         id="taskSystemMessage"
+         data-icon="templates/{$settings.template}/theme/{$settings.theme}/images/symbols/task.png"
+         data-text-deleted="{#taskwasdeleted#}"
+         data-text-edited="{#taskwasedited#}"
+         data-text-added="{#taskwasadded#}"
+         data-text-closed="{#taskwasclosed#}"
+         data-text-opened="{#taskwasopened#}"
+         data-text-assigned="{#taskwasassigned#}"
+         data-text-deassigned="{#taskwasdeassigned#}"
+            >
+    </div>
 
 	<div class="breadcrumb">
 		<a href="manageproject.php?action=showproject&amp;id={$project.ID}"><img src="./templates/{$settings.template}/theme/{$settings.theme}/images/symbols/projects.png" alt="" />{$projectname|truncate:40:"...":true}</a>