Skip to content
This repository has been archived by the owner on Jan 19, 2022. It is now read-only.

delete extraneous html (lolhaml) fixes #60 #63

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/descartes/public/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ fieldset.collapse.in#metrics_graph_form {
margin-left: 20px;
}

.collapse.in form#graph_url ul li *, .collapse.in form#dashboard_new ul li * {
.collapse.in form#graph_url , .collapse.in form#dashboard_new {
position: relative;
float: right;
margin-right: 25px;
Expand Down
34 changes: 11 additions & 23 deletions lib/descartes/views/graphs/list.haml
Original file line number Diff line number Diff line change
Expand Up @@ -27,41 +27,29 @@
/ Form for deleting graphs
%fieldset#destroy_form{ :class => "collapse" }
#destroy_warning.span9.offset1
%ul.span8
%li.span4.offset1
%div.span8
%div.span4.offset1
%span
You have enabled a destructive mode. Click to select any graphs you wish to delete, then click the button to the right.
%li.span2
%div.span2
%button{ :class => "destroy_submit btn btn-danger btn-large" } Delete Graphs
/ Forms for importing graphs from saved / by url
%fieldset#import_form{ :class => "collapse" }
%form{ :id => "graph_select", :method => "post", :action => "/graphs" }
%ul
%li
%select{ :id => "node", :name => "node[]", :multiple => "multiple" }
%li
%button{ :class => "import_submit btn btn-primary", :name => "submit", :type => "submit" } Import Saved Graphs
%select{ :id => "node", :name => "node[]", :multiple => "multiple" }
%button{ :class => "import_submit btn btn-primary", :name => "submit", :type => "submit" } Import Saved Graphs
%form{ :id => "graph_url", :method => "post", :action => "/graphs" }
%ul
%li
%button{ :class => "import_submit btn btn-primary", :name => "submit", :type => "submit" } Import from URL
%li
%input{ :class => "graph_url span3", :id => "node", :name => "node[]", :placeholder => "Graph URL" }
%input{ :class => "graph_url span3", :id => "node", :name => "node[]", :placeholder => "Graph URL" }
%button{ :class => "import_submit btn btn-primary", :name => "submit", :type => "submit" } Import from URL
/ Forms for creating / adding-to dashboards
%fieldset#dashboard_form{ :class => "collapse" }
#dashboard_select
%ul
%li
%select{ :id => "dashboard_select", :name => "dashboard_select" }
%li
%button{ :class => "dashboard_submit btn btn-primary" } Add to Selected Dashboard
%select{ :id => "dashboard_select", :name => "dashboard_select" }
%button{ :class => "dashboard_submit btn btn-primary" } Add to Selected Dashboard
#dashboard_new
%form{ :id => "dashboard_new", :method => "post", :action => "/dashboards" }
%ul
%li
%input{ :class => "dashboard_name span3", :id => "name", :name => "name", :placeholder => "Dashboard Name" }
%li
%button{ :class => "dashboard_submit btn btn-primary", :name => "submit", :type => "submit" } Create Dashboard
%input{ :class => "dashboard_name span3", :id => "name", :name => "name", :placeholder => "Dashboard Name" }
%button{ :class => "dashboard_submit btn btn-primary", :name => "submit", :type => "submit" } Create Dashboard
.graphs
%script{ :type => "text/javascript", :src => "/js/render-graph.js" }
%script{ :type => "text/javascript", :src => "/js/render-common.js" }