Merge from github/develop

This commit is contained in:
2011-12-22 11:30:21 +00:00
2 changed files with 3 additions and 3 deletions

View File

@@ -41,7 +41,7 @@
{$service->description|escape:html} {$service->description|escape:html}
</td> </td>
<td> <td>
<button class='btn info' onclick="document.location.href='{$base_uri}admin/service/id/{$service->id}/';return false;">Edit</button> <button class='btn primary' onclick="document.location.href='{$base_uri}admin/service/id/{$service->id}/';return false;">Edit Service</button>
<button class='btn danger' onclick="sb.admin.deleteItem('{$base_uri}admin/tab/services/do/delete-service/id/{$service->id}/');">Delete</button> <button class='btn danger' onclick="sb.admin.deleteItem('{$base_uri}admin/tab/services/do/delete-service/id/{$service->id}/');">Delete</button>
</td> </td>
</tr> </tr>

View File

@@ -64,8 +64,8 @@
{$site->description|escape:html} {$site->description|escape:html}
</td> </td>
<td> <td>
<button class='btn info' onclick="document.location.href='{$base_uri}admin/site/service/{$service->id}/id/{$site->id}/';return false;">Edit</button> <button class='btn primary' onclick="document.location.href='{$base_uri}admin/site/service/{$service->id}/id/{$site->id}/';return false;">Edit Site</button>
<button style="margin-left:10px" class='btn danger' onclick="sb.admin.deleteItem('{$base_uri}admin/service/do/delete-site/id/{$service->id}/site/{$site->id}/');">Delete</button> <button style="margin-left:10px" class='btn danger' onclick="sb.admin.deleteItem('{$base_uri}admin/service/do/delete-site/id/{$service->id}/site/{$site->id}/');">Delete Site</button>
</td> </td>
</tr> </tr>
{/foreach} {/foreach}