Author: ahorincar
Date: Mon Aug 12 17:50:31 2013
New Revision: 1513209
URL: http://svn.apache.org/r1513209
Log:
Finished JS and jQuery functions for embedding, restructured bh_emb templates
Modified:
bloodhound/branches/bep_0007_embeddable_objects/bloodhound_dashboard/bhdashboard/layouts/templates/bs_grid_full.html
bloodhound/branches/bep_0007_embeddable_objects/bloodhound_dashboard/bhdashboard/widgets/templates/widget_product.html
bloodhound/branches/bep_0007_embeddable_objects/bloodhound_embedding_plugin/bhembedding/api.py
bloodhound/branches/bep_0007_embeddable_objects/bloodhound_embedding_plugin/bhembedding/templates/bh_emb_milestone.html
bloodhound/branches/bep_0007_embeddable_objects/bloodhound_embedding_plugin/bhembedding/templates/bh_emb_product.html
bloodhound/branches/bep_0007_embeddable_objects/bloodhound_embedding_plugin/bhembedding/templates/bh_emb_ticket.html
bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_milestone_view.html
bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_ticket.html
Modified:
bloodhound/branches/bep_0007_embeddable_objects/bloodhound_dashboard/bhdashboard/layouts/templates/bs_grid_full.html
URL:
http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_dashboard/bhdashboard/layouts/templates/bs_grid_full.html?rev=1513209&r1=1513208&r2=1513209&view=diff
==============================================================================
---
bloodhound/branches/bep_0007_embeddable_objects/bloodhound_dashboard/bhdashboard/layouts/templates/bs_grid_full.html
(original)
+++
bloodhound/branches/bep_0007_embeddable_objects/bloodhound_dashboard/bhdashboard/layouts/templates/bs_grid_full.html
Mon Aug 12 17:50:31 2013
@@ -33,8 +33,52 @@
<h2 py:if="not is_global">Dashboard for product
<i>${req.perm.env.product.name}</i></h2>
<!-- Embedding plugin -->
- <!-- Not working -->
- <a class="btn" href="${href.api('products', req.perm.env.product.prefix)}"
py:if="not is_global">Embed product</a>
+ <a py:if="not is_global" id="embed-btn" href="#embed-modal" role="button"
class="btn" data-toggle="modal">Embed Product</a>
+
+ <script language="JavaScript" type="text/javascript">
+ function make_iframe(src) {
+ iframe = document.createElement("iframe");
+ var root = get_root()
+ $(iframe).attr("src", root + src);
+ $(iframe).attr("width", "640");
+ $(iframe).attr("height", "480");
+ $(iframe).attr("frameborder", "0");
+ return $(iframe).get(0).outerHTML;
+ }
+
+ $('#embed-btn').click(function() {
+
$('#embed-textarea').val(make_iframe(prepare_embed_url('${href.embed("products",
req.perm.env.product.prefix)}')));
+ });
+
+ function prepare_embed_url(url) {
+ var url_array = url.split('/');
+ url_array.splice(2,2);
+ embed_url = url_array.join("/");
+ return embed_url
+ }
+
+ function get_root() {
+ var root = window.location.protocol + '//' + window.location.host;
+ return root
+ }
+ </script>
+
+
+ <!-- Embedding Modal -->
+ <div id="embed-modal" class="modal hide fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal"
aria-hidden="true">Ã</button>
+ <h3 id="myModalLabel">Embed this Product</h3>
+ </div>
+ <div class="modal-body">
+ <textarea id="embed-textarea" rows="3" class="input-block-level"
style="width:100%;min-width:100%;max-width:100%;">
+ </textarea>
+ </div>
+ <div class="modal-footer">
+ <button class="btn" data-dismiss="modal"
aria-hidden="true">Close</button>
+ </div>
+ </div>
+
<xi:include href="bs_grid.html" />
<div id="ft" class="row">
Modified:
bloodhound/branches/bep_0007_embeddable_objects/bloodhound_dashboard/bhdashboard/widgets/templates/widget_product.html
URL:
http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_dashboard/bhdashboard/widgets/templates/widget_product.html?rev=1513209&r1=1513208&r2=1513209&view=diff
==============================================================================
---
bloodhound/branches/bep_0007_embeddable_objects/bloodhound_dashboard/bhdashboard/widgets/templates/widget_product.html
(original)
+++
bloodhound/branches/bep_0007_embeddable_objects/bloodhound_dashboard/bhdashboard/widgets/templates/widget_product.html
Mon Aug 12 17:50:31 2013
@@ -78,7 +78,44 @@
</py:choose>
<!-- Embedding plugin -->
- <a class='btn btn-small' href="${href.api('products',
p.prefix)}">Embed product</a>
+ <a id="embed-btn-${i}" href="#embed-modal-${i}" role="button"
class="btn" data-toggle="modal">Embed Product</a>
+ <!-- Embedding Modal -->
+ <div id="embed-modal-${i}" class="modal hide fade" tabindex="-1"
role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal"
aria-hidden="true">Ã</button>
+ <h3 id="myModalLabel">Embed this Product</h3>
+ </div>
+ <div class="modal-body">
+ <textarea id="embed-textarea-${i}" rows="3"
class="input-block-level" style="width:100%;min-width:100%;max-width:100%;">
+ </textarea>
+ </div>
+ <div class="modal-footer">
+ <button class="btn" data-dismiss="modal"
aria-hidden="true">Close</button>
+ </div>
+ </div>
+
+ <script language="JavaScript" type="text/javascript">
+ function make_iframe(src) {
+ iframe = document.createElement("iframe");
+ var root = get_root();
+ $(iframe).attr("src", root + src);
+ $(iframe).attr("width", "640");
+ $(iframe).attr("height", "480");
+ $(iframe).attr("frameborder", "0");
+ return $(iframe).get(0).outerHTML;
+ }
+
+
+ // p.prefix doesn't have any value
+ $('#embed-btn-${i}').click(function() {
+
$('#embed-textarea-${i}').val(make_iframe('${href.embed("products",
p.prefix)}'));
+ });
+
+ function get_root() {
+ var root = window.location.protocol + '//' + window.location.host;
+ return root;
+ }
+ </script>
</div>
</div>
Modified:
bloodhound/branches/bep_0007_embeddable_objects/bloodhound_embedding_plugin/bhembedding/api.py
URL:
http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_embedding_plugin/bhembedding/api.py?rev=1513209&r1=1513208&r2=1513209&view=diff
==============================================================================
---
bloodhound/branches/bep_0007_embeddable_objects/bloodhound_embedding_plugin/bhembedding/api.py
(original)
+++
bloodhound/branches/bep_0007_embeddable_objects/bloodhound_embedding_plugin/bhembedding/api.py
Mon Aug 12 17:50:31 2013
@@ -96,12 +96,7 @@ class EmbeddingSystem(Component):
if log[2] == 'comment' and log[4]:
comm_num += 1
- # print "LAST LOG"
- # print last_log
ticket = Ticket(self.env, id)
- changetime = ticket['changetime']
- c_time = changetime.strftime("%H:%M:%S, %Y-%m-%d ")
-
data = {'ticket': ticket,
'comm_num': comm_num,
'attachment_num': attachment_num}
@@ -139,18 +134,6 @@ class EmbeddingSystem(Component):
elif name == 'query':
# Feature not yet finished
qstring = req.query_string
- # if qstring == '':
- # if req.authname and req.authname != 'anonymous':
- # default_query = query.ProductQueryModule.default_query
- # qstring = default_query.default
- # user = req.authname
- # else:
- # email = req.session.get('email')
- # name = req.session.get('name')
- # default_anonymous_query =
query.ProductQueryModule.default_anonymous_query
- # qstring = default_anonymous_query.default
- # user = email or name or None
-
q = self.query(self.env, qstring)
print "Query results:"
Modified:
bloodhound/branches/bep_0007_embeddable_objects/bloodhound_embedding_plugin/bhembedding/templates/bh_emb_milestone.html
URL:
http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_embedding_plugin/bhembedding/templates/bh_emb_milestone.html?rev=1513209&r1=1513208&r2=1513209&view=diff
==============================================================================
---
bloodhound/branches/bep_0007_embeddable_objects/bloodhound_embedding_plugin/bhembedding/templates/bh_emb_milestone.html
(original)
+++
bloodhound/branches/bep_0007_embeddable_objects/bloodhound_embedding_plugin/bhembedding/templates/bh_emb_milestone.html
Mon Aug 12 17:50:31 2013
@@ -5,7 +5,9 @@
xmlns:xi="http://www.w3.org/2001/XInclude";
xmlns:py="http://genshi.edgewall.org/";
xmlns:i18n="http://genshi.edgewall.org/i18n";>
- <!-- <xi:include href="layout.html" /> -->
+ <link rel="stylesheet"
href="${href.chrome('dashboard/css/bootstrap.css')}" type="text/css" />
+ <link rel="stylesheet"
href="${href.chrome('dashboard/css/bootstrap-responsive.css')}" type="text/css"
/>
+ <link rel="stylesheet" href="${href.chrome('embedding/embedding.css')}"
type="text/css" />
<head>
<title>Milestone ${milestone.name}</title>
@@ -13,26 +15,41 @@
<body>
<h2><a href="${href.milestone(milestone.name)}">${milestone.name}</a></h2>
- <py:choose>
- <p py:when="milestone.completed" class="date">
- <i18n:msg params="duration, date">
- <strong>Completed:</strong> ${dateinfo(milestone.completed)} ago
(${format_datetime(milestone.completed)})
- </i18n:msg></p>
- <p py:when="milestone.is_late" class="date">
- <i18n:msg params="duration, date">
- <strong>Due:</strong> ${dateinfo(milestone.due)} late
(${format_datetime(milestone.due)})
- </i18n:msg></p>
- <p py:when="milestone.due" class="date">
- <i18n:msg params="duration, date">
- <strong>Due in:</strong> ${dateinfo(milestone.due)}
(${format_datetime(milestone.due)})
- </i18n:msg></p>
- </py:choose>
- <py:choose>
- <p py:when="milestone.description">
- <strong>Description:</strong> ${milestone.description}</p>
- </py:choose>
- <p><strong>Product:</strong> ${product.name}</p>
- <p><strong>Number of tickets:</strong> ${ticket_number}</p>
- <p><strong>Attachments:</strong> ${attachment_number}</p>
+
+ <table class="table table-condensed ticket-properties">
+ <tr>
+ <th class="properties">Description</th>
+ <py:choose>
+ <td py:when="milestone.description">${milestone.description}</td>
+ <td py:otherwise="">none</td>
+ </py:choose>
+ </tr>
+ <tr>
+ <th class="properties">Product</th>
+ <td><a target="_blank"
href="${href.products(product.prefix)}">${product.name}</a></td>
+ </tr>
+ <tr>
+ <th class="properties">Number of Tickets</th>
+ <py:choose>
+ <td py:when="ticket_number"><a target="_blank"
href="#">${ticket_number}</a></td>
+ <td py:otherwise="">0</td>
+ </py:choose>
+ </tr>
+ <tr>
+ <th class="properties">Number of Attachments</th>
+ <py:choose>
+ <td py:when="attachment_number"><a target="_blank"
href="#">${attachment_number}</a></td>
+ <td py:otherwise="">0</td>
+ </py:choose>
+ </tr>
+ <tr>
+ <th class="properties">Status</th>
+ <py:choose>
+ <td py:when="milestone.completed">Completed
(${format_datetime(milestone.completed)})</td>
+ <td py:when="milestone.is_late">Is late
(${format_datetime(milestone.due)})</td>
+ <td py:when="milestone.due">Due
(${format_datetime(milestone.due)})</td>
+ </py:choose>
+ </tr>
+ </table>
</body>
</html>
Modified:
bloodhound/branches/bep_0007_embeddable_objects/bloodhound_embedding_plugin/bhembedding/templates/bh_emb_product.html
URL:
http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_embedding_plugin/bhembedding/templates/bh_emb_product.html?rev=1513209&r1=1513208&r2=1513209&view=diff
==============================================================================
---
bloodhound/branches/bep_0007_embeddable_objects/bloodhound_embedding_plugin/bhembedding/templates/bh_emb_product.html
(original)
+++
bloodhound/branches/bep_0007_embeddable_objects/bloodhound_embedding_plugin/bhembedding/templates/bh_emb_product.html
Mon Aug 12 17:50:31 2013
@@ -1,11 +1,13 @@
-<!DOCTYPE html
+ <!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
<html xmlns="http://www.w3.org/1999/xhtml";
xmlns:xi="http://www.w3.org/2001/XInclude";
xmlns:py="http://genshi.edgewall.org/";
xmlns:i18n="http://genshi.edgewall.org/i18n";>
- <!-- <xi:include href="layout.html" /> -->
+ <link rel="stylesheet"
href="${href.chrome('dashboard/css/bootstrap.css')}" type="text/css" />
+ <link rel="stylesheet"
href="${href.chrome('dashboard/css/bootstrap-responsive.css')}" type="text/css"
/>
+ <link rel="stylesheet" href="${href.chrome('embedding/embedding.css')}"
type="text/css" />
<head>
<title>Product ${product.name}</title>
@@ -13,19 +15,52 @@
<body>
<h2><a href="${href.products(product.prefix)}">${product.name}</a></h2>
- <py:choose>
- <p py:when="product.description">
- <strong>Description:</strong> ${product.description}
- </p>
- </py:choose>
- <py:choose>
- <p py:when="owner">
- <strong>Owner:</strong><a href="${href.query(owner=owner,
status='!closed',order='priority')}">
- ${owner}</a></p>
- </py:choose>
- <p><strong>Number of tickets:</strong> ${ticket_num}</p>
- <p><strong>Number of milestones:</strong> ${milestone_num}</p>
- <p><strong>Number of versions:</strong> ${version_num}</p>
- <p><strong>Number of components:</strong> ${component_num}</p>
+ <h4><a target="_blank" href="${href.products(product.prefix)}">Product
#${product.prefix}</a></h4>
+
+ <table class="table table-condensed ticket-properties">
+ <tr>
+ <th class="properties">Description</th>
+ <py:choose>
+ <td py:when="product.description">${product.description}</td>
+ <td py:otherwise="">none</td>
+ </py:choose>
+ </tr>
+ <tr>
+ <th class="properties">Owner</th>
+ <py:choose>
+ <td py:when="owner">${owner}</td>
+ <td py:otherwise="">none</td>
+ </py:choose>
+ </tr>
+ <tr>
+ <th class="properties">Number of Tickets:</th>
+ <py:choose>
+ <td py:when="ticket_num"><a target="_blank"
href="#">${ticket_num}</a></td>
+ <td py:otherwise="">0</td>
+ </py:choose>
+ </tr>
+ <tr>
+ <th class="properties">Number of Milestones:</th>
+ <py:choose>
+ <td py:when="milestone_num"><a target="_blank"
href="#">${milestone_num}</a></td>
+ <td py:otherwise="">0</td>
+ </py:choose>
+ </tr>
+ <tr>
+ <th class="properties">Number of Versions:</th>
+ <py:choose>
+ <td py:when="version_num">${version_num}</td>
+ <td py:otherwise="">0</td>
+ </py:choose>
+ </tr>
+ <tr>
+ <th class="properties">Number of Components:</th>
+ <py:choose>
+ <td py:when="component_num">${component_num}</td>
+ <td py:otherwise="">0</td>
+ </py:choose>
+ </tr>
+ </table>
+
</body>
</html>
Modified:
bloodhound/branches/bep_0007_embeddable_objects/bloodhound_embedding_plugin/bhembedding/templates/bh_emb_ticket.html
URL:
http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_embedding_plugin/bhembedding/templates/bh_emb_ticket.html?rev=1513209&r1=1513208&r2=1513209&view=diff
==============================================================================
---
bloodhound/branches/bep_0007_embeddable_objects/bloodhound_embedding_plugin/bhembedding/templates/bh_emb_ticket.html
(original)
+++
bloodhound/branches/bep_0007_embeddable_objects/bloodhound_embedding_plugin/bhembedding/templates/bh_emb_ticket.html
Mon Aug 12 17:50:31 2013
@@ -21,9 +21,8 @@
<a target="_blank" href="${href.query(owner=ticket.owner,
status='!closed',
ticket=ticket.id, order='priority')}">${ticket.owner}</a>
, last modified
-<!-- <a target="_blank" href="${href('timeline', {'from':
ticket.changetime})}">
- ${ticket.changetime}</a> -->
- ${pretty_dateinfo(ticket.changetime)}
+ <a target="_blank" href="${href('timeline', {'from':
ticket.changetime})}">
+ ${format_datetime(ticket.changetime)}</a>
</h5>
<table class="table table-condensed ticket-properties">
@@ -32,13 +31,14 @@
<td><a target="_blank" href="${href.query(reporter=ticket.reporter,
status='!closed',
ticket=ticket.id,
order='priority')}">${ticket.reporter}</a></td>
</tr>
- <py:choose>
- <tr py:when="ticket.keywords">
- <th class="properties">Keywords</th>
- <td><a target="_blank"
href="${href.query(keywords=ticket.keywords, status='!closed',
+ <tr>
+ <th class="properties">Keywords</th>
+ <py:choose>
+ <td py:when="ticket.keywords"><a target="_blank"
href="${href.query(keywords=ticket.keywords, status='!closed',
ticket=ticket.id,
order='priority')}">${ticket.keywords}</a></td>
- </tr>
- </py:choose>
+ <td py:otherwise="">none</td>
+ </py:choose>
+ </tr>
<tr>
<th class="properties">Type</th>
<td><a target="_blank" href="${href.query(type=ticket.type,
status='!closed',
@@ -49,59 +49,70 @@
<td><a target="_blank" href="${href.query(status=ticket.status,
ticket=ticket.id, order='priority')}">${ticket.status}</a></td>
</tr>
- <py:choose>
- <tr py:when="ticket.priority">
- <th class="properties">Priority</th>
- <td><a target="_blank"
href="${href.query(priority=ticket.priority, status='!closed',
+ <tr>
+ <th class="properties">Priority</th>
+ <td><a target="_blank" href="${href.query(priority=ticket.priority,
status='!closed',
ticket=ticket.id,
order='priority')}">${ticket.priority}</a></td>
- </tr>
- </py:choose>
+ </tr>
<tr>
<th class="properties">Product</th>
<td><a target="_blank" href="${href.query(product=ticket.product,
status='!closed',
ticket=ticket.id,
order='priority')}">${ticket.product}</a></td>
</tr>
- <py:choose>
- <tr py:when="ticket.milestone">
- <th class="properties">Milestone</th>
- <td><a target="_blank"
href="${href.query(milestone=ticket.milestone, status='!closed',
+ <tr>
+ <th class="properties">Milestone</th>
+ <py:choose>
+ <td py:when="ticket.milestone">
+ <a target="_blank"
href="${href.query(milestone=ticket.milestone, status='!closed',
ticket=ticket.id,
order='priority')}">${ticket.milestone}</a></td>
- </tr>
- </py:choose>
- <py:choose>
- <tr py:when="ticket.component">
- <th class="properties">Component</th>
- <td><a target="_blank"
href="${href.query(component=ticket.component, status='!closed',
+ <td py:otherwise="">none</td>
+ </py:choose>
+ </tr>
+ <tr>
+ <th class="properties">Component</th>
+ <py:choose>
+ <td py:when="ticket.component">
+ <a target="_blank"
href="${href.query(component=ticket.component, status='!closed',
ticket=ticket.id,
order='priority')}">${ticket.component}</a></td>
- </tr>
- </py:choose>
- <py:choose>
- <tr py:when="ticket.version">
- <th class="properties">Version</th>
- <td><a target="_blank" href="${href.query(version=ticket.version,
status='!closed',
+ <td py:otherwise="">none</td>
+ </py:choose>
+ </tr>
+ <tr>
+ <th class="properties">Version</th>
+ <py:choose>
+ <td py:when="ticket.version">
+ <a target="_blank" href="${href.query(version=ticket.version,
status='!closed',
ticket=ticket.id,
order='priority')}">${ticket.version}</a></td>
- </tr>
- </py:choose>
- <py:choose>
- <tr py:when="ticket.severity">
- <th class="properties">Severity</th>
- <td><a target="_blank"
href="${href.query(severity=ticket.severity, status='!closed',
+ <td py:otherwise="">none</td>
+ </py:choose>
+ </tr>
+ <tr>
+ <th class="properties">Severity</th>
+ <py:choose>
+ <td py:when="ticket.severity">
+ <a target="_blank" href="${href.query(severity=ticket.severity,
status='!closed',
ticket=ticket.id,
order='priority')}">${ticket.severity}</a></td>
- </tr>
- </py:choose>
- <py:choose>
- <tr py:when="comm_num">
- <th class="properties">Number of comments</th>
- <td><a target="_blank"
href="${href.ticket(ticket.id)}">${comm_num}</a></td>
- </tr>
- </py:choose>
- <py:choose>
- <tr py:when="attachment_num">
- <th class="properties">Number of attachments</th>
- <td><a target="_blank" href="${href.attachment('ticket',
ticket.id)}">${attachment_num}</a></td>
- </tr>
- </py:choose>
+ <td py:otherwise="">none</td>
+ </py:choose>
+ </tr>
+ <tr>
+ <th class="properties">Number of comments</th>
+ <py:choose>
+ <td py:when="comm_num">
+ <a target="_blank"
href="${href.ticket(ticket.id)}">${comm_num}</a></td>
+ <td py:otherwise="">0</td>
+ </py:choose>
+ </tr>
+ <tr>
+ <th class="properties">Number of attachments</th>
+ <py:choose>
+ <td py:when="attachment_num">
+ <a target="_blank" href="${href.attachment('ticket',
ticket.id)}">${attachment_num}</a></td>
+ <td py:otherwise="">0</td>
+ </py:choose>
+ </tr>
</table>
+
</div>
</body>
</html>
Modified:
bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_milestone_view.html
URL:
http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_milestone_view.html?rev=1513209&r1=1513208&r2=1513209&view=diff
==============================================================================
---
bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_milestone_view.html
(original)
+++
bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_milestone_view.html
Mon Aug 12 17:50:31 2013
@@ -96,7 +96,45 @@
<xi:include href="bh_attach_file_form.html" py:with="alist =
attachments" />
<!-- Embedding plugin -->
- <a class='btn' href="${href.api('milestone', milestone.name)}">Embed
milestone</a>
+ <a id="embed-btn" href="#embed-modal" role="button" class="btn"
data-toggle="modal">Embed Milestone</a>
+
+ <script language="JavaScript" type="text/javascript">
+ function make_iframe(src) {
+ iframe = document.createElement("iframe");
+ var root = get_root()
+ $(iframe).attr("src", root + src);
+ $(iframe).attr("width", "640");
+ $(iframe).attr("height", "480");
+ $(iframe).attr("frameborder", "0");
+ return $(iframe).get(0).outerHTML;
+ }
+
+ $('#embed-btn').click(function() {
+ $('#embed-textarea').val(make_iframe('${href.embed("milestone",
milestone.name)}'));
+ });
+
+ function get_root() {
+ var root = window.location.protocol + '//' + window.location.host;
+ return root
+ }
+ </script>
+
+
+ <!-- Embedding Modal -->
+ <div id="embed-modal" class="modal hide fade" tabindex="-1"
role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal"
aria-hidden="true">Ã</button>
+ <h3 id="myModalLabel">Embed this Milestone</h3>
+ </div>
+ <div class="modal-body">
+ <textarea id="embed-textarea" class="input-block-level" rows="3"
style="width:100%;min-width:100%;max-width:100%;">
+ </textarea>
+ </div>
+ <div class="modal-footer">
+ <button class="btn" data-dismiss="modal"
aria-hidden="true">Close</button>
+ </div>
+ </div>
+
</div>
</py:def>
Modified:
bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_ticket.html
URL:
http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_ticket.html?rev=1513209&r1=1513208&r2=1513209&view=diff
==============================================================================
---
bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_ticket.html
(original)
+++
bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_ticket.html
Mon Aug 12 17:50:31 2013
@@ -352,23 +352,29 @@
</button>
-
<!-- Embedding plugin -->
<a id="embed-btn" href="#embed-modal" role="button" class="btn"
data-toggle="modal">Embed Ticket</a>
<script language="JavaScript" type="text/javascript">
function make_iframe(src) {
iframe = document.createElement("iframe");
- $(iframe).attr("src", src);
- $(iframe).attr("width", "640");
+ var root = get_root()
+ $(iframe).attr("src", root + src);
+ $(iframe).attr("width", "470");
$(iframe).attr("height", "480");
- $(iframe).attr("frameborder", "0");
+ $(iframe).attr("frameborder", "1");
+ $(iframe).attr("scrolling", "no");
return $(iframe).get(0).outerHTML;
}
$('#embed-btn').click(function() {
$('#embed-textarea').val(make_iframe('${href.embed("ticket",
ticket.id)}'));
});
+
+ function get_root() {
+ var root = window.location.protocol + '//' + window.location.host;
+ return root
+ }
</script>
@@ -379,7 +385,7 @@
<h3 id="myModalLabel">Embed this Ticket</h3>
</div>
<div class="modal-body">
- <textarea id="embed-textarea" class="input-block-level"
style="width:100%;min-width:100%;max-width:100%;">
+ <textarea id="embed-textarea" rows="3" class="input-block-level"
style="width:100%;min-width:100%;max-width:100%;">
</textarea>
</div>
<div class="modal-footer">
@@ -388,7 +394,6 @@
</div>
-
<span id="edit-state-buttons" class="btn-toolbar" style="display:
None">
<button id="edit-submit" class="btn" type="submit"
value="Submit changes" name="submit">
