Revision 67921b5c

b/invitations/templates/invitations.html
16 16
</head>
17 17
<body>
18 18
{% endif %}
19
<div class="invitations-left">({% blocktrans with invitations_left as left %}{{ left }} left{% endblocktrans %})</div>
19
<div class="invitations-left">({% blocktrans count invitations_left as left %}
20
{{ left }} invitation left
21
{% plural %}
22
{{ left }} invitations left
23
{% endblocktrans %})</div>
20 24
<form action="/invitations/" method="post" id="invform">
21 25
    {% csrf_token %}
22 26
    
b/ui/static/main.css
4011 4011
    font-style: italic;
4012 4012
    font-size: 0.9em;
4013 4013
    color: #888;
4014
    padding-left: 2px;
4014
    margin-top: 3px;
4015 4015
}
4016 4016

  
4017 4017
#feedback-form .feedback-text {
......
4021 4021
    margin-bottom: 10px;
4022 4022
}
4023 4023

  
4024
#feedback-form .submit-data {
4025
    display: none;
4026
}
4027

  
4024 4028
#feedback-form .submit, #invform .submit {
4025 4029
    background-color: #4085A5;
4026 4030
    color: #fff;
......
4042 4046
    background-color: #549FC3;
4043 4047
}
4044 4048

  
4049
.feedback-intro {
4050
    padding-right: 15px !important;
4051
    text-align: justify;
4052
}
4053

  
4045 4054
.popup-body .message {
4046 4055
    padding: 20px 5px;
4047 4056
    display: none;
b/ui/static/synnefo.js
2311 2311
        
2312 2312
        $(".invitations-left").hide();
2313 2313
        $("#notification-box .header-box").html("");
2314
        $("#notification-box .header-box").html("Invitations " + $($(".invitations-left")[0]).text());
2314
        $("#notification-box .header-box").html(window.INVITATIONS_TITLE + " " + $($(".invitations-left")[0]).text());
2315 2315

  
2316 2316
        form.submit(function(evn){
2317 2317
            evn.preventDefault();
b/ui/templates/disks.html
32 32
interpreted as representing official policies, either expressed
33 33
or implied, of GRNET S.A.
34 34
-->
35
{% load i18n %}
35 36

  
36
<div id="disks" class="separator"></div>
37
<div id="emptymachineslist" style="display:block">
38
<h1 id="welcomeheader">Coming soon...</h1>
39
</div>
37 40

  
38

  
39
{% trans "The disks" %}
40

  
41
<div id="disks" class="separator"></div>
b/ui/templates/home.html
73 73
        var UPDATE_INTERVAL = {{update_interval}};
74 74
        var LOGOUT_REDIRECT = undefined;
75 75
        var INVITATIONS_URL = "{% url invitations %}";
76
        var INVITATIONS_TITLE = "{% trans "Invitations" %}";
76
        var INVITATIONS_TITLE = "{% trans "Invite people" %}";
77 77
        var APP_DEBUG = {% if DEBUG %}true{% else %}false{% endif %};
78 78
        var FEEDBACK_URL = "{% url feedback %}";
79
        var FEEDBACK_TITLE = "{% trans "Feedback" %}";
79
        var FEEDBACK_TITLE = "{% trans "Send us feedback" %}";
80 80

  
81 81
        // server statuses and transitions
82 82
        var STATUSES = {
......
401 401
                <div class="usermenu">
402 402
                    <div class="username">{{ request.user.uniq }}</div>
403 403
                    <ul class="useractions">
404
                        <li class="invitations"><a class="action" href="#">{% trans "invitations" %}</a></li>
405
                        <li class="feedback"><a class="action" href="#">{% trans "feedback" %}</a></li>
404
                        <li class="invitations"><a class="action" href="#">{% trans "invite people..." %}</a></li>
405
                        <li class="feedback"><a class="action" href="#">{% trans "send us feedback..." %}</a></li>
406 406
                        <li class="logout last"><a class="action" href="#">{% trans "logout" %}</a></li>
407 407
                    </ul>
408 408
                </div>
......
536 536

  
537 537
    <div class="modal" id="error-success">
538 538
        <h3 class="popup-header">
539
            <span class="header-box">{% trans "Feedback form" %}</span>
539
            <span class="header-box"></span>
540 540
        </h3>
541 541
        <div class="popup-body">
542 542
            <div class="popup-body-inner">
543 543
                <div class="error-report">
544
                    <div class="send-btn">{% trans "send error report" %}</div>
545
                    <div class="sending">{% trans "sending...." %}</div>
546
                    <div class="errormsg">{% trans "cannot send error report" %}</div>
544
                    <div class="send-btn">{% trans "report error" %}</div>
545
                    <div class="sending">{% trans "sending error report..." %}</div>
546
                    <div class="errormsg">{% trans "report failed" %}</div>
547 547
                    <div class="success">{% trans "report send successfully" %}</div>
548 548
                </div>
549 549
                <div class="machine-now-building"></div>
......
562 562

  
563 563
    <div class="modal" id="feedback-form" class="feedback notification-box">
564 564
        <h3 class="popup-header">
565
            <span class="header-box">{% trans "Feedback form" %}</span>
565
            <span class="header-box">{% trans "Send us feedback" %}</span>
566 566
        </h3>
567 567
        <div class="popup-body">
568 568
            <div class="popup-body-inner">
569 569
                <div class="form-container">
570 570
                <p class="feedback-intro">
571
                {% blocktrans %}
572
                Feedback form intro text ..... .. ... .. ..... .. .. . .. . .. .. .. ...... .. .
573
                Feedback form intro text ..... .. ... .. ..... .. .. . .. . .. .. .. ...... .. .
574
                Feedback form intro text ..... .. ... .. ..... .. .. . .. . .. .. .. ...... .. .
575
                {% endblocktrans %}</p>
571
                {% blocktrans %}~ okeanos is currently in alpha version and we would appreciate any kind of feedback.
572
We welcome any suggestions, questions and bug reports you may have.{% endblocktrans %}</p>
576 573
                <form id="feedback-form">
577
                    <label for="feedback-msg">{% trans "Feedback or question" %}</label>
578
                    <div class="description">{% trans "please describe here .... blah blah blah" %}</div>
579
                    <div class="empty-error-msg">{% trans "Please fill out the feedback form" %}</div>
574
                    <label for="feedback-msg">{% trans "Feedback message" %}</label>
575
                    <div class="description">{% trans "Please describe your problem here, provide as many details as possible" %}</div>
576
                    <div class="empty-error-msg">{% trans "" %}</div>
580 577
                    <textarea name="feedback-msg" class="feedback-text"></textarea>
581
                    <input type="checkbox" name="submit-submit-data"/><label class="inline" for="submit-submit-data">{% trans "submit application data" %}</label>
582
                    <div class="description">{% trans "describe what application data checkbox does" %}</div>
578

  
579
                    <input type="checkbox" name="submit-submit-data" class='submit-data' />
583 580
                    <input type="submit" value="{% trans "submit feedback" %}" class="submit" />
584 581
                    <textarea name="feedback-data" class="data-text"></textarea>
585 582
                </form>

Also available in: Unified diff