Skip to content
  • P
    Projects
  • G
    Groups
  • S
    Snippets
  • Help

CIRCLE / cloud

  • This project
    • Loading...
  • Sign in
Go to a project
  • Project
  • Repository
  • Issues 94
  • Merge Requests 10
  • Pipelines
  • Wiki
  • Snippets
  • Members
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Merged
Merge request !317 opened Apr 08, 2015 by Kálmán Viktor@kviktor 
  • Report abuse
Report abuse

Html fixes ✅

  • Discussion 4
  • Commits 3
  • Changes
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Bach Dániel @bachdaniel commented Apr 09, 2015
    Owner
    diff --git a/circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html b/circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html
    index 6efbf35..b01f7a7 100644
    --- a/circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html
    +++ b/circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html
    @@ -19,7 +19,7 @@
       - {{ a.percentage }}%
     {% endif %}
     </strong>
    -{% endspaceless %}{% if a.times < 2 %} <span title="{{ a.started }}">{{ a.started|arrowfilter:LANGUAGE_CODE }}</span>{% endif %}{% if a.user %},
    +{% endspaceless %}{% if a.times < 2 %}&nbsp;<span title="{{ a.started }}">{{ a.started|arrowfilter:LANGUAGE_CODE }}</span>{% endif %}{% if a.user %},
       <a class="no-style-link" href="{% url "dashboard.views.profile" username=a.user.username %}">
         {% include "dashboard/_display-name.html" with user=a.user show_org=True %}
       </a>
    Edited Apr 09, 2015
    ```diff diff --git a/circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html b/circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html index 6efbf35..b01f7a7 100644 --- a/circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html +++ b/circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html @@ -19,7 +19,7 @@ - {{ a.percentage }}% {% endif %} </strong> -{% endspaceless %}{% if a.times < 2 %} <span title="{{ a.started }}">{{ a.started|arrowfilter:LANGUAGE_CODE }}</span>{% endif %}{% if a.user %}, +{% endspaceless %}{% if a.times < 2 %}&nbsp;<span title="{{ a.started }}">{{ a.started|arrowfilter:LANGUAGE_CODE }}</span>{% endif %}{% if a.user %}, <a class="no-style-link" href="{% url "dashboard.views.profile" username=a.user.username %}"> {% include "dashboard/_display-name.html" with user=a.user show_org=True %} </a> ```
  • Bach Dániel @bachdaniel

    Added 1 new commit:

    • 742019bf - dashboard: fix navbar-brand blocks
    Apr 09, 2015

    Added 1 new commit:

    • 742019bf - dashboard: fix navbar-brand blocks
    Added 1 new commit: * 742019bf - dashboard: fix navbar-brand blocks
    Toggle commit list
  • Bach Dániel
    @bachdaniel started a discussion on the diff Apr 12, 2015
    Last updated by Bach Dániel Apr 13, 2015
    circle/templates/registration/login.html
    21 15 {% endif %}
    22 16 <div class="col-xs-{% if saml2 %}6{% else %}12{% endif %}">
    23 17 <div class="login-form">
    24 <form action="" method="POST">
    25 {% csrf_token %}
    26 {% crispy form %}
    27 </form>
    18 {% crispy form %}
    • Bach Dániel @bachdaniel commented Apr 12, 2015
      Owner

      login-form

      ❄ 🔑

      ![login-form](https://git.ik.bme.hu/circle/cloud/uploads/99b28d6d752763f7573dcd75e3507522/login-form.png) :snowflake: :key:
    • Kálmán Viktor @kviktor commented Apr 12, 2015
      Owner

      I can't call it html-fixes anymore then https://git.ik.bme.hu/circle/cloud/blob/master/circle/dashboard/forms.py#L1051 😿

      Edited Apr 12, 2015
      I can't call it html-fixes anymore then https://git.ik.bme.hu/circle/cloud/blob/master/circle/dashboard/forms.py#L1051 :crying_cat_face:
    • Bach Dániel @bachdaniel commented Apr 13, 2015
      Owner

      hogymi

      ![hogymi](http://img3.wikia.nocookie.net/__cb20140120031154/glee/images/1/11/Funny-dog-face-picture-480x300.jpg)
    Please register or sign in to reply
  • Kálmán Viktor @kviktor

    Added 1 commit:

    • ef73c27c - dashboard: fix a weird title issue
    Apr 20, 2015

    Added 1 commit:

    • ef73c27c - dashboard: fix a weird title issue
    Added 1 commit: * ef73c27c - dashboard: fix a weird title issue
    Toggle commit list
  • Bach Dániel @bachdaniel

    Status changed to merged

    May 05, 2015

    Status changed to merged

    Status changed to merged
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View labels
2
2 participants
Reference: circle/cloud!317