Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improved ticket zoom.

Browse source
This commit is contained in:
Martin Edenhofer 2012-04-23 23:44:47 +02:00
parent d861b39622
commit 5a16d06e72
2 changed files with 39 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
app/assets/javascripts/app/views/agent_ticket_zoom.jst.eco
View file

@ -5,32 +5,8 @@
<div class="row ticket-answer"> <div class="row ticket-answer">
<div class="span9"> <div class="span9">
<div class="row well">
<div class="avatar span1 thumbnails">
<img class="thumbnail user-data" data-id="<%= window.Session['id'] %>"" src="<%- window.Session['image'] %>" alt="">
</div>
<div class="span8">
<div class="row">
<form class="form-stacked keepleft update-box">
<%- @form_ticket %>
<%- @form_article %>
<div class="keepleft" id="file-uploader"></div>
&nbsp;
<input type="submit" class="btn btn-primary submit" value="submit">
</form>
</div>
</div>
</div>
<% for article in @articles: %> <% for article in @articles: %>
<div class="row well article" data-id="<%= article.id %>"> <div class="row article" data-id="<%= article.id %>">
<div class="avatar span1 thumbnails"> <div class="avatar span1 thumbnails">
<img class="thumbnail user-data" data-id="<%= article.created_by_id %>" src="<%= article.created_by.image %>" alt=""> <img class="thumbnail user-data" data-id="<%= article.created_by_id %>" src="<%= article.created_by.image %>" alt="">
</div> </div>
@ -70,6 +46,24 @@
</div> </div>
<% end %> <% end %>
<div class="row article">
<div class="avatar span1 thumbnails">
<img class="thumbnail user-data" data-id="<%= window.Session['id'] %>"" src="<%- window.Session['image'] %>" alt="">
</div>
<div class="span8 well-muted article-message">
<form class="form-stacked keepleft">
<%- @form_ticket %>
<%- @form_article %>
<div class="keepleft" id="file-uploader"></div>
&nbsp;
<input type="submit" class="btn btn-primary submit" value="submit">
</form>
</div>
</div>
</div> </div>
<div class="span3"> <div class="span3">

42
app/assets/stylesheets/zzz.css
View file

@ -45,10 +45,6 @@ body {
color: #999999; color: #999999;
} }
.update-box .controls .span2 {
width: 132px;
}
/* /*
* removed margin of forms to not break the layout with submit buttons within <form></form> area e. g. for modal dialogs * removed margin of forms to not break the layout with submit buttons within <form></form> area e. g. for modal dialogs
*/ */
@ -108,19 +104,19 @@ footer {
float: right; float: right;
} }
.update-box {
margin-left: 10px;
}
.ticket-answer .well {
margin-left: 0;
margin-right: 20px;
}
.ticket-answer .avatar { .ticket-answer .avatar {
margin-left: 0; margin-left: 10px;
}
.ticket-answer .span8 {
width: 558px;
}
.ticket-answer .span9 {
width: 710px;
}
.ticket-answer .span3 {
width: 200px;
} }
.ticket-answer .span8 { width: 558px; }
.article { .article {
border: none; border: none;
@ -131,8 +127,8 @@ footer {
margin-top: 0px; margin-top: 0px;
margin-bottom: 10px; margin-bottom: 10px;
padding-top: 8px; padding-top: 0px;
padding-bottom: 8px; padding-bottom: 2px;
padding-right: 0px; padding-right: 0px;
background-color: #ffffff; background-color: #ffffff;
@ -140,21 +136,23 @@ footer {
.article-message { .article-message {
margin: 0 0 0 0; margin-top: 0px;
margin-bottom: 6px;
margin-left: 10px; margin-left: 10px;
padding-top: 8px;
padding-top: 10px;
padding-bottom: 8px; padding-bottom: 8px;
padding-left: 8px; padding-left: 10px;
width: 580px; width: 580px;
} }
.article .span8 { .article .span8 {
width: 578px; width: 602px;
} }
.well-muted { .well-muted {
background-color: #fff; background-color: whiteSmoke;
border: 1px solid #eee; border: 1px solid #eee;
border: 1px solid rgba(0, 0, 0, 0.05); border: 1px solid rgba(0, 0, 0, 0.05);
-webkit-border-radius: 4px; -webkit-border-radius: 4px;