8:53 a.m.
This patchset is intended to solve the issue around template duplications for the haml
templates and the jQuery templates used by backbone.
Mustache.js claims itself as logic-less template language which means e.g. there is no if
statement provided by the language. But there are existing ruby gem and a javascript
library, all ready to use.
The first patch contains a template handler for Rails. The mustache templates are used in
2 different ways:
- in rails the template compiled in the usual rails way (almost)
- for javascript the template just needs to be printed out
The template handler distinguishes the 2 mode by whether data is passed through the
:mustache key or not.
Another problem with mustache would be the absence of rails helper methods. To solve this
issue Petr and Tomas suggested some kind of template handler chaining so we could use erb
and mustache together. Real template handler chaining hasn't come to rails yet, but
something similar can be achieved. The MustacheTemplate::Handler class first compiles the
template as an erb template and evaluate the rails helper methods, then compiles as a
mustache template.
The rest of the patchset contains some refactored views.
8:53 a.m.
New subject: [PATCH conductor 1/7] Integrating Mustache with Rails
From: Imre Farkas <ifarkas(a)redhat.com>
---
src/Gemfile | 1 +
src/Gemfile.lock | 2 +
src/config/application.rb | 1 +
.../initializers/mustache_template_handler.rb | 42 ++++++++++++++++++++
4 files changed, 46 insertions(+), 0 deletions(-)
create mode 100644 src/config/initializers/mustache_template_handler.rb
diff --git a/src/Gemfile b/src/Gemfile
index 2d8e8df..529d658 100644
--- a/src/Gemfile
+++ b/src/Gemfile
@@ -7,6 +7,7 @@ gem 'sqlite3', :require => 'sqlite3'
gem 'deltacloud-client', :require => 'deltacloud'
gem 'sass'
gem 'haml'
+gem 'mustache'
gem 'will_paginate', '>= 3.0.pre1'
gem 'nokogiri'
gem 'simple-navigation'
diff --git a/src/Gemfile.lock b/src/Gemfile.lock
index 4137ff7..0506fa5 100644
--- a/src/Gemfile.lock
+++ b/src/Gemfile.lock
@@ -81,6 +81,7 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.16)
+ mustache (0.11.2)
nokogiri (1.5.0.beta.4)
oauth (0.4.4)
pg (0.11.0)
@@ -172,6 +173,7 @@ DEPENDENCIES
haml
json
launchy
+ mustache
nokogiri
oauth
pg
diff --git a/src/config/application.rb b/src/config/application.rb
index 9c0949f..a1f9833 100644
--- a/src/config/application.rb
+++ b/src/config/application.rb
@@ -42,6 +42,7 @@ else
require 'fastercsv'
require 'nokogiri'
#require 'railties'
+ require 'mustache'
unless (ENV["RAILS_ENV"] == "production")
puts "========= cucumber/test env deps loaded... =========="
diff --git a/src/config/initializers/mustache_template_handler.rb
b/src/config/initializers/mustache_template_handler.rb
new file mode 100644
index 0000000..4a02a89
--- /dev/null
+++ b/src/config/initializers/mustache_template_handler.rb
@@ -0,0 +1,42 @@
+module MustacheTemplate
+
+ class Handler
+ def self.erb_handler
+ @@erb_handler ||= ActionView::Template.registered_template_handler(:erb)
+ end
+
+ def self.call(template)
+ compiled_erb_template = erb_handler.call(template).gsub(/'/,
"\\\\'")
+ "MustacheTemplate::View.new(self,
'#{compiled_erb_template}').render.html_safe"
+ end
+ end
+
+ class View
+ def initialize(view_context, compiled_erb_template)
+ @view_context = view_context
+ @template_source = evaluate_rails_helpers(compiled_erb_template)
+ end
+
+ def render
+ renderer = @view_context.instance_variable_get('@renderer') if
@view_context.instance_variable_names.include?('@renderer')
+ options = renderer.instance_variable_get("@options") if renderer
+
+ if options && options.include?(:mustache)
+ Mustache.render(@template_source, options[:mustache]).html_safe
+ else
+ @template_source.html_safe
+ end
+ end
+
+ private
+
+ def evaluate_rails_helpers(compiled_erb_template)
+ @view_context.instance_eval do
+ eval(compiled_erb_template)
+ end
+ end
+ end
+
+end
+
+ActionView::Template.register_template_handler :mustache, MustacheTemplate::Handler
--
1.7.6.5
8:53 a.m.
New subject: [PATCH conductor 2/7] Integrating Mustache with javascript
From: Imre Farkas <ifarkas(a)redhat.com>
---
src/app/views/layouts/application.html.haml | 1 +
src/public/javascripts/mustache.js | 536 +++++++++++++++++++++++++++
2 files changed, 537 insertions(+), 0 deletions(-)
create mode 100644 src/public/javascripts/mustache.js
diff --git a/src/app/views/layouts/application.html.haml
b/src/app/views/layouts/application.html.haml
index 12e4064..174fadc 100644
--- a/src/app/views/layouts/application.html.haml
+++ b/src/app/views/layouts/application.html.haml
@@ -29,6 +29,7 @@
= javascript_include_tag "jquery.tmpl.min.js"
= javascript_include_tag "underscore-min.js"
= javascript_include_tag "backbone-min.js"
+ = javascript_include_tag "mustache.js"
= javascript_include_tag "application.js"
= javascript_include_tag "yetii-min.js"
diff --git a/src/public/javascripts/mustache.js b/src/public/javascripts/mustache.js
new file mode 100644
index 0000000..90a66d3
--- /dev/null
+++ b/src/public/javascripts/mustache.js
@@ -0,0 +1,536 @@
+/*!
+ * mustache.js - Logic-less {{mustache}} templates with JavaScript
+ * http://github.com/janl/mustache.js
+ */
+var Mustache = (typeof module !== "undefined" && module.exports) ||
{};
+
+(function (exports) {
+
+ exports.name = "mustache.js";
+ exports.version = "0.5.0-dev";
+ exports.tags = ["{{", "}}"];
+ exports.parse = parse;
+ exports.compile = compile;
+ exports.render = render;
+ exports.clearCache = clearCache;
+
+ // This is here for backwards compatibility with 0.4.x.
+ exports.to_html = function (template, view, partials, send) {
+ var result = render(template, view, partials);
+
+ if (typeof send === "function") {
+ send(result);
+ } else {
+ return result;
+ }
+ };
+
+ var _toString = Object.prototype.toString;
+ var _isArray = Array.isArray;
+ var _forEach = Array.prototype.forEach;
+ var _trim = String.prototype.trim;
+
+ var isArray;
+ if (_isArray) {
+ isArray = _isArray;
+ } else {
+ isArray = function (obj) {
+ return _toString.call(obj) === "[object Array]";
+ };
+ }
+
+ var forEach;
+ if (_forEach) {
+ forEach = function (obj, callback, scope) {
+ return _forEach.call(obj, callback, scope);
+ };
+ } else {
+ forEach = function (obj, callback, scope) {
+ for (var i = 0, len = obj.length; i < len; ++i) {
+ callback.call(scope, obj[i], i, obj);
+ }
+ };
+ }
+
+ var spaceRe = /^\s*$/;
+
+ function isWhitespace(string) {
+ return spaceRe.test(string);
+ }
+
+ var trim;
+ if (_trim) {
+ trim = function (string) {
+ return string == null ? "" : _trim.call(string);
+ };
+ } else {
+ var trimLeft, trimRight;
+
+ if (isWhitespace("\xA0")) {
+ trimLeft = /^\s+/;
+ trimRight = /\s+$/;
+ } else {
+ // IE doesn't match non-breaking spaces with \s, thanks jQuery.
+ trimLeft = /^[\s\xA0]+/;
+ trimRight = /[\s\xA0]+$/;
+ }
+
+ trim = function (string) {
+ return string == null ? "" :
+ String(string).replace(trimLeft, "").replace(trimRight, "");
+ };
+ }
+
+ var escapeMap = {
+ "&": "&",
+ "<": "<",
+ ">": ">",
+ '"': '"',
+ "'": '''
+ };
+
+ function escapeHTML(string) {
+ return String(string).replace(/&(?!\w+;)|[<>"']/g, function (s) {
+ return escapeMap[s] || s;
+ });
+ }
+
+ /**
+ * Adds the `template`, `line`, and `file` properties to the given error
+ * object and alters the message to provide more useful debugging information.
+ */
+ function debug(e, template, line, file) {
+ file = file || "<template>";
+
+ var lines = template.split("\n"),
+ start = Math.max(line - 3, 0),
+ end = Math.min(lines.length, line + 3),
+ context = lines.slice(start, end);
+
+ var c;
+ for (var i = 0, len = context.length; i < len; ++i) {
+ c = i + start + 1;
+ context[i] = (c === line ? " >> " : " ") +
context[i];
+ }
+
+ e.template = template;
+ e.line = line;
+ e.file = file;
+ e.message = [file + ":" + line, context.join("\n"), "",
e.message].join("\n");
+
+ return e;
+ }
+
+ /**
+ * Looks up the value of the given `name` in the given context `stack`.
+ */
+ function lookup(name, stack, defaultValue) {
+ if (name === ".") {
+ return stack[stack.length - 1];
+ }
+
+ var names = name.split(".");
+ var lastIndex = names.length - 1;
+ var target = names[lastIndex];
+
+ var value, context, i = stack.length, j, localStack;
+ while (i) {
+ localStack = stack.slice(0);
+ context = stack[--i];
+
+ j = 0;
+ while (j < lastIndex) {
+ context = context[names[j++]];
+
+ if (context == null) {
+ break;
+ }
+
+ localStack.push(context);
+ }
+
+ if (context && target in context) {
+ value = context[target];
+ break;
+ }
+ }
+
+ // If the value is a function, call it in the current context.
+ if (typeof value === "function") {
+ value = value.call(localStack[localStack.length - 1]);
+ }
+
+ if (value == null) {
+ return defaultValue;
+ }
+
+ return value;
+ }
+
+ function renderSection(name, stack, callback, inverted) {
+ var buffer = "";
+ var value = lookup(name, stack);
+
+ if (inverted) {
+ // From the spec: inverted sections may render text once based on the
+ // inverse value of the key. That is, they will be rendered if the key
+ // doesn't exist, is false, or is an empty list.
+ if (value == null || value === false || (isArray(value) && value.length ===
0)) {
+ buffer += callback();
+ }
+ } else if (isArray(value)) {
+ forEach(value, function (value) {
+ stack.push(value);
+ buffer += callback();
+ stack.pop();
+ });
+ } else if (typeof value === "object") {
+ stack.push(value);
+ buffer += callback();
+ stack.pop();
+ } else if (typeof value === "function") {
+ var scope = stack[stack.length - 1];
+ var scopedRender = function (template) {
+ return render(template, scope);
+ };
+ buffer += value.call(scope, callback(), scopedRender) || "";
+ } else if (value) {
+ buffer += callback();
+ }
+
+ return buffer;
+ }
+
+ /**
+ * Parses the given `template` and returns the source of a function that,
+ * with the proper arguments, will render the template. Recognized options
+ * include the following:
+ *
+ * - file The name of the file the template comes from (displayed in
+ * error messages)
+ * - tags An array of open and close tags the `template` uses. Defaults
+ * to the value of Mustache.tags
+ * - debug Set `true` to log the body of the generated function to the
+ * console
+ * - space Set `true` to preserve whitespace from lines that otherwise
+ * contain only a {{tag}}. Defaults to `false`
+ */
+ function parse(template, options) {
+ options = options || {};
+
+ var tags = options.tags || exports.tags,
+ openTag = tags[0],
+ closeTag = tags[tags.length - 1];
+
+ var code = [
+ 'var buffer = "";', // output buffer
+ "\nvar line = 1;", // keep track of source line number
+ "\ntry {",
+ '\nbuffer += "'
+ ];
+
+ var spaces = [], // indices of whitespace in code on the current line
+ hasTag = false, // is there a {{tag}} on the current line?
+ nonSpace = false; // is there a non-space char on the current line?
+
+ // Strips all space characters from the code array for the current line
+ // if there was a {{tag}} on it and otherwise only spaces.
+ var stripSpace = function () {
+ if (hasTag && !nonSpace && !options.space) {
+ while (spaces.length) {
+ code.splice(spaces.pop(), 1);
+ }
+ } else {
+ spaces = [];
+ }
+
+ hasTag = false;
+ nonSpace = false;
+ };
+
+ var sectionStack = [], updateLine, nextOpenTag, nextCloseTag;
+
+ var setTags = function (source) {
+ tags = trim(source).split(/\s+/);
+ nextOpenTag = tags[0];
+ nextCloseTag = tags[tags.length - 1];
+ };
+
+ var includePartial = function (source) {
+ code.push(
+ '";',
+ updateLine,
+ '\nvar partial = partials["' + trim(source) + '"];',
+ '\nif (partial) {',
+ '\n buffer += render(partial,stack[stack.length - 1],partials);',
+ '\n}',
+ '\nbuffer += "'
+ );
+ };
+
+ var openSection = function (source, inverted) {
+ var name = trim(source);
+
+ if (name === "") {
+ throw debug(new Error("Section name may not be empty"), template, line,
options.file);
+ }
+
+ sectionStack.push({name: name, inverted: inverted});
+
+ code.push(
+ '";',
+ updateLine,
+ '\nvar name = "' + name + '";',
+ '\nvar callback = (function () {',
+ '\n return function () {',
+ '\n var buffer = "";',
+ '\nbuffer += "'
+ );
+ };
+
+ var openInvertedSection = function (source) {
+ openSection(source, true);
+ };
+
+ var closeSection = function (source) {
+ var name = trim(source);
+ var openName = sectionStack.length != 0 && sectionStack[sectionStack.length
- 1].name;
+
+ if (!openName || name != openName) {
+ throw debug(new Error('Section named "' + name + '" was
never opened'), template, line, options.file);
+ }
+
+ var section = sectionStack.pop();
+
+ code.push(
+ '";',
+ '\n return buffer;',
+ '\n };',
+ '\n})();'
+ );
+
+ if (section.inverted) {
+ code.push("\nbuffer += renderSection(name,stack,callback,true);");
+ } else {
+ code.push("\nbuffer += renderSection(name,stack,callback);");
+ }
+
+ code.push('\nbuffer += "');
+ };
+
+ var sendPlain = function (source) {
+ code.push(
+ '";',
+ updateLine,
+ '\nbuffer += lookup("' + trim(source) +
'",stack,"");',
+ '\nbuffer += "'
+ );
+ };
+
+ var sendEscaped = function (source) {
+ code.push(
+ '";',
+ updateLine,
+ '\nbuffer += escapeHTML(lookup("' + trim(source) +
'",stack,""));',
+ '\nbuffer += "'
+ );
+ };
+
+ var line = 1, c, callback;
+ for (var i = 0, len = template.length; i < len; ++i) {
+ if (template.slice(i, i + openTag.length) === openTag) {
+ i += openTag.length;
+ c = template.substr(i, 1);
+ updateLine = '\nline = ' + line + ';';
+ nextOpenTag = openTag;
+ nextCloseTag = closeTag;
+ hasTag = true;
+
+ switch (c) {
+ case "!": // comment
+ i++;
+ callback = null;
+ break;
+ case "=": // change open/close tags, e.g. {{=<% %>=}}
+ i++;
+ closeTag = "=" + closeTag;
+ callback = setTags;
+ break;
+ case ">": // include partial
+ i++;
+ callback = includePartial;
+ break;
+ case "#": // start section
+ i++;
+ callback = openSection;
+ break;
+ case "^": // start inverted section
+ i++;
+ callback = openInvertedSection;
+ break;
+ case "/": // end section
+ i++;
+ callback = closeSection;
+ break;
+ case "{": // plain variable
+ closeTag = "}" + closeTag;
+ // fall through
+ case "&": // plain variable
+ i++;
+ nonSpace = true;
+ callback = sendPlain;
+ break;
+ default: // escaped variable
+ nonSpace = true;
+ callback = sendEscaped;
+ }
+
+ var end = template.indexOf(closeTag, i);
+
+ if (end === -1) {
+ throw debug(new Error('Tag "' + openTag + '" was not
closed properly'), template, line, options.file);
+ }
+
+ var source = template.substring(i, end);
+
+ if (callback) {
+ callback(source);
+ }
+
+ // Maintain line count for \n in source.
+ var n = 0;
+ while (~(n = source.indexOf("\n", n))) {
+ line++;
+ n++;
+ }
+
+ i = end + closeTag.length - 1;
+ openTag = nextOpenTag;
+ closeTag = nextCloseTag;
+ } else {
+ c = template.substr(i, 1);
+
+ switch (c) {
+ case '"':
+ case "\\":
+ nonSpace = true;
+ code.push("\\" + c);
+ break;
+ case "\r":
+ // Ignore carriage returns.
+ break;
+ case "\n":
+ spaces.push(code.length);
+ code.push("\\n");
+ stripSpace(); // Check for whitespace on the current line.
+ line++;
+ break;
+ default:
+ if (isWhitespace(c)) {
+ spaces.push(code.length);
+ } else {
+ nonSpace = true;
+ }
+
+ code.push(c);
+ }
+ }
+ }
+
+ if (sectionStack.length != 0) {
+ throw debug(new Error('Section "' + sectionStack[sectionStack.length -
1].name + '" was not closed properly'), template, line, options.file);
+ }
+
+ // Clean up any whitespace from a closing {{tag}} that was at the end
+ // of the template without a trailing \n.
+ stripSpace();
+
+ code.push(
+ '";',
+ "\nreturn buffer;",
+ "\n} catch (e) { throw {error: e, line: line}; }"
+ );
+
+ // Ignore `buffer += "";` statements.
+ var body = code.join("").replace(/buffer \+= "";\n/g,
"");
+
+ if (options.debug) {
+ if (typeof console != "undefined" && console.log) {
+ console.log(body);
+ } else if (typeof print === "function") {
+ print(body);
+ }
+ }
+
+ return body;
+ }
+
+ /**
+ * Used by `compile` to generate a reusable function for the given `template`.
+ */
+ function _compile(template, options) {
+ var args = "view,partials,stack,lookup,escapeHTML,renderSection,render";
+ var body = parse(template, options);
+ var fn = new Function(args, body);
+
+ // This anonymous function wraps the generated function so we can do
+ // argument coercion, setup some variables, and handle any errors
+ // encountered while executing it.
+ return function (view, partials) {
+ partials = partials || {};
+
+ var stack = [view]; // context stack
+
+ try {
+ return fn(view, partials, stack, lookup, escapeHTML, renderSection, render);
+ } catch (e) {
+ throw debug(e.error, template, e.line, options.file);
+ }
+ };
+ }
+
+ // Cache of pre-compiled templates.
+ var _cache = {};
+
+ /**
+ * Clear the cache of compiled templates.
+ */
+ function clearCache() {
+ _cache = {};
+ }
+
+ /**
+ * Compiles the given `template` into a reusable function using the given
+ * `options`. In addition to the options accepted by Mustache.parse,
+ * recognized options include the following:
+ *
+ * - cache Set `false` to bypass any pre-compiled version of the given
+ * template. Otherwise, a given `template` string will be cached
+ * the first time it is parsed
+ */
+ function compile(template, options) {
+ options = options || {};
+
+ // Use a pre-compiled version from the cache if we have one.
+ if (options.cache !== false) {
+ if (!_cache[template]) {
+ _cache[template] = _compile(template, options);
+ }
+
+ return _cache[template];
+ }
+
+ return _compile(template, options);
+ }
+
+ /**
+ * High-level function that renders the given `template` using the given
+ * `view` and `partials`. If you need to use any of the template options (see
+ * `compile` above), you must compile in a separate step, and then call that
+ * compiled function.
+ */
+ function render(template, view, partials) {
+ return compile(template)(view, partials);
+ }
+
+})(Mustache);
--
1.7.6.5
8:53 a.m.
New subject: [PATCH conductor 3/7] Mustachifying deployments/_pretty_view_show
From: Imre Farkas <ifarkas(a)redhat.com>
---
src/app/controllers/instances_controller.rb | 2 +-
src/app/helpers/application_helper.rb | 3 +
src/app/helpers/mustache_helper.rb | 38 ++++++++++
.../views/deployments/_instance_card.html.mustache | 58 +++++++++++++++
.../views/deployments/_pretty_view_show.html.haml | 78 +-------------------
src/public/javascripts/backbone/views.js | 10 ++-
6 files changed, 112 insertions(+), 77 deletions(-)
create mode 100644 src/app/helpers/mustache_helper.rb
create mode 100644 src/app/views/deployments/_instance_card.html.mustache
diff --git a/src/app/controllers/instances_controller.rb
b/src/app/controllers/instances_controller.rb
index ef04cd7..77d932a 100644
--- a/src/app/controllers/instances_controller.rb
+++ b/src/app/controllers/instances_controller.rb
@@ -28,7 +28,7 @@ class InstancesController < ApplicationController
respond_to do |format|
format.html
format.js { render :partial => 'list' }
- format.json { render :json => @instances }
+ format.json { render :json => @instances.map{ |instance|
view_context.instance_for_mustache(instance) } }
end
end
diff --git a/src/app/helpers/application_helper.rb
b/src/app/helpers/application_helper.rb
index 9e24112..8f51b57 100644
--- a/src/app/helpers/application_helper.rb
+++ b/src/app/helpers/application_helper.rb
@@ -18,6 +18,9 @@
# Likewise, all the methods added will be available for all controllers.
module ApplicationHelper
+
+ include MustacheHelper
+
def number_to_duration(input_num)
input_int = input_num.to_i
hours_to_seconds = [input_int/3600 % 24,
diff --git a/src/app/helpers/mustache_helper.rb b/src/app/helpers/mustache_helper.rb
new file mode 100644
index 0000000..4e844c7
--- /dev/null
+++ b/src/app/helpers/mustache_helper.rb
@@ -0,0 +1,38 @@
+#
+# Copyright 2012 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Filters added to this controller apply to all controllers in the application.
+# Likewise, all the methods added will be available for all controllers.
+
+module MustacheHelper
+
+ def instance_for_mustache(instance)
+ available_actions = instance.get_action_list
+
+ {
+ :id => instance.id,
+ :name => instance.name,
+ :path => instance_path(instance),
+ :uptime => count_uptime(instance.uptime),
+ :state => instance.state,
+ :public_addresses => instance.public_addresses.present? ?
instance.public_addresses : I18n.t('deployments.pretty_view_show.no_ip_address'),
+ :instance_key_present => instance.instance_key.present?,
+ :stop_enabled => available_actions.include?(InstanceTask::ACTION_STOP),
+ :reboot_enabled =>
available_actions.include?(InstanceTask::ACTION_REBOOT),
+ }
+ end
+
+end
diff --git a/src/app/views/deployments/_instance_card.html.mustache
b/src/app/views/deployments/_instance_card.html.mustache
new file mode 100644
index 0000000..4b9dcb8
--- /dev/null
+++ b/src/app/views/deployments/_instance_card.html.mustache
@@ -0,0 +1,58 @@
+<li class="instance">
+ <h3 class="name">
+ <%= link_to('{{name}}', '{{path}}') %>
+ </h3>
+ <hr>
+ <dl class="statistics">
+ <ul>
+ <li>
+ <dt class="uptime"></dt>
+ <dd>{{uptime}}</dd>
+ </li>
+ <li>
+ <dt class="ip_address"><%=
t('deployments.pretty_view_show.ip_address') %></dt>
+ <dd>{{public_addresses}}</dd>
+ </li>
+ <li>
+ <dt class="state"><%=
t('deployments.pretty_view_show.state') %></dt>
+ <dd>{{state}}</dd>
+ </li>
+ {{#instance_key_present}}
+ <li>
+ <dt></dt>
+ <dd><%= link_to(t('deployments.pretty_view_show.download_key'),
key_instance_path('replace_id').sub('replace_id', '{{id}}'))
%></dd>
+ </li>
+ {{/instance_key_present}}
+ </ul>
+ </dl>
+ <hr>
+ <div class="actions">
+ <ul>
+ {{#stop_enabled}}
+ <li>
+ <%= button_to(t('deployments.pretty_view_show.stop'),
stop_instance_path('replace_id').sub('replace_id', '{{id}}'),
+ :disabled => false, :class => 'button danger')
%>
+ </li>
+ {{/stop_enabled}}
+ {{^stop_enabled}}
+ <li>
+ <%= button_to(t('deployments.pretty_view_show.stop'),
stop_instance_path('replace_id').sub('replace_id', '{{id}}'),
+ :disabled => true, :class => 'button danger')
%>
+ </li>
+ {{/stop_enabled}}
+
+ {{#reboot_enabled}}
+ <li>
+ <%= button_to(t('deployments.pretty_view_show.reboot'),
reboot_instance_path('replace_id').sub('replace_id', '{{id}}'),
+ :disabled => false, :class => 'button danger')
%>
+ </li>
+ {{/reboot_enabled}}
+ {{^reboot_enabled}}
+ <li>
+ <%= button_to(t('deployments.pretty_view_show.reboot'),
reboot_instance_path('replace_id').sub('replace_id', '{{id}}'),
+ :disabled => true, :class => 'button danger')
%>
+ </li>
+ {{/reboot_enabled}}
+ </ul>
+ </div>
+</li>
diff --git a/src/app/views/deployments/_pretty_view_show.html.haml
b/src/app/views/deployments/_pretty_view_show.html.haml
index f40284c..244e1b3 100644
--- a/src/app/views/deployments/_pretty_view_show.html.haml
+++ b/src/app/views/deployments/_pretty_view_show.html.haml
@@ -1,83 +1,11 @@
%ul.instances-array
- @deployment.instances.ascending_by_name.each do |instance|
- %li.instance
- %h3.name
- = link_to instance.name, instance
- %hr
- %dl.statistics
- %ul
- %li
- %dt.uptime
- %dd= count_uptime(instance.uptime)
- %li
- %dt.ip_address= t('deployments.pretty_view_show.ip_address')
- %dd= instance.public_addresses.present? ? instance.public_addresses :
t('deployments.pretty_view_show.no_ip_address')
- %li
- %dt.state= t('deployments.pretty_view_show.state')
- %dd= instance.state
- - if instance.instance_key
- %li
- %dt
- %dd= link_to t('deployments.pretty_view_show.download_key'),
key_instance_path(instance)
- %hr
- .actions
- %ul
- - available_actions = instance.get_action_list
- %li= button_to(t('deployments.pretty_view_show.stop'),
stop_instance_path(instance), :disabled =>
!available_actions.include?(InstanceTask::ACTION_STOP), :class => "button
danger")
- %li= button_to(t('deployments.pretty_view_show.reboot'),
reboot_instance_path(instance), :disabled =>
!available_actions.include?(InstanceTask::ACTION_REBOOT), :class => "button
danger")
+ = render :partial => 'instance_card', :mustache =>
instance_for_mustache(instance)
:javascript
Conductor.setupPrettyFilterURL(
'#{url_for(:action => :show, :details_tab => 'instances',
:view => 'filter' )}',
'#{url_for(:action => :show, :details_tab => 'instances',
:view => 'pretty' )}');
-%script#instanceTemplate{:type => 'text/x-jquery-tmpl'}
- :plain
- <li class="instance">
- <h3 class="name"><a
href="#{instance_path('replace_id').sub('replace_id',
'${id}')}">${name}</a></h3>
- <hr>
- <dl class="statistics">
- <ul>
- <li>
- <dt class="uptime"></dt>
- <dd> ${uptime}</dd>
- </li>
- <li>
- <dt
class="ip_address">#{t('deployments.pretty_view_show.ip_address')}</dt>
- <dd>
- {{if public_addresses}}
- ${public_addresses}
- {{else}}
- #{t('deployments.pretty_view_show.no_ip_address')}
- {{/if}}
- </dd>
- </li>
- <li>
- <dt
class="state">#{t('deployments.pretty_view_show.state')}</dt>
- <dd>${state}</dd>
- </li>
- {{if has_key}}
- <li>
- <dt/>
- <dd><a
href="#{key_instance_path('replace_id').sub('replace_id',
'${id}')}">#{t('deployments.pretty_view_show.download_key')}</a></dd>
- </li>
- {{/if}}
- </ul>
- </dl>
- <hr>
- <div class="actions">
- <ul>
- {{if stop_enabled}}
- <li>#{button_to(t('deployments.pretty_view_show.stop'),
stop_instance_path('replace_id').sub('replace_id', '${id}'),
:disabled => false, :class => 'button danger')}</li>
- {{else}}
- <li>#{button_to(t('deployments.pretty_view_show.stop'),
stop_instance_path('replace_id').sub('replace_id', '${id}'),
:disabled => true, :class => 'button danger')}</li>
- {{/if}}
-
- {{if reboot_enabled}}
- <li>#{button_to(t('deployments.pretty_view_show.reboot'),
reboot_instance_path('replace_id').sub('replace_id', '${id}'),
:disabled => false, :class => 'button danger')}</li>
- {{else}}
- <li>#{button_to(t('deployments.pretty_view_show.reboot'),
reboot_instance_path('replace_id').sub('replace_id', '${id}'),
:disabled => true, :class => 'button danger')}</li>
- {{/if}}
- </ul>
- </div>
- </li>
+%script#deploymentTemplate{ :type => 'text/html' }
+ = render :partial => 'instance_card'
diff --git a/src/public/javascripts/backbone/views.js
b/src/public/javascripts/backbone/views.js
index 2d6da0d..c51be78 100644
--- a/src/public/javascripts/backbone/views.js
+++ b/src/public/javascripts/backbone/views.js
@@ -179,6 +179,9 @@ Conductor.Views.DeploymentsShow = Backbone.View.extend({
},
render: function() {
+ $template = $('#deploymentTemplate');
+ if($template.length === 0) return;
+
var $instances = this.$('ul.instances-array');
if($instances.length === 0) {
$instances = this.$('table.checkbox_table > tbody');
@@ -186,7 +189,12 @@ Conductor.Views.DeploymentsShow = Backbone.View.extend({
if($instances.length === 0) return;
$instances.empty();
- $('#instanceTemplate').tmpl(this.collection.toJSON()).appendTo($instances);
+
+ var instanceCardsHtml = '';
+ $.each(this.collection.toJSON(), function(instanceIndex, instance) {
+ instanceCardsHtml += Mustache.to_html($template.html(), instance);
+ });
+ $instances.html(instanceCardsHtml);
}
});
--
1.7.6.5
8:53 a.m.
New subject: [PATCH conductor 4/7] Mustachifying deployments/_pretty_view
From: Imre Farkas <ifarkas(a)redhat.com>
---
src/app/controllers/pools_controller.rb | 2 +-
src/app/helpers/mustache_helper.rb | 13 +++++
.../deployments/_deployment_card.html.mustache | 32 ++++++++++++
src/app/views/deployments/_pretty_view.html.haml | 51 +------------------
src/public/javascripts/backbone/views.js | 7 ++-
5 files changed, 55 insertions(+), 50 deletions(-)
create mode 100644 src/app/views/deployments/_deployment_card.html.mustache
diff --git a/src/app/controllers/pools_controller.rb
b/src/app/controllers/pools_controller.rb
index c639b57..af053f5 100644
--- a/src/app/controllers/pools_controller.rb
+++ b/src/app/controllers/pools_controller.rb
@@ -105,7 +105,7 @@ class PoolsController < ApplicationController
respond_to do |format|
format.html { render :action => :show}
format.js { render :partial => @view }
- format.json { render :json => @pool.as_json(:with_deployments => true,
:current_user => current_user) }
+ format.json { render :json => { :deployments =>
@pool.deployments.list_for_user(current_user, Privilege::VIEW).map{ |deployment|
view_context.deployment_for_mustache(deployment) } } }
end
end
diff --git a/src/app/helpers/mustache_helper.rb b/src/app/helpers/mustache_helper.rb
index 4e844c7..8255c5d 100644
--- a/src/app/helpers/mustache_helper.rb
+++ b/src/app/helpers/mustache_helper.rb
@@ -35,4 +35,17 @@ module MustacheHelper
}
end
+ def deployment_for_mustache(deployment)
+ {
+ :name => deployment.name,
+ :path => deployment_path(deployment),
+ :status => deployment.status,
+ :status_description =>
I18n.t("deployments.status.#{deployment.status}"),
+ :uptime => count_uptime(deployment.uptime_1st_instance),
+ :instances_count => deployment.instances.count,
+ :instances_text => I18n.t('instances.instances', :count =>
deployment.instances.count.to_i),
+ :provider_name => deployment.provider.present? ?
deployment.provider.provider_type.name : nil,
+ }
+ end
+
end
diff --git a/src/app/views/deployments/_deployment_card.html.mustache
b/src/app/views/deployments/_deployment_card.html.mustache
new file mode 100644
index 0000000..c1004fc
--- /dev/null
+++ b/src/app/views/deployments/_deployment_card.html.mustache
@@ -0,0 +1,32 @@
+<li class="deployment">
+ <h3 class="name">
+ <%= link_to('{{name}}', '{{path}}') %>
+ </h3>
+ <span title="{{status_description}}" class="status
{{status}}"></span>
+ <dl class="statistics">
+ <ul>
+ <li class="uptime">
+ <dt class="uptime"><%= t('uptime') %></dt>
+ <dd>{{uptime}}</dd>
+ </li>
+ <li class="instances">
+ <dt class="instances count"><%=
t('instances.instances.other') %></dt>
+ <dd>
+ {{instances_count}}
+ <span class="inline-label">{{instances_text}}</span>
+ </dd>
+ </li>
+ <li class="provider">
+ <dt class="instances count"><%=
t('providers.provider') %></dt>
+ <dd>
+ <p class="provider"></p>
+ <p class="provider">
+ {{#provider_name}}
+ {{provider_name}}
+ {{/provider_name}}
+ </p>
+ </dd>
+ </li>
+ </ul>
+ </dl>
+</li>
diff --git a/src/app/views/deployments/_pretty_view.html.haml
b/src/app/views/deployments/_pretty_view.html.haml
index c121973..30c379f 100644
--- a/src/app/views/deployments/_pretty_view.html.haml
+++ b/src/app/views/deployments/_pretty_view.html.haml
@@ -2,57 +2,12 @@
- @deployments.in_groups_of(5, false) do |group|
%ul.deployment-array.large
- group.each do |deployment|
- %li.deployment
- %h3.name
- = link_to deployment.name, deployment_path(deployment)
- %span{ :class => "status #{deployment.status}", :title =>
deployment.as_json[:status_description]}
- %dl.statistics
- %ul
- %li.uptime
- %dt.uptime=t'uptime'
- %dd= count_uptime(deployment.uptime_1st_instance)
- %li.instances
- %dt.instances.count=t'instances.instances.other'
- %dd
- = deployment.instances.count || 0
- %span.inline-label=t('instances.instances', :count =>
deployment.instances.count.to_i)
- %li.provider
- %dt.instances.count=t'providers.provider'
- %dd
- %p.provider= deployment.provider.provider_type.name unless
deployment.provider.blank?
+ = render :partial => 'deployments/deployment_card', :mustache =>
deployment_for_mustache(deployment)
:javascript
Conductor.setupPrettyFilterURL(
'#{url_for(:action => :show, :details_tab => 'deployments',
:view => 'filter' )}',
'#{url_for(:action => :show, :details_tab => 'deployments',
:view => 'pretty' )}');
-
-
-%script#deploymentTemplate{ :type => 'text/x-jquery-tmpl' }
- :plain
- <li class="deployment">
- <h3 class="name">
- <a
href="#{deployment_path('replace_id').sub('replace_id',
'${id}')}">${name}</a>
- </h3>
- <span class="status ${status}"
title="${status_description}">${status}</span>
- <dl class="statistics">
- <ul>
- <li class="uptime">
- <dt class="uptime">#{t'uptime'}</dt>
- <dd>${uptime}</dd>
- </li>
- <li class="instances">
- <dt class="instances
count">#{t'instances.instances.other'}</dt>
- <dd>${instances_count}
- <span
class="inline-label">${instances_count_text}</span>
- </dd>
- </li>
- <li class="provider">
- <dt class="instances
count">#{t'providers.provider'}</dt>
- <dd>
- <p class="provider">{{if provider}} ${provider.name}
{{/if}}</p>
- </dd>
- </li>
- </ul>
- </dl>
- </li>
+%script#deploymentTemplate{ :type => 'text/html' }
+ = render :partial => 'deployments/deployment_card'
diff --git a/src/public/javascripts/backbone/views.js
b/src/public/javascripts/backbone/views.js
index c51be78..be9d009 100644
--- a/src/public/javascripts/backbone/views.js
+++ b/src/public/javascripts/backbone/views.js
@@ -130,9 +130,14 @@ Conductor.Views.PoolsShow = Backbone.View.extend({
var $cards = this.$('ul.deployable-cards').empty()
var cardsPerRow = 5;
for(var i = 0; i < deployments.length; i += cardsPerRow) {
+ var deploymentCardHtml = '';
+ $.each(deployments.slice(i, i + cardsPerRow), function(deploymentIndex,
deployment) {
+ deploymentCardHtml += Mustache.to_html($template.html(), deployment);
+ });
+
var $row = this.make('ul',
{'class': 'deployment-array large'},
- $template.tmpl(deployments.slice(i, i + cardsPerRow)));
+ deploymentCardHtml);
$cards.append($row);
}
}
--
1.7.6.5
8:53 a.m.
New subject: [PATCH conductor 5/7] Mustachifying deployments/_list
From: Imre Farkas <ifarkas(a)redhat.com>
---
src/app/helpers/mustache_helper.rb | 25 +++++++---
.../deployments/_deployment_row.html.mustache | 26 +++++++++++
src/app/views/deployments/_list.html.haml | 46 ++++---------------
src/public/javascripts/backbone/views.js | 11 ++++-
4 files changed, 63 insertions(+), 45 deletions(-)
create mode 100644 src/app/views/deployments/_deployment_row.html.mustache
diff --git a/src/app/helpers/mustache_helper.rb b/src/app/helpers/mustache_helper.rb
index 8255c5d..db90ed4 100644
--- a/src/app/helpers/mustache_helper.rb
+++ b/src/app/helpers/mustache_helper.rb
@@ -37,14 +37,23 @@ module MustacheHelper
def deployment_for_mustache(deployment)
{
- :name => deployment.name,
- :path => deployment_path(deployment),
- :status => deployment.status,
- :status_description =>
I18n.t("deployments.status.#{deployment.status}"),
- :uptime => count_uptime(deployment.uptime_1st_instance),
- :instances_count => deployment.instances.count,
- :instances_text => I18n.t('instances.instances', :count =>
deployment.instances.count.to_i),
- :provider_name => deployment.provider.present? ?
deployment.provider.provider_type.name : nil,
+ :id => deployment.id,
+ :name => deployment.name,
+ :path => deployment_path(deployment),
+ :filter_view_path => deployment_path(deployment, :view => :filter),
+ :status => deployment.status,
+ :status_description =>
I18n.t("deployments.status.#{deployment.status}"),
+ :uptime => count_uptime(deployment.uptime_1st_instance),
+ :deployable_xml_name => deployment.deployable_xml.name,
+ :created_at => deployment.created_at.to_s,
+ :instances_count => deployment.instances.count,
+ :instances_text => I18n.t('instances.instances', :count =>
deployment.instances.count.to_i),
+ :provider_name => deployment.provider.present? ?
deployment.provider.provider_type.name : nil,
+ :provider_path => deployment.provider.present? ?
provider_path(deployment.provider) : nil,
+ :owner => deployment.owner.present? ? deployment.owner.name :
nil,
+ :pool_name => deployment.pool.name,
+ :pool_filter_view_path => pool_path(deployment.pool, :view => :filter),
+ :failed_instances_present => deployment.failed_instances.count > 0,
}
end
diff --git a/src/app/views/deployments/_deployment_row.html.mustache
b/src/app/views/deployments/_deployment_row.html.mustache
new file mode 100644
index 0000000..ea9935f
--- /dev/null
+++ b/src/app/views/deployments/_deployment_row.html.mustache
@@ -0,0 +1,26 @@
+<tr>
+ <td class="checkbox">
+ <%= check_box_tag("deployments_selected[]", '{{id}}', :id =>
"deployment_checkbox_{{id}}") %>
+ </td>
+ <td class="alert">
+ {{#failed_instances_present}}
+ <%= image_tag("sb_icon_instance_failure.png") %>
+ {{/failed_instances_present}}
+ </td>
+ <td>
+ <%= link_to('{{name}}', '{{filter_view_path}}') %>
+ </td>
+ <td>{{created_at}}</td>
+ <td>{{deployable_xml_name}}</td>
+ <td>{{status}}</td>
+ <td class="center">{{instances_count}}</td>
+ <td>
+ <%= link_to('{{pool_name}}', '{{pool_filter_view_path}}') %>
+ </td>
+ <td>{{owner}}</td>
+ <td>
+ {{#provider_name}}
+ <%= link_to('{{provider_name}}', '{{provider_path}}') %>
+ {{/provider_name}}
+ </td>
+</tr>
diff --git a/src/app/views/deployments/_list.html.haml
b/src/app/views/deployments/_list.html.haml
index bbf7b9b..82c67dd 100644
--- a/src/app/views/deployments/_list.html.haml
+++ b/src/app/views/deployments/_list.html.haml
@@ -27,45 +27,19 @@
});
= filter_table(@deployments_header, @deployments) do |deployment|
- %tr{ :class => cycle('nostripe', 'stripe') }
- %td{:class => 'checkbox'}
- - selected = params[:select] == 'all'
- = check_box_tag "deployments_selected[]", deployment.id, selected, :id
=> "deployment_checkbox_#{deployment.id}"
- %td{:class => 'alert'}= deployment.failed_instances.present? ?
image_tag("sb_icon_instance_failure.png") : ""
- %td= link_to(deployment.name, deployment_path(deployment, :view => :filter))
- %td= deployment.created_at
- %td= deployment.deployable_xml.name
- %td= deployment.status
- %td{:class => 'center'}= deployment.instances.count
- %td= link_to deployment.pool.name, pool_path(deployment.pool, :view => :filter)
- %td= owner_name(deployment)
- %td= link_to(deployment.provider.provider_type.name, deployment.provider) if
deployment.provider
+ = render :partial => 'deployments/deployment_row', :mustache =>
deployment_for_mustache(deployment)
+
:javascript
Conductor.setupPrettyFilterURL(
'#{url_for(:action => :show, :details_tab => 'deployments', :view
=> 'filter' )}',
'#{url_for(:action => :show, :details_tab => 'deployments', :view
=> 'pretty' )}'
);
-%script#deploymentTemplate{ :type => 'text/x-jquery-tmpl' }
- :plain
- <tr>
- <td class="checkbox"><input type="checkbox"
id="deployment_checkbox_${id}"
- name="deployments_selected[]"
value="${id}"></td>
- <td class="alert">
- {{if failed_instances_count > 0}}
- #{image_tag("sb_icon_instance_failure.png")}
- {{/if}}
- </td>
- <td><a href="#{deployment_path('replace_id', :view =>
:filter).sub('replace_id',
'${id}')}">${name}</a></td>
- <td>${created_at}</td>
- <td>${deployable_xml_name}</td>
- <td>${status}</td>
- <td class="center">${instances_count}</td>
- <td><a href="#{pool_path('replace_id', :view =>
:filter).sub('replace_id',
'${pool.id}')}">${pool.name}</a></td>
- <td>${owner}</td>
- <td>
- {{if provider}}
- <a
href="#{provider_path('replace_id').sub('replace_id',
'${provider.id}')}">${provider.name}</a>
- {{/if}}
- </td>
- </tr>
+:javascript
+ $(document).ready(function(){
+ $('tr:odd').addClass('stripe');
+ $('tr:even').addClass('nostripe');
+ });
+
+%script#deploymentTemplate{ :type => 'text/html' }
+ = render :partial => 'deployments/deployment_row'
diff --git a/src/public/javascripts/backbone/views.js
b/src/public/javascripts/backbone/views.js
index be9d009..89ba07f 100644
--- a/src/public/javascripts/backbone/views.js
+++ b/src/public/javascripts/backbone/views.js
@@ -123,8 +123,17 @@ Conductor.Views.PoolsShow = Backbone.View.extend({
var deployments = this.model.get('deployments');
if($table.length !== 0) {
var checkboxes = Conductor.saveCheckboxes('td :checkbox', $table);
- $table.empty().append($template.tmpl(deployments))
+
+ var deplyomentRowsHtml = '';
+ $.each(deployments, function(deploymentIndex, deployment) {
+ deplyomentRowsHtml += Mustache.to_html($template.html(), deployment);
+ });
+
+ $table.empty().append(deplyomentRowsHtml);
Conductor.restoreCheckboxes(checkboxes, 'td :checkbox', $table);
+
+ $('tr:odd').addClass('stripe');
+ $('tr:even').addClass('nostripe');
}
else {
var $cards = this.$('ul.deployable-cards').empty()
--
1.7.6.5
8:53 a.m.
New subject: [PATCH conductor 6/7] Mustachifying pools/_list
From: Imre Farkas <ifarkas(a)redhat.com>
---
src/app/controllers/pools_controller.rb | 4 +-
src/app/helpers/mustache_helper.rb | 20 ++++++++++++
src/app/views/pools/_list.html.haml | 43 ++++++--------------------
src/app/views/pools/_pool_row.html.mustache | 26 ++++++++++++++++
src/public/javascripts/backbone/views.js | 8 ++++-
5 files changed, 65 insertions(+), 36 deletions(-)
create mode 100644 src/app/views/pools/_pool_row.html.mustache
diff --git a/src/app/controllers/pools_controller.rb
b/src/app/controllers/pools_controller.rb
index af053f5..e381aed 100644
--- a/src/app/controllers/pools_controller.rb
+++ b/src/app/controllers/pools_controller.rb
@@ -69,11 +69,11 @@ class PoolsController < ApplicationController
format.json do
case @details_tab[:id]
when 'pools'
- render :json => @pools
+ render :json => @pools.map{ |pool| view_context.pool_for_mustache(pool) }
when 'instances'
render :json => @instances
when 'deployments'
- render :json => @deployments
+ render :json => @deployments.map{ |deployment|
view_context.deployment_for_mustache(deployment) }
end
end
end
diff --git a/src/app/helpers/mustache_helper.rb b/src/app/helpers/mustache_helper.rb
index db90ed4..f16f26e 100644
--- a/src/app/helpers/mustache_helper.rb
+++ b/src/app/helpers/mustache_helper.rb
@@ -57,4 +57,24 @@ module MustacheHelper
}
end
+ def pool_for_mustache(pool)
+ pool_statistics = pool.statistics
+ pool_family_privilege = check_privilege(Privilege::VIEW, pool.pool_family)
+
+ {
+ :id => pool.id,
+ :name => pool.name,
+ :filter_view_path => pool_path(pool, :view => :filter),
+ :failed_instances_present => pool_statistics[:instances_failed_count]
> 0,
+ :deployments_count => pool.deployments.count,
+ :statistics_total_instances => pool_statistics[:total_instances],
+ :statistics_instances_pending => pool_statistics[:instances_pending],
+ :statistics_instances_failed_count => pool_statistics[:instances_failed_count],
+ :statistics_quota_percent => pool_statistics[:quota_percent],
+ :pool_family_privilege => pool_family_privilege,
+ :pool_family_name => pool.pool_family.name,
+ :pool_family_path => pool_family_privilege ?
pool_family_path(pool.pool_family) : nil
+ }
+ end
+
end
diff --git a/src/app/views/pools/_list.html.haml b/src/app/views/pools/_list.html.haml
index 5dc5e5d..af6ce76 100644
--- a/src/app/views/pools/_list.html.haml
+++ b/src/app/views/pools/_list.html.haml
@@ -24,36 +24,13 @@
});
= filter_table(@header, @pools) do |pool|
- - pool_stats = pool.statistics
- %tr{:class => cycle('nostripe','stripe')}
- %td{:class => 'checkbox'}
- %input{:name => "pools_selected[]", :type => "checkbox",
:value => pool.id, :id => "pool_checkbox_#{pool.id}" }
- %td{:class => 'alert'}= (@statistics[:instances_failed] &
pool.instances).present? ? image_tag("sb_icon_instance_failure.png") :
""
- %td= link_to(pool.name, pool_path(pool, :view => :filter))
- %td{:class => 'center'}= pool.deployments.count
- %td{:class => 'center'}= pool_stats[:total_instances]
- %td{:class => 'center'}= pool_stats[:instances_pending]
- %td{:class => 'center'}= pool_stats[:instances_failed_count]
- %td{:class => 'center'}= pool_stats[:quota_percent]
- - if check_privilege(Privilege::VIEW, pool.pool_family)
- %td= link_to(pool.pool_family.name, pool.pool_family)
- - else
- %td= pool.pool_family.name
-%script#poolTemplate{ :type => 'text/x-jquery-tmpl' }
- :plain
- <tr>
- <td class="checkbox"><input type="checkbox"
id="pool_checkbox_${id}"
- name="pools_selected[]"
value="${id}"></td>
- <td class="alert">
- {{if statistics.instances_failed_count > 0}}
- #{image_tag("sb_icon_instance_failure.png")}
- {{/if}}
- </td>
- <td><a href="#{pool_path('replace_id', :view =>
:filter).sub('replace_id',
'${id}')}">${name}</a></td>
- <td class="center">${deployments_count}</td>
- <td class="center">${statistics.total_instances}</td>
- <td class="center">${statistics.instances_pending}</td>
- <td class="center">${statistics.instances_failed_count}</td>
- <td class="center">${statistics.quota_percent}</td>
- <td><a
href="#{pool_family_path('replace_id').sub('replace_id',
'${pool_family.id}')}">${pool_family.name}</a></td>
- </tr>
+ = render :partial => 'pool_row', :mustache => pool_for_mustache(pool)
+
+:javascript
+ $(document).ready(function(){
+ $('tr:odd').addClass('stripe');
+ $('tr:even').addClass('nostripe');
+ });
+
+%script#poolTemplate{ :type => 'text/html' }
+ = render :partial => 'pool_row'
diff --git a/src/app/views/pools/_pool_row.html.mustache
b/src/app/views/pools/_pool_row.html.mustache
new file mode 100644
index 0000000..62a70b6
--- /dev/null
+++ b/src/app/views/pools/_pool_row.html.mustache
@@ -0,0 +1,26 @@
+<tr>
+ <td class="checkbox">
+ <%= check_box_tag("pools_selected[]", '{{id}}', :id =>
"pool_checkbox_{{id}}") %>
+ </td>
+ <td class="alert">
+ {{#failed_instances_present}}
+ <%= image_tag("sb_icon_instance_failure.png") %>
+ {{/failed_instances_present}}
+ </td>
+ <td>
+ <%= link_to('{{name}}', '{{filter_view_path}}') %>
+ </td>
+ <td class="center">{{deployments_count}}</td>
+ <td class="center">{{statistics_total_instances}}</td>
+ <td class="center">{{statistics_instances_pending}}</td>
+ <td class="center">{{statistics_instances_failed_count}}</td>
+ <td class="center">{{statistics_quota_percent}}</td>
+ <td>
+ {{#pool_family_privilege}}
+ <%= link_to('{{pool_family_name}}', '{{pool_family_path}}')
%>
+ {{/pool_family_privilege}}
+ {{^pool_family_privilege}}
+ {{pool_family_name}}
+ {{/pool_family_privilege}}
+ </td>
+</tr>
diff --git a/src/public/javascripts/backbone/views.js
b/src/public/javascripts/backbone/views.js
index 89ba07f..55ae835 100644
--- a/src/public/javascripts/backbone/views.js
+++ b/src/public/javascripts/backbone/views.js
@@ -66,7 +66,13 @@ Conductor.Views.PoolsIndex = Backbone.View.extend({
var $table = this.$('table.checkbox_table > tbody');
if($table.length === 0 || $template.length === 0) return;
var checkboxes = Conductor.saveCheckboxes('td :checkbox', $table);
- $table.empty().append($template.tmpl(this.collection.toJSON()))
+
+ var rowsHtml = '';
+ $.each(this.collection.toJSON(), function(index, value) {
+ rowsHtml += Mustache.to_html($template.html(), value);
+ });
+
+ $table.empty().append(rowsHtml);
Conductor.restoreCheckboxes(checkboxes, 'td :checkbox', $table);
$table.find('tr:even').addClass('nostripe');
$table.find('tr:odd').addClass('stripe');
--
1.7.6.5
8:53 a.m.
New subject: [PATCH conductor 7/7] Mustachifying instances/_list
From: Imre Farkas <ifarkas(a)redhat.com>
---
src/app/controllers/pools_controller.rb | 2 +-
src/app/helpers/mustache_helper.rb | 3 ++
.../views/instances/_instance_row.html.mustache | 17 ++++++++++
src/app/views/instances/_list.html.haml | 34 +++++--------------
4 files changed, 30 insertions(+), 26 deletions(-)
create mode 100644 src/app/views/instances/_instance_row.html.mustache
diff --git a/src/app/controllers/pools_controller.rb
b/src/app/controllers/pools_controller.rb
index e381aed..677d301 100644
--- a/src/app/controllers/pools_controller.rb
+++ b/src/app/controllers/pools_controller.rb
@@ -71,7 +71,7 @@ class PoolsController < ApplicationController
when 'pools'
render :json => @pools.map{ |pool| view_context.pool_for_mustache(pool) }
when 'instances'
- render :json => @instances
+ render :json => @instances.map{ |instance|
view_context.instance_for_mustache(instance) }
when 'deployments'
render :json => @deployments.map{ |deployment|
view_context.deployment_for_mustache(deployment) }
end
diff --git a/src/app/helpers/mustache_helper.rb b/src/app/helpers/mustache_helper.rb
index f16f26e..2af6384 100644
--- a/src/app/helpers/mustache_helper.rb
+++ b/src/app/helpers/mustache_helper.rb
@@ -28,10 +28,13 @@ module MustacheHelper
:path => instance_path(instance),
:uptime => count_uptime(instance.uptime),
:state => instance.state,
+ :failed => instance.failed?,
:public_addresses => instance.public_addresses.present? ?
instance.public_addresses : I18n.t('deployments.pretty_view_show.no_ip_address'),
:instance_key_present => instance.instance_key.present?,
:stop_enabled => available_actions.include?(InstanceTask::ACTION_STOP),
:reboot_enabled =>
available_actions.include?(InstanceTask::ACTION_REBOOT),
+ :provider => instance.provider_account.present? ?
instance.provider_account.provider.name : nil,
+ :owner => instance.owner.present? ? instance.owner.name : nil,
}
end
diff --git a/src/app/views/instances/_instance_row.html.mustache
b/src/app/views/instances/_instance_row.html.mustache
new file mode 100644
index 0000000..847a972
--- /dev/null
+++ b/src/app/views/instances/_instance_row.html.mustache
@@ -0,0 +1,17 @@
+<tr>
+ <td class="checkbox">
+ <%= check_box_tag("instances_selected[]", '{{id}}', :id =>
"instance_checkbox_{{id}}") %>
+ </td>
+ <td class="alert">
+ {{#failed}}
+ <%= image_tag("sb_icon_instance_failure.png") %>
+ {{/failed}}
+ </td>
+ <td>
+ <%= link_to('{{name}}', '{{path}}') %>
+ </td>
+ <td>{{public_addresses}}</td>
+ <td>{{state}}</td>
+ <td>{{provider}}</td>
+ <td>{{owner}}</td>
+</tr>
diff --git a/src/app/views/instances/_list.html.haml
b/src/app/views/instances/_list.html.haml
index 675efc2..e7d2e8d 100644
--- a/src/app/views/instances/_list.html.haml
+++ b/src/app/views/instances/_list.html.haml
@@ -25,34 +25,18 @@
});
= filter_table(instances_header, @instances) do |instance|
- %tr{ :class => cycle('nostripe', 'stripe') }
- %td{:class => 'checkbox'}
- - selected = params[:select] == 'all'
- = check_box_tag "instance_selected[]", instance.id, selected, :id =>
"instance_checkbox_#{instance.id}"
- %td{:class => 'alert'}= instance.failed? ?
image_tag("sb_icon_instance_failure.png") : ""
- %td= link_to instance.name, instance_path(instance)
- %td= instance.public_addresses
- %td= instance.state
- %td= instance.provider_account ? instance.provider_account.provider.name :
''
- %td= owner_name(instance)
+ = render :partial => 'instances/instance_row', :mustache =>
instance_for_mustache(instance)
:javascript
Conductor.setupPrettyFilterURL(
'#{url_for(:action => :show, :details_tab => 'instances',
:view => 'filter' )}',
'#{url_for(:action => :show, :details_tab => 'instances',
:view => 'pretty' )}');
-%script#instanceTemplate{ :type => 'text/x-jquery-tmpl' }
- :plain
- <tr>
- <td class="checkbox"><input type="checkbox"
id="instance_checkbox_${id}" name="instance_selected[]"
value="${id}"></td>
- <td class="alert">
- {{if is_failed == true}}
- #{image_tag("sb_icon_instance_failure.png")}
- {{/if}}
- </td>
- <td><a
href="#{instance_path('replace_id').sub('replace_id',
'${id}')}">${name}</a></td>
- <td>${public_addresses}</td>
- <td>${state}</td>
- <td>${provider}</td>
- <td>${owner}</td>
- </tr>
+:javascript
+ $(document).ready(function(){
+ $('tr:odd').addClass('stripe');
+ $('tr:even').addClass('nostripe');
+ });
+
+%script#instanceTemplate{ :type => 'text/html' }
+ = render :partial => 'instances/instance_row'
--
1.7.6.5
11:09 a.m.
On Tuesday 28 February 2012 15:53:22 ifarkas(a)redhat.com wrote:
This patchset is intended to solve the issue around template
duplications
for the haml templates and the jQuery templates used by backbone.
Mustache.js claims itself as logic-less template language which means e.g.
there is no if statement provided by the language. But there are existing
ruby gem and a javascript library, all ready to use.
The first patch contains a template handler for Rails. The mustache
templates are used in 2 different ways: - in rails the template compiled in
the usual rails way (almost)
- for javascript the template just needs to be printed out
The template handler distinguishes the 2 mode by whether data is passed
through the :mustache key or not.
Another problem with mustache would be the absence of rails helper methods.
To solve this issue Petr and Tomas suggested some kind of template handler
chaining so we could use erb and mustache together. Real template handler
chaining hasn't come to rails yet, but something similar can be achieved.
The MustacheTemplate::Handler class first compiles the template as an erb
template and evaluate the rails helper methods, then compiles as a mustache
template.
The rest of the patchset contains some refactored views.
NACK, although it works fine, some cukes are failing after applying that
patchset. The biggest problem is that rubygem-mustache isnt in Brew (package
building system for RHEL) so we will leave the patchset on the list for now.
4448
days inactive
4449
days old
aeolus-devel@lists.fedorahosted.org
8 comments
2 participants
participants (2)
-
Imre Farkas -
jzigmund＠redhat.com