You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2012/10/26 00:30:01 UTC
[10/12] git commit: [#4942] Removed some more references to
ForgeDownloads
[#4942] Removed some more references to ForgeDownloads
Signed-off-by: Cory Johns <jo...@geek.net>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/30c0f473
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/30c0f473
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/30c0f473
Branch: refs/heads/cj/5076
Commit: 30c0f473dac5d58b7aefb08912d38e77ac0db87d
Parents: b8cb9ae
Author: Cory Johns <jo...@geek.net>
Authored: Thu Oct 11 19:45:30 2012 +0000
Committer: Dave Brondsema <db...@geek.net>
Committed: Thu Oct 18 19:15:20 2012 +0000
----------------------------------------------------------------------
Allura/allura/controllers/project.py | 2 +-
.../allura/ext/admin/templates/project_admin.html | 21 ------
Allura/allura/lib/widgets/forms.py | 1 -
Allura/allura/nf/allura/css/allura.css | 12 ---
Allura/allura/nf/allura/css/site_style.css | 4 -
.../widgets/neighborhood_add_project.html | 53 ++++++---------
.../allura/tests/functional/test_neighborhood.py | 3 +-
run_clonedigger | 1 -
run_tests | 1 -
9 files changed, 24 insertions(+), 74 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/30c0f473/Allura/allura/controllers/project.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/project.py b/Allura/allura/controllers/project.py
index 021b9cf..dea6d3f 100644
--- a/Allura/allura/controllers/project.py
+++ b/Allura/allura/controllers/project.py
@@ -138,7 +138,7 @@ class NeighborhoodController(object):
c.project = self.neighborhood.neighborhood_project
require_access(self.neighborhood, 'register')
c.add_project = W.add_project
- form_data.setdefault('tools', [u'Wiki',u'Git',u'Tickets',u'Downloads',u'Discussion'])
+ form_data.setdefault('tools', [u'Wiki',u'Git',u'Tickets',u'Discussion'])
form_data['neighborhood'] = self.neighborhood.name
return dict(neighborhood=self.neighborhood, form_data=form_data)
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/30c0f473/Allura/allura/ext/admin/templates/project_admin.html
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/templates/project_admin.html b/Allura/allura/ext/admin/templates/project_admin.html
index a193588..c579265 100644
--- a/Allura/allura/ext/admin/templates/project_admin.html
+++ b/Allura/allura/ext/admin/templates/project_admin.html
@@ -2,7 +2,6 @@
{% set wiki_found = False %}
{% set code_found = False %}
{% set tracker_found = False %}
-{% set downloads_found = False %}
{% set forum_found = False %}
{% block title %}{{c.project.name}} / Admin{% endblock %}
@@ -79,26 +78,6 @@
</div>
<div style="clear:both"></div>
- {% if config.get('auth.method', 'local') == 'sfx' %}
- <div class="grid-2">
- <img src="{{ g.theme.app_icon_url('Downloads', 48) }}" alt="">
- </div>
- <div class="grid-13">
- <h3>Downloads</h3>
- <p>Upload releases, track who is downloading your project around the world, and use the largest free, managed, global mirror network to distribute your files.</p>
- </div>
- <div class="grid-4">
- {% for tool in c.project.app_configs %}
- {% if tool.tool_name == 'Downloads' and not downloads_found %}
- <a href="/projects/{{c.project.get_tool_data('sfx', 'unix_group_name') }}/upload/">Upload Release</a><br>
- <a href="/projects/{{c.project.get_tool_data('sfx', 'unix_group_name') }}/files/">View Releases</a>
- {% set downloads_found = True %}
- {% endif %}
- {% endfor %}
- </div>
- <div style="clear:both"></div>
- {% endif %}
-
<div class="grid-2">
<img src="{{ g.theme.app_icon_url('Discussion', 48) }}" alt="">
</div>
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/30c0f473/Allura/allura/lib/widgets/forms.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/forms.py b/Allura/allura/lib/widgets/forms.py
index 86860d2..3163218 100644
--- a/Allura/allura/lib/widgets/forms.py
+++ b/Allura/allura/lib/widgets/forms.py
@@ -275,7 +275,6 @@ class NeighborhoodAddProjectForm(ForgeForm):
ew.Option(label='Hg', html_value='Hg'),
ew.Option(label='SVN', html_value='SVN'),
ew.Option(label='Tickets', html_value='Tickets', selected=True),
- ew.Option(label='Downloads', html_value='Downloads', selected=True),
ew.Option(label='Discussion', html_value='Discussion', selected=True),
ew.Option(label='Blog', html_value='Blog')
])
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/30c0f473/Allura/allura/nf/allura/css/allura.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/allura.css b/Allura/allura/nf/allura/css/allura.css
index 5888fed..1f32750 100644
--- a/Allura/allura/nf/allura/css/allura.css
+++ b/Allura/allura/nf/allura/css/allura.css
@@ -76,12 +76,6 @@ b.ico.ico-vote-down { background-image: url('../images/vote_down.png'); }
}
/* TODO: Move to forge-classic per PT#53 */
-.ui-icon-tool-downloads {
- background-image: url("../images/downloads_24.png");
- background-repeat: no-repeat;
-}
-
-/* TODO: Move to forge-classic per PT#53 */
.ui-icon-tool-summary {
background-image: url("../images/blog_24.png");
background-repeat: no-repeat;
@@ -133,9 +127,6 @@ b.ico.ico-vote-down { background-image: url('../images/vote_down.png'); }
#top_nav .ui-icon-tool-tickets {
background-image: url("../images/tickets_32.png");
}
-#top_nav .ui-icon-tool-downloads {
- background-image: url("../images/downloads_32.png");
-}
#top_nav .ui-icon-tool-link {
background-image: url("../images/ext_32.png");
}
@@ -170,9 +161,6 @@ b.ico.ico-vote-down { background-image: url('../images/vote_down.png'); }
.big_icon.ui-icon-tool-tickets {
background-image: url("../images/tickets_48.png");
}
-.big_icon.ui-icon-tool-downloads {
- background-image: url("../images/downloads_48.png");
-}
.big_icon.ui-icon-tool-link {
background-image: url("../images/ext_48.png");
}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/30c0f473/Allura/allura/nf/allura/css/site_style.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/site_style.css b/Allura/allura/nf/allura/css/site_style.css
index 1d2ac7d..c5dec9e 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -2215,10 +2215,6 @@ div.attachment_thumb .file_type span {
background-repeat: no-repeat;
}
-.ui-icon-tool-downloads {
- background-repeat: no-repeat;
-}
-
.ui-icon-tool-link {
background-repeat: no-repeat;
}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/30c0f473/Allura/allura/templates/widgets/neighborhood_add_project.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/neighborhood_add_project.html b/Allura/allura/templates/widgets/neighborhood_add_project.html
index 5700a68..389e4ba 100644
--- a/Allura/allura/templates/widgets/neighborhood_add_project.html
+++ b/Allura/allura/templates/widgets/neighborhood_add_project.html
@@ -41,25 +41,26 @@
and efficiency.</p>
</div>
<div class="tool">
- <div class="big_icon ui-icon-tool-downloads"></div>
- <input checked type="checkbox" value="Downloads"
+ <div class="big_icon ui-icon-tool-tickets"></div>
+ <input checked type="checkbox" value="Tickets"
name="{{ widget.context_for(widget.fields.tools)['rendered_name'] }}"
- id="{{ widget.context_for(widget.fields.tools)['rendered_name'] }}_Downloads">
- <h1><label for="{{ widget.context_for(widget.fields.tools)['rendered_name'] }}_Downloads">Downloads & Stats</label></h1>
- <p>Use the largest free, managed, global mirror network to
- distribute your files, and follow the download trends that
- enable you to develop better software.</p>
+ id="{{ widget.context_for(widget.fields.tools)['rendered_name'] }}_Tickets">
+ <h1><label for="{{ widget.context_for(widget.fields.tools)['rendered_name'] }}_Tickets">Tickets</label></h1>
+ <p>Bugs, enhancements, tasks, etc., will help you plan and
+ manage your development.</p>
</div>
<div style="clear:both"></div>
</div>
<div class="inner-row">
<div class="tool">
<div class="big_icon ui-icon-tool-git"></div>
- <input type="checkbox" value="SVN"
+ <input type="checkbox" value="Hg"
name="{{ widget.context_for(widget.fields.tools)['rendered_name'] }}"
- id="{{ widget.context_for(widget.fields.tools)['rendered_name'] }}_SVN">
- <h1><label for="{{ widget.context_for(widget.fields.tools)['rendered_name'] }}_SVN">SVN</label></h1>
- <p>Enterprise-class centralized version control for the masses.</p>
+ id="{{ widget.context_for(widget.fields.tools)['rendered_name'] }}_Hg">
+ <h1><label for="{{ widget.context_for(widget.fields.tools)['rendered_name'] }}_Hg">Mercurial</label></h1>
+ <p>Mercurial is a distributed source control management tool that efficiently
+ handles projects of any size and offers an easy and intuitive
+ interface.</p>
</div>
<div class="tool">
<div class="big_icon ui-icon-tool-wiki"></div>
@@ -75,26 +76,24 @@
<div class="inner-row">
<div class="tool">
<div class="big_icon ui-icon-tool-git"></div>
- <input type="checkbox" value="Hg"
+ <input type="checkbox" value="SVN"
name="{{ widget.context_for(widget.fields.tools)['rendered_name'] }}"
- id="{{ widget.context_for(widget.fields.tools)['rendered_name'] }}_Hg">
- <h1><label for="{{ widget.context_for(widget.fields.tools)['rendered_name'] }}_Hg">Mercurial</label></h1>
- <p>Mercurial is a distributed source control management tool that efficiently
- handles projects of any size and offers an easy and intuitive
- interface.</p>
+ id="{{ widget.context_for(widget.fields.tools)['rendered_name'] }}_SVN">
+ <h1><label for="{{ widget.context_for(widget.fields.tools)['rendered_name'] }}_SVN">SVN</label></h1>
+ <p>Enterprise-class centralized version control for the masses.</p>
</div>
<div class="tool">
- <div class="big_icon ui-icon-tool-tickets"></div>
- <input checked type="checkbox" value="Tickets"
+ <div class="big_icon ui-icon-tool-discussion"></div>
+ <input checked type="checkbox" value="Discussion"
name="{{ widget.context_for(widget.fields.tools)['rendered_name'] }}"
- id="{{ widget.context_for(widget.fields.tools)['rendered_name'] }}_Tickets">
- <h1><label for="{{ widget.context_for(widget.fields.tools)['rendered_name'] }}_Tickets">Tickets</label></h1>
- <p>Bugs, enhancements, tasks, etc., will help you plan and
- manage your development.</p>
+ id="{{ widget.context_for(widget.fields.tools)['rendered_name'] }}_Discussion">
+ <h1><label for="{{ widget.context_for(widget.fields.tools)['rendered_name'] }}_Discussion">Forums</label></h1>
+ <p>Collaborate with your community in your forum.</p>
</div>
<div style="clear:both"></div>
</div>
<div class="inner-row">
+ <div class="tool" style="visibility: hidden"></div>
<div class="tool">
<div class="big_icon ui-icon-tool-blog"></div>
<input type="checkbox" value="Blog"
@@ -104,14 +103,6 @@
<p>Share exciting news and progress updates with your
community.</p>
</div>
- <div class="tool">
- <div class="big_icon ui-icon-tool-discussion"></div>
- <input checked type="checkbox" value="Discussion"
- name="{{ widget.context_for(widget.fields.tools)['rendered_name'] }}"
- id="{{ widget.context_for(widget.fields.tools)['rendered_name'] }}_Discussion">
- <h1><label for="{{ widget.context_for(widget.fields.tools)['rendered_name'] }}_Discussion">Forums</label></h1>
- <p>Collaborate with your community in your forum.</p>
- </div>
<div style="clear:both"></div>
</div>
{% endif %}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/30c0f473/Allura/allura/tests/functional/test_neighborhood.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_neighborhood.py b/Allura/allura/tests/functional/test_neighborhood.py
index 44aeaa9..5257a91 100644
--- a/Allura/allura/tests/functional/test_neighborhood.py
+++ b/Allura/allura/tests/functional/test_neighborhood.py
@@ -555,10 +555,9 @@ class TestNeighborhood(TestController):
"blog":{"label":"News","mount_point":"news","options":{
"show_discussion":false
}},
- "downloads":{"label":"Downloads","mount_point":"downloads"},
"admin":{"label":"Admin","mount_point":"admin"}
},
- "tool_order":["wiki","discussion","news","downloads","admin"],
+ "tool_order":["wiki","discussion","news","admin"],
"labels":["mmi"],
"trove_cats":{
"topic":[247],
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/30c0f473/run_clonedigger
----------------------------------------------------------------------
diff --git a/run_clonedigger b/run_clonedigger
index 506a815..8ebfbce 100755
--- a/run_clonedigger
+++ b/run_clonedigger
@@ -21,7 +21,6 @@ if [ "$TEST_MODULES" == "" ]; then
ForgeSVN \
ForgeTracker \
ForgeWiki \
- ForgeDownloads \
"
fi
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/30c0f473/run_tests
----------------------------------------------------------------------
diff --git a/run_tests b/run_tests
index decc004..a37f012 100755
--- a/run_tests
+++ b/run_tests
@@ -21,7 +21,6 @@ if [ "$TEST_MODULES" == "" ]; then
ForgeSVN \
ForgeTracker \
ForgeWiki \
- ForgeDownloads \
ForgeActivity \
ForgeShortUrl \
"