kallithea Changeset - 47c2a006d43b

Changeset - 47c2a006d43b

Parent rev.

Child rev.

[Not reviewed]

beta

0 5 0

Marcin Kuzminski - 14 years ago 2011-12-03 03:14:41
marcin@python-works.com

Summary page downloads limited to zip.
- changing url can download also other formats
- just zip is enough for most cases
- looks cleaner

5 files changed with 59 insertions and 40 deletions:

rhodecode/model/__init__.py

rhodecode/model/scm.py

rhodecode/public/css/diff.css

rhodecode/public/css/style.css

rhodecode/templates/summary/summary.html

0 comments (0 inline, 0 general)

rhodecode/model/__init__.py

➞

Show inline comments

@@ @@ -58,13 +58,14 @@ def init_model(engine): @@
     """
     log.info("initializing db for %s", engine)
     meta.Base.metadata.bind = engine
 class BaseModel(object):
     """Base Model for all RhodeCode models, it adds sql alchemy session
     """
     Base Model for all RhodeCode models, it adds sql alchemy session
     into instance of model
     :param sa: If passed it reuses this session instead of creating a new one
     """
     def __init__(self, sa=None):

rhodecode/model/scm.py

➞

Show inline comments

@@ @@ -138,40 +138,40 @@ class ScmModel(BaseModel): @@
         log.info('scanning for repositories in %s', repos_path)
         if repos_path is None:
             repos_path = self.repos_path
         baseui = make_ui('db')
-        repos_list = {}
+        repos = {}
         for name, path in get_filesystem_repos(repos_path, recursive=True):
             # name need to be decomposed and put back together using the /
             # since this is internal storage separator for rhodecode
             name = Repository.url_sep().join(name.split(os.sep))
             try:
-                if name in repos_list:
+                if name in repos:
                     raise RepositoryError('Duplicate repository name %s '
                                           'found in %s' % (name, path))
                 else:
                     klass = get_backend(path[0])
                     if path[0] == 'hg' and path[0] in BACKENDS.keys():
                         # for mercurial we need to have an str path
-                        repos_list[name] = klass(safe_str(path[1]),
+                        repos[name] = klass(safe_str(path[1]),
                                                  baseui=baseui)
                     if path[0] == 'git' and path[0] in BACKENDS.keys():
-                        repos_list[name] = klass(path[1])
+                        repos[name] = klass(path[1])
             except OSError:
                 continue
-        return repos_list
+        return repos
     def get_repos(self, all_repos=None, sort_key=None):
         """
         Get all repos from db and for each repo create it's
         backend instance and fill that backed with information from database

rhodecode/public/css/diff.css

➞

Show inline comments

@@ @@ -4,13 +4,13 @@ div.diffblock { @@
     border: 1px solid #ccc;
     background: #f8f8f8;
     font-size: 100%;
     line-height: 100%;
     /* new */
     line-height: 125%;
-        -webkit-border-radius: 6px 6px 0px 0px;
     -webkit-border-radius: 6px 6px 0px 0px;
     -moz-border-radius: 6px 6px 0px 0px;
     border-radius: 6px 6px 0px 0px;
+}
 div.diffblock.margined{
 	margin: 0px 20px 0px 20px;

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -2151,12 +2151,15 @@ div.browserblock { @@
 	overflow: hidden;
 	border: 1px solid #ccc;
 	background: #f8f8f8;
 	font-size: 100%;
 	line-height: 125%;
 	padding: 0;
     -webkit-border-radius: 6px 6px 0px 0px;
     -moz-border-radius: 6px 6px 0px 0px;
     border-radius: 6px 6px 0px 0px;
+}
 div.browserblock .browser-header {
 	background: #FFF;
 	padding: 10px 0px 15px 0px;
 	width: 100%;
@@ @@ -2712,18 +2715,24 @@ div.gravatar img { @@
+}
 #content div.box div.title div.search div.input input {
 	border: 1px solid #316293;
+}
 .ui-button-small a:hover {
 input.ui-button-small,
 .ui-button-small {
     background-color: #eedc94;
     background-repeat: repeat-x;
     background-image: -khtml-gradient(linear, left top, left bottom, from(#F4F4F4),to(#ECECEC) );
     background-image: -moz-linear-gradient(top, #F4F4F4, #ECECEC);
     background-image: -ms-linear-gradient(top, #F4F4F4, #ECECEC);
     background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #F4F4F4),color-stop(100%, #F4F4F4) );
     background-image: -webkit-linear-gradient(top, #F4F4F4, #ECECEC) );
     background-image: -o-linear-gradient(top, #F4F4F4, #ECECEC) );
     background-image: linear-gradient(top, #F4F4F4, #ECECEC);
+}
 input.ui-button-small,.ui-button-small {
 	background: #e5e3e3 url("../images/button.png") repeat-x !important;
 	border-top: 1px solid #DDD !important;
 	border-left: 1px solid #c6c6c6 !important;
 	border-right: 1px solid #DDD !important;
 	border-bottom: 1px solid #c6c6c6 !important;
 	color: #515151 !important;
 	outline: none !important;
@@ @@ -2734,19 +2743,22 @@ input.ui-button-small,.ui-button-small { @@
 	border-radius: 4px 4px 4px 4px !important;
 	box-shadow: 0 1px 0 #ececec !important;
 	cursor: pointer !important;
 	padding: 3px 3px 3px 3px;
+}
 input.ui-button-small.xsmall,.ui-button-small.xsmall{
 input.ui-button-small.xsmall,
 .ui-button-small.xsmall{
     padding: 1px 2px 1px 1px;
+}
 input.ui-button-small:hover,.ui-button-small:hover {
 	background: #b4b4b4 url("../images/button_selected.png") repeat-x
 		!important;
 input.ui-button-small:hover,
 .ui-button-small:hover,
 .ui-button-small.xsmall:hover
+ {
 	background: #b4b4b4 url("../images/button_selected.png") repeat-x !important;
 	border-top: 1px solid #ccc !important;
 	border-left: 1px solid #bebebe !important;
 	border-right: 1px solid #b1b1b1 !important;
 	border-bottom: 1px solid #afafaf !important;
 	text-decoration: none;
+}
@@ @@ -2772,34 +2784,46 @@ input.ui-button-small-blue:hover { @@
+}
 ins,div.options a:hover {
 	text-decoration: none;
+}
 img,#header #header-inner #quick li a:hover span.normal,#header #header-inner #quick li ul li.last,#content div.box div.form div.fields div.field div.textarea table td table td a,#clone_url
+	{
 img,
 #header #header-inner #quick li a:hover span.normal,
 #header #header-inner #quick li ul li.last,
 #content div.box div.form div.fields div.field div.textarea table td table td a,
 #clone_url
+{
 	border: none;
+}
 img.icon,.right .merge img {
 	vertical-align: bottom;
+}
 #header ul#logged-user,#content div.box div.title ul.links,#content div.box div.message div.dismiss,#content div.box div.traffic div.legend ul
 #header ul#logged-user,#content div.box div.title ul.links,
 #content div.box div.message div.dismiss,
 #content div.box div.traffic div.legend ul
+	{
 	float: right;
 	margin: 0;
 	padding: 0;
+}
 #header #header-inner #home,#header #header-inner #logo,#content div.box ul.left,#content div.box ol.left,#content div.box div.pagination-left,div#commit_history,div#legend_data,div#legend_container,div#legend_choices
 #header #header-inner #home,#header #header-inner #logo,
 #content div.box ul.left,#content div.box ol.left,
 #content div.box div.pagination-left,div#commit_history,
 div#legend_data,div#legend_container,div#legend_choices
+	{
 	float: left;
+}
 #header #header-inner #quick li:hover ul ul,#header #header-inner #quick li:hover ul ul ul,#header #header-inner #quick li:hover ul ul ul ul,#content #left #menu ul.closed,#content #left #menu li ul.collapsed,.yui-tt-shadow
 #header #header-inner #quick li:hover ul ul,
 #header #header-inner #quick li:hover ul ul ul,
 #header #header-inner #quick li:hover ul ul ul ul,
 #content #left #menu ul.closed,#content #left #menu li ul.collapsed,.yui-tt-shadow
+	{
 	display: none;
+}
 #header #header-inner #quick li:hover ul,#header #header-inner #quick li li:hover ul,#header #header-inner #quick li li li:hover ul,#header #header-inner #quick li li li li:hover ul,#content #left #menu ul.opened,#content #left #menu li ul.expanded
+	{

rhodecode/templates/summary/summary.html

➞

Show inline comments

@@ @@ -152,21 +152,13 @@ @@
 		          ${_('Downloads are disabled for this repository')}
                     %if h.HasPermissionAll('hg.admin')('enable downloads on from summary'):
                         ${h.link_to(_('enable'),h.url('edit_repo',repo_name=c.repo_name),class_="ui-button-small")}
                     %endif
 		        %else:
 			        ${h.select('download_options',c.rhodecode_repo.get_changeset().raw_id,c.download_options)}
 			        %for cnt,archive in enumerate(c.rhodecode_repo._get_archives()):
 			             %if cnt >=1:
+			             |
 			             %endif
 			             <span class="tooltip" title="${_('Download %s as %s') %('tip',archive['type'])}"
 			                  id="${archive['type']+'_link'}">${h.link_to(archive['type'],
 			                h.url('files_archive_home',repo_name=c.dbrepo.repo_name,
 			                fname='tip'+archive['extension']),class_="archive_icon")}</span>
 			        %endfor
 			             <span id="${'zip_link'}">${h.link_to('Download as zip',h.url('files_archive_home',repo_name=c.dbrepo.repo_name,fname='tip.zip'),class_="archive_icon ui-button-small")}</span>
                     <span style="vertical-align: bottom">
                         <input id="archive_subrepos" type="checkbox" name="subrepos"/> <span class="tooltip" title="${_('Check this to download archive with subrepos')}" >${_('with subrepos')}</span>
                     </span>
 			    %endif
 			  </div>
 			 </div>
@@ @@ -247,30 +239,32 @@ YUE.on(clone_url,'click',function(e){ @@
         YUD.get(clone_url).select();
+    }
 })
 var tmpl_links = {};
 %for cnt,archive in enumerate(c.rhodecode_repo._get_archives()):
   tmpl_links['${archive['type']}'] = '${h.link_to(archive['type'],
        h.url('files_archive_home',repo_name=c.dbrepo.repo_name,
        fname='__CS__'+archive['extension'],subrepos='__SUB__'),class_="archive_icon")}';
   tmpl_links["${archive['type']}"] = '${h.link_to('__NAME__', h.url('files_archive_home',repo_name=c.dbrepo.repo_name, fname='__CS__'+archive['extension'],subrepos='__SUB__'),class_='archive_icon ui-button-small')}';
 %endfor
 YUE.on(['download_options','archive_subrepos'],'change',function(e){
    var sm = YUD.get('download_options');
    var new_cs = sm.options[sm.selectedIndex];
    for(k in tmpl_links){
        var s = YUD.get(k+'_link');
        title_tmpl = "${_('Download %s as %s') % ('__CS_NAME__','__CS_EXT__')}";
        s.title = title_tmpl.replace('__CS_NAME__',new_cs.text);
        s.title = s.title.replace('__CS_EXT__',k);
        var url = tmpl_links[k].replace('__CS__',new_cs.value);
        var subrepos = YUD.get('archive_subrepos').checked
        url = url.replace('__SUB__',subrepos);
        s.innerHTML = url
        if(s){
          var title_tmpl = "${_('Download %s as %s') % ('__CS_NAME__','__CS_EXT__')}";
          title_tmpl= title_tmpl.replace('__CS_NAME__',new_cs.text);
          title_tmpl = title_tmpl.replace('__CS_EXT__',k);
          var url = tmpl_links[k].replace('__CS__',new_cs.value);
          var subrepos = YUD.get('archive_subrepos').checked;
          url = url.replace('__SUB__',subrepos);
          url = url.replace('__NAME__',title_tmpl);
          s.innerHTML = url
+       }
+   }
 });
 </script>
 %if c.show_stats:
 <script type="text/javascript">
 var data = ${c.trending_languages|n};

0 comments (0 inline, 0 general)