Merge branch 'master' of git@github.com:zalun/FlightDeck

This commit is contained in:
Piotr Zalewa 2010-03-04 17:11:01 +00:00
Родитель c7df174813 3485617009
Коммит 0b73dea638
7 изменённых файлов: 48 добавлений и 49 удалений

Просмотреть файл

@ -28,7 +28,7 @@ authors:
border-right: solid 1px #F2F4F7;
color: #4D5860;
text-shadow: 0 1px 0 #fff;
padding: 16px 0 16px 45px;
padding: 12px 0 12px 45px;
}
.UI_Sidebar_Toggler a #dependency-counter {

Просмотреть файл

@ -1,12 +1,12 @@
<form class="UI_Forms" id="create_form" method="post" accept-charset="utf-8">
<h3>Create new Jetpack/Module</h3>
<h3>Create new Extension/Module</h3>
<fieldset>
<legend>Create new Jetpack/Module</legend>
<legend>Create new Extension/Module</legend>
<ul class="UI_Choice">
<li>
<input id="create-jetpack" type="radio" name="choice" value="jetpack" checked="checked" />
<label for="create-jetpack">Jetpack</label>
<label for="create-jetpack">Extension</label>
</li>
<li>
<input id="create-capability" type="radio" name="choice" value="capability" />

Просмотреть файл

@ -21,7 +21,7 @@
</p>
{% endif %}
<p class="UI_Sidebar_Creator">Origin by <a title="{{ item.creator }}" href="{% url person_public_profile item.creator.username %}">{{ item.creator }}</a></p>
<p class="UI_Sidebar_Creator">Authored by <a title="{{ item.creator }}" href="{% url person_public_profile item.creator.username %}">{{ item.creator }}</a></p>
{% if version %}{% ifequal item.creator.username version.author.username %}
{% else %}

Просмотреть файл

@ -1,44 +1,43 @@
<div id="editor-menu-wrapper">
<ul class="UI_Editor_Menu">
<li class="UI_Editor_Menu_Button Icon_new">
<a id="create" title="" href="#">New <span class="UI_Editor_Icon"></span></a>
</li>
<li class="UI_Editor_Menu_Button Icon_saveNewVersion">
<a id="version_create" title="" href="#">Save new version
<div id="editor-menu-wrapper">
<ul class="UI_Editor_Menu">
<li class="UI_Editor_Menu_Button Icon_new">
<a id="create" title="" href="#">New <span class="UI_Editor_Icon"></span></a>
</li>
<li class="UI_Editor_Menu_Button Icon_saveNewVersion">
<a id="version_create" title="" href="#">Save new version
<span class="UI_Editor_Icon"></span>
</a>
</li>
<li class="UI_Editor_Menu_Button Icon_update disabled">
<a id="update" title="" href="#">Update <span class="UI_Editor_Icon"></span></a>
</li>
{% if version.is_base %}
<li class="UI_Editor_Menu_Button Icon_setAsBase">
<a id="set_as_base" title="" href="#">Base version
<span class="UI_Editor_Icon"></span>
</a>
</li>
<li class="UI_Editor_Menu_Button Icon_update disabled">
<a id="update" title="" href="#">Update <span class="UI_Editor_Icon"></span></a>
{% else %}
<li class="UI_Editor_Menu_Button Icon_setAsBase">
<a id="set_as_base" title="" href="#">Set as base
<span class="UI_Editor_Icon"></span>
</a>
</li>
{% if version.is_base %}
<li class="UI_Editor_Menu_Button Icon_setAsBase">
<a id="set_as_base" title="" href="#">Base version
<span class="UI_Editor_Icon"></span>
</a>
</li>
{% else %}
<li class="UI_Editor_Menu_Button Icon_setAsBase">
<a id="set_as_base" title="" href="#">Set as base
<span class="UI_Editor_Icon"></span>
</a>
</li>
{% endif %}
{% ifequal type "jetpack" %}{% if version %}
<li class="UI_Editor_Menu_Button Icon_try_in_browser">
<a id="try_in_browser" title="" href="#">Try in browser
<span class="UI_Editor_Icon"></span>
</a>
</li>
{% endif %}{% endifequal %}
{% comment %}
<li class="UI_Editor_Menu_Button Icon_lock">
<a title="" href="#">Lock <span class="UI_Editor_Icon"></span></a>
{% endif %}
{% ifequal type "jetpack" %}{% if version %}
<li class="UI_Editor_Menu_Button Icon_try_in_browser">
<a id="try_in_browser" title="" href="#">Try in browser
<span class="UI_Editor_Icon"></span>
</a>
</li>
<li class="UI_Editor_Menu_Button Icon_delete">
<a title="" href="#">Delete <span class="UI_Editor_Icon"></span></a>
</li>
{% endcomment %}
</ul>
</div> <!-- /editor-menu-wrapper -->
{% endif %}{% endifequal %}
{% comment %}
<li class="UI_Editor_Menu_Button Icon_lock">
<a title="" href="#">Lock <span class="UI_Editor_Icon"></span></a>
</li>
<li class="UI_Editor_Menu_Button Icon_delete">
<a title="" href="#">Delete <span class="UI_Editor_Icon"></span></a>
</li>
{% endcomment %}
</ul>
</div> <!-- /editor-menu-wrapper -->

Просмотреть файл

@ -18,7 +18,7 @@
{% endblock %}
{% block app_content %}
<h2 class="UI_Heading">Recent jetpacks</h2>
<h2 class="UI_Heading">Recent Extensions</h2>
<ul class="UI_Browser">
{% for item in items %}

Просмотреть файл

@ -14,7 +14,7 @@
<ul class="UI_Action_List">
{% if user.authored_jetpacks.all %}
<li>
<a title="Your Jetpacks" href="#your-jetpacks">Your Jetpacks</a>
<a title="Your Jetpacks" href="#your-jetpacks">Your Extensions</a>
<strong>({{ user.authored_jetpacks.all|length }})</strong>
</li>
{% endif %}
@ -29,7 +29,7 @@
{% block app_content %}
{% if user.authored_jetpacks.all %}
<h2 id="your-jetpacks" class="UI_Heading">Your Jetpacks</h2>
<h2 id="your-jetpacks" class="UI_Heading">Your Extensions</h2>
<ul class="UI_Browser">
{% for jet in user.authored_jetpacks.all %}
<li class="UI_Item">{{ jet|render_base_link }}</li>

Просмотреть файл

@ -11,7 +11,7 @@
<ul class="UI_Action_List">
{% if person.authored_jetpacks.all %}
<li>
<a title="Your Jetpacks" href="#your-jetpacks">Jetpacks</a>
<a title="Your Jetpacks" href="#your-jetpacks">Extensions</a>
<strong>({{ person.authored_jetpacks.all|length }})</strong>
</li>
{% endif %}
@ -26,7 +26,7 @@
{% block app_content %}
{% if person.authored_jetpacks.all %}
<h2 id="your-jetpacks" class="UI_Heading">Jetpacks</h2>
<h2 id="your-jetpacks" class="UI_Heading">Extensions</h2>
<ul class="UI_Browser">
{% for jet in person.authored_jetpacks.all %}
<li class="UI_Item">{{ jet|render_base_link }}</li>