[merlot] push by esar...@gmail.com - Tweaked quicklog style. on 2012-03-18 00:01 GMT

[mer...@googlecode.com]

Revision: cfe4fb60105f
Author: Emanuel Sartor <ema...@menttes.com>
Date: Sat Mar 17 17:00:34 2012
Log: Tweaked quicklog style.
http://code.google.com/p/merlot/source/detail?r=cfe4fb60105f

Modified:
/merlot/app.py
/merlot/project_templates/add_log_ajax_form.pt
/merlot/static/images/check.png
/merlot/static/images/close.png
/merlot/static/quicklog.js
/merlot/static/style.css

=======================================
--- /merlot/app.py Wed Mar 23 23:51:59 2011
+++ /merlot/app.py Sat Mar 17 17:00:34 2012
@@ -434,8 +434,8 @@
def render(self):
messages = {
'DELETE_I18N': _('delete'),
- 'SUCCESS_I18N': _('Success'),
- 'MORE_I18N': _('More'),
+ 'SUCCESS_I18N': _('The log was successfully saved'),
+ 'MORE_I18N': _('Add another log to this task'),
'ENTER_DATE_HERE_I18N': _("Enter a date here"),
'TYPE_DATE_BELOW_I18N': _("Type a date below"),
'TODAY_I18N': _('Today'),
=======================================
--- /merlot/project_templates/add_log_ajax_form.pt Wed Mar 23 23:51:59 2011
+++ /merlot/project_templates/add_log_ajax_form.pt Sat Mar 17 17:00:34 2012
@@ -14,24 +14,21 @@
<input tal:replace="structure view/widgets/remaining"/>
<!-- <input type="text" value="" size="3"
name="form.remaining" id="form.remaining" class="textType"> -->
</div>
- <div class="field-container">
- <span class="header" i18n:translate="">Description: </span>
- <textarea rows="3" name="form.description"
id="form.description" cols="26"></textarea>
- </div>
- <div class="field-container">
- <span class="date-translated"></span>
- </div>
<div class="field-container">
<span class="header" i18n:translate="">Date:</span>
+ <div class="date-translated hint"></div>
<input type="text" value="" size="12" name="form.date"
id="form.date" class="textType"/>
</div>

- <!-- render all the action submit buttons -->
- <span class="actionButtonsLog" tal:condition="view/availableActions">
- <input tal:repeat="action view/actions"
- tal:replace="structure action/render" />
- </span>
-
+ <div class="field-container">
+ <span class="header" i18n:translate="">Description: </span>
+ <textarea rows="3" name="form.description"
id="form.description" cols="26"></textarea>
+ </div>
+ <!-- render all the action submit buttons -->
+ <span class="actionButtonsLog"
tal:condition="view/availableActions">
+ <input tal:repeat="action view/actions"
+ tal:replace="structure action/render" />
+ </span>
</form>
</body>
</html>
=======================================
--- /merlot/static/images/check.png Wed Mar 23 23:51:59 2011
+++ /merlot/static/images/check.png Sat Mar 17 17:00:34 2012
Binary file, no diff available.
=======================================
--- /merlot/static/images/close.png Wed Mar 23 23:51:59 2011
+++ /merlot/static/images/close.png Sat Mar 17 17:00:34 2012
Binary file, no diff available.
=======================================
--- /merlot/static/quicklog.js Sun Apr 3 16:23:56 2011
+++ /merlot/static/quicklog.js Sat Mar 17 17:00:34 2012
@@ -87,7 +87,7 @@
row.empty();
row.append('<div class="success">'+
'<h3><img alt="success" class="success"
src="/fanstatic/merlot/images/check.png">'+merlot.i18n.SUCCESS_I18N+'</h3>'+
- '<a class="more-logs"
href="#">'+merlot.i18n.MORE_I18N+'?</a>'+
+ '<a class="more-logs"
href="#">'+merlot.i18n.MORE_I18N+'</a>'+
'</div>');
$('.success', row).hide().fadeIn('slow');
more_logs_link = $('.more-logs', row);
=======================================
--- /merlot/static/style.css Sat Mar 17 13:16:51 2012
+++ /merlot/static/style.css Sat Mar 17 17:00:34 2012
@@ -403,6 +403,7 @@
form .hint {
color:#555555;
font-size:0.8em;
+ margin-bottom:1px;
}
form .field {
margin-bottom:0.8em;
@@ -498,13 +499,6 @@
}

/* Report forms tweaks */
-#tasks-report-form #form\.project_or_client,
-#tasks-report-form #form\.user,
-#logs-report-form #form\.project_or_client,
-#logs-report-form #form\.user {
- margin-top:2px;
-}
-
#logs-report-form #form\.actions\.submit,
#tasks-report-form #form\.actions\.submit {
margin-top:35px;
@@ -583,6 +577,9 @@
margin-top: 0.5em !important;
}

+img.calendar-icon {
+ margin-left: 2px;
+}

/*LAYOUT HELPERS*/
.row {
@@ -644,9 +641,9 @@
/*ajax log box*/
.log-row {
display:none;
- padding:5px;
- width:21em;
- height:15em;
+ padding:3px;
+ width:22em;
+ height:16em;
background:#EEE url("images/point-arrow.png") no-repeat scroll right
center;
border: 5px solid #CCCCCC;
border-radius:7px 7px 7px 7px;
@@ -694,20 +691,17 @@
font-weight: bold;
padding: 5px 1em 5px 1em;
margin-right:1em;
-}
-.logged-data {
- padding-top: 1em;
-}
-.logged-data .header,
-.field-container .header{
- font-weight:bold;
-}
-.logged-data .data {
- padding-right:1em;
- color:#666;
-}
-.logged-data .success {
- vertical-align:middle;
+ margin-top:1em;
+}
+.log-row div.success {
+ padding-top: 55px;
+ text-align: center;
+}
+.log-row img.success {
+ padding-right: 5px;
+}
+.log-row a.more-logs {
+ margin-top: 15px;
}
#reports-listing {
padding-left: 20px;