From cecc2d3e1eb1686e2992b3f85a165ac5e593b86d Mon Sep 17 00:00:00 2001 From: Andreas Granig Date: Sun, 3 Aug 2014 14:10:13 +0200 Subject: [PATCH] MT#8299 Cosmetical fixes for dev models. --- share/static/js/libs/ngcp-annotate.js | 6 +++--- share/templates/customer/details.tt | 3 --- share/templates/device/list.tt | 8 ++++++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/share/static/js/libs/ngcp-annotate.js b/share/static/js/libs/ngcp-annotate.js index 0cd943c254..224fa60af0 100644 --- a/share/static/js/libs/ngcp-annotate.js +++ b/share/static/js/libs/ngcp-annotate.js @@ -16,11 +16,11 @@ switch(pos) { case "top": top = linkPosition.top - 5 - $el.outerHeight(); - left = linkPosition.left - 9 - $el.outerWidth()/2; + left = linkPosition.left - $el.outerWidth()/2; break; case "bottom": - top = linkPosition.top - 11 + $el.outerHeight(); - left = linkPosition.left - 9 - $el.outerWidth()/2; + top = linkPosition.top - 15 + $el.outerHeight(); + left = linkPosition.left - $el.outerWidth()/2; break; case "left": top = linkPosition.top - $el.outerHeight()/2; diff --git a/share/templates/customer/details.tt b/share/templates/customer/details.tt index c1a60ebdd4..ad40bbc8b9 100644 --- a/share/templates/customer/details.tt +++ b/share/templates/customer/details.tt @@ -589,14 +589,11 @@ .annotated { position: relative; - left: -50px; margin: 20px 20px 0 20px; } .annotated img { display: block; - width: 600px; - max-width: 600px; } .annotated a { diff --git a/share/templates/device/list.tt b/share/templates/device/list.tt index 17f6298cc7..04f5af8753 100644 --- a/share/templates/device/list.tt +++ b/share/templates/device/list.tt @@ -42,11 +42,15 @@ helper.form_object = form; helper.ajax_uri = c.uri_for('/device/model/ajax'); + helper.dt_buttons = [ + { name = c.loc('Front Image'), uri = "/device/model/'+full.id+'/frontimage", class = 'btn-small btn-tertiary', icon = 'icon-picture' }, + { name = c.loc('MAC Image'), uri = "/device/model/'+full.id+'/macimage", class = 'btn-small btn-tertiary', icon = 'icon-picture' }, + ]; UNLESS c.user.read_only; - helper.dt_buttons = [ + helper.dt_buttons = helper.dt_buttons.merge([ { name = c.loc('Delete'), uri = "/device/model/'+full.id+'/delete", class = 'btn-small btn-secondary', icon = 'icon-trash' }, { name = c.loc('Edit'), uri = "/device/model/'+full.id+'/edit", class = 'btn-small btn-primary', icon = 'icon-edit' }, - ]; + ]); END; PROCESS 'helpers/datatables.tt';