Changeset - c69cb0647c8a
Parent rev.
Child rev.
[Not reviewed]
default
0 2 0
Christian Oyarzun - 11 years ago 2015-05-06 23:48:15
oyarzun@gmail.com
templates: remove mime type column from file browser (Issue #51)
2 files changed with 0 insertions and 8 deletions:
kallithea/templates/files/files_browser.html
7
kallithea/tests/functional/test_files.py
1
0 comments (0 inline, 0 general)
kallithea/templates/files/files_browser.html
➞
Show inline comments
 
@@ -14,120 +14,113 @@
 
        <%return h.url('files_home', repo_name=c.repo_name, revision=c.changeset.raw_id, f_path=h.safe_unicode(node.path))%>
 
    %endif
 
</%def>
 
<%def name="file_name(node)">
 
    <%
 
        c = "icon-folder-open"
 
        if node.is_file():
 
            c = "icon-doc"
 
        elif node.is_submodule():
 
            c = "icon-file-submodule"
 
    %>
 
    <%return h.literal('<i class="%s"></i><span>%s</span>' % (c, h.escape(node.name)))%>
 
</%def>
 
<div id="body" class="browserblock">
 
    <div class="browser-header">
 
        <div class="browser-nav">
 
            ${h.form(h.url.current())}
 
            <div class="info_box">
 
              <div class="info_box_elem rev">${_('revision')}</div>
 
              <div class="info_box_elem"><a class="btn btn-mini ypjax-link" href="${c.url_prev}" title="${_('Previous revision')}"><i class="icon-left-open"></i></a></div>
 
              <div class="info_box_elem">${h.text('at_rev',value=c.changeset.revision,size=5)}</div>
 
              <div class="info_box_elem"><a class="btn btn-mini ypjax-link" href="${c.url_next}" title="${_('Next revision')}"><i class="icon-right-open"></i></a></div>
 
            </div>
 
            ${h.end_form()}
 
        </div>
 
        <div class="browser-branch">
 
           ${h.checkbox('stay_at_branch',c.changeset.branch,c.changeset.branch==c.branch)}
 
           <label>${_('Follow current branch')}</label>
 
        </div>
 
        <div id="search_activate_id" class="search_activate">
 
           <a class="btn btn-mini" id="filter_activate" href="#">${_('Search File List')}</a>
 
        </div>
 
        <div class="browser-search">
 
            <div>
 
                <div id="node_filter_box_loading" style="display:none">${_('Loading file list...')}</div>
 
                <div id="node_filter_box" style="display:none">
 
                ${h.files_breadcrumbs(c.repo_name,c.changeset.raw_id,c.file.path)}/<input class="init" type="text" value="type to search..." name="filter" size="25" id="node_filter">
 
                </div>
 
            </div>
 
        </div>
 
    </div>
 

			




	
	
	
		
 
    <div class="browser-body">

			




	
	
	
		
 
        <table class="code-browser">

			




	
	
	
		
 
            <thead>

			




	
	
	
		
 
                <tr>

			




	
	
	
		
 
                    <th>${_('Name')}</th>

			




	
	
	
		
 
                    <th>${_('Size')}</th>

			




	
	
	
		
 
                    <th>${_('Mimetype')}</th>

			




	
	
	
		
 
                    <th>${_('Last Revision')}</th>

			




	
	
	
		
 
                    <th>${_('Last Modified')}</th>

			




	
	
	
		
 
                    <th>${_('Last Committer')}</th>

			




	
	
	
		
 
                </tr>

			




	
	
	
		
 
            </thead>

			




	
	
	
		
 

			




	
	
	
		
 
            <tbody id="tbody">

			




	
	
	
		
 
                %if c.file.parent:

			




	
	
	
		
 
                <tr class="parity0">

			




	
	
	
		
 
                    <td>

			




	
	
	
		
 
                        ${h.link_to(h.literal('<i class="icon-folder-open"></i><span>..</span>'),h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.file.parent.path),class_="browser-dir ypjax-link")}

			




	
	
	
		
 
                    </td>

			




	
	
	
		
 
                    <td></td>

			




	
	
	
		
 
                    <td></td>

			




	
	
	
		
 
                    <td></td>

			




	
	
	
		
 
                    <td></td>

			




	
	
	
		
 
                    <td></td>

			




	
	
	
		
 
                </tr>

			




	
	
	
		
 
                %endif

			




	
	
	
		
 

			




	
	
	
		
 
            %for cnt,node in enumerate(c.file):

			




	
	
	
		
 
                <tr class="parity${cnt%2}">

			




	
	
	
		
 
                     <td>

			




	
	
	
		
 
                         ${h.link_to(file_name(node),file_url(node,c),class_=file_class(node)+" ypjax-link")}

			




	
	
	
		
 
                     </td>

			




	
	
	
		
 
                     <td>

			




	
	
	
		
 
                     %if node.is_file():

			




	
	
	
		
 
                         ${h.format_byte_size(node.size,binary=True)}

			




	
	
	
		
 
                     %endif

			




	
	
	
		
 
                     </td>

			




	
	
	
		
 
                     <td>

			




	
	
	
		
 
                      %if node.is_file():

			




	
	
	
		
 
                          ${node.mimetype}

			




	
	
	
		
 
                      %endif

			




	
	
	
		
 
                     </td>

			




	
	
	
		
 
                     <td>

			




	
	
	
		
 
                         %if node.is_file():

			




	
	
	
		
 
                             <a title="${h.tooltip(node.last_changeset.message)}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=node.last_changeset)}" class="tooltip revision-link">${h.show_id(node.last_changeset)}</a>

			




	
	
	
		
 
                         %endif

			




	
	
	
		
 
                     </td>

			




	
	
	
		
 
                     <td>

			




	
	
	
		
 
                         %if node.is_file():

			




	
	
	
		
 
                             <span class="tooltip" title="${h.tooltip(h.fmt_date(node.last_changeset.date))}">

			




	
	
	
		
 
                            ${h.age(node.last_changeset.date)}</span>

			




	
	
	
		
 
                         %endif

			




	
	
	
		
 
                     </td>

			




	
	
	
		
 
                     <td>

			




	
	
	
		
 
                         %if node.is_file():

			




	
	
	
		
 
                             <span title="${node.last_changeset.author}">

			




	
	
	
		
 
                            ${h.person(node.last_changeset.author)}

			




	
	
	
		
 
                            </span>

			




	
	
	
		
 
                         %endif

			




	
	
	
		
 
                     </td>

			




	
	
	
		
 
                </tr>

			




	
	
	
		
 
            %endfor

			




	
	
	
		
 
            </tbody>

			




	
	
	
		
 
            <tbody id="tbody_filtered" style="display:none">

			




	
	
	
		
 
            </tbody>

			




	
	
	
		
 
        </table>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</div>

			




	
	
	
		
 

			




	
	
	
		
 
<script>

			




	
	
	
		
 
    $(document).ready(function(){

			




	
	
	
		
 
        // init node filter if we pass GET param ?search=1

			




	
	
	
		
 
        var search_GET = "${request.GET.get('search','')}";

			




	
	
	
		
 
        if(search_GET == "1"){

			




	
	
	
		
 
            $("#filter_activate").click();

			




	
	
	
		
 
        }

			




	
	
	
		
 
    })

			




	
	
	
		
 
</script>

			




        

    


    
    

    

        

                

                    kallithea/tests/functional/test_files.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -18,97 +18,96 @@ GIT_NODE_HISTORY = fixture.load_resource

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def _set_downloads(repo_name, set_to):

			




	
	
	
		
 
    repo = Repository.get_by_repo_name(repo_name)

			




	
	
	
		
 
    repo.enable_downloads = set_to

			




	
	
	
		
 
    Session().add(repo)

			




	
	
	
		
 
    Session().commit()

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class TestFilesController(TestController):

			




	
	
	
		
 

			




	
	
	
		
 
    def test_index(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        response = self.app.get(url(controller='files', action='index',

			




	
	
	
		
 
                                    repo_name=HG_REPO,

			




	
	
	
		
 
                                    revision='tip',

			




	
	
	
		
 
                                    f_path='/'))

			




	
	
	
		
 
        # Test response...

			




	
	
	
		
 
        response.mustcontain('<a class="browser-dir ypjax-link" href="/vcs_test_hg/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/docs"><i class="icon-folder-open"></i><span>docs</span></a>')

			




	
	
	
		
 
        response.mustcontain('<a class="browser-dir ypjax-link" href="/vcs_test_hg/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/vcs"><i class="icon-folder-open"></i><span>vcs</span></a>')

			




	
	
	
		
 
        response.mustcontain('<a class="browser-file ypjax-link" href="/vcs_test_hg/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/.gitignore"><i class="icon-doc"></i><span>.gitignore</span></a>')

			




	
	
	
		
 
        response.mustcontain('<a class="browser-file ypjax-link" href="/vcs_test_hg/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/.hgignore"><i class="icon-doc"></i><span>.hgignore</span></a>')

			




	
	
	
		
 
        response.mustcontain('<a class="browser-file ypjax-link" href="/vcs_test_hg/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/.hgtags"><i class="icon-doc"></i><span>.hgtags</span></a>')

			




	
	
	
		
 
        response.mustcontain('<a class="browser-file ypjax-link" href="/vcs_test_hg/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/.travis.yml"><i class="icon-doc"></i><span>.travis.yml</span></a>')

			




	
	
	
		
 
        response.mustcontain('<a class="browser-file ypjax-link" href="/vcs_test_hg/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/MANIFEST.in"><i class="icon-doc"></i><span>MANIFEST.in</span></a>')

			




	
	
	
		
 
        response.mustcontain('<a class="browser-file ypjax-link" href="/vcs_test_hg/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/README.rst"><i class="icon-doc"></i><span>README.rst</span></a>')

			




	
	
	
		
 
        response.mustcontain('<a class="browser-file ypjax-link" href="/vcs_test_hg/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/run_test_and_report.sh"><i class="icon-doc"></i><span>run_test_and_report.sh</span></a>')

			




	
	
	
		
 
        response.mustcontain('<a class="browser-file ypjax-link" href="/vcs_test_hg/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/setup.cfg"><i class="icon-doc"></i><span>setup.cfg</span></a>')

			




	
	
	
		
 
        response.mustcontain('<a class="browser-file ypjax-link" href="/vcs_test_hg/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/setup.py"><i class="icon-doc"></i><span>setup.py</span></a>')

			




	
	
	
		
 
        response.mustcontain('<a class="browser-file ypjax-link" href="/vcs_test_hg/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/test_and_report.sh"><i class="icon-doc"></i><span>test_and_report.sh</span></a>')

			




	
	
	
		
 
        response.mustcontain('<a class="browser-file ypjax-link" href="/vcs_test_hg/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/tox.ini"><i class="icon-doc"></i><span>tox.ini</span></a>')

			




	
	
	
		
 

			




	
	
	
		
 
    def test_index_revision(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 

			




	
	
	
		
 
        response = self.app.get(

			




	
	
	
		
 
            url(controller='files', action='index',

			




	
	
	
		
 
                repo_name=HG_REPO,

			




	
	
	
		
 
                revision='7ba66bec8d6dbba14a2155be32408c435c5f4492',

			




	
	
	
		
 
                f_path='/')

			




	
	
	
		
 
        )

			




	
	
	
		
 

			




	
	
	
		
 
        #Test response...

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('<a class="browser-dir ypjax-link" href="/vcs_test_hg/files/7ba66bec8d6dbba14a2155be32408c435c5f4492/docs"><i class="icon-folder-open"></i><span>docs</span></a>')

			




	
	
	
		
 
        response.mustcontain('<a class="browser-dir ypjax-link" href="/vcs_test_hg/files/7ba66bec8d6dbba14a2155be32408c435c5f4492/tests"><i class="icon-folder-open"></i><span>tests</span></a>')

			




	
	
	
		
 
        response.mustcontain('<a class="browser-file ypjax-link" href="/vcs_test_hg/files/7ba66bec8d6dbba14a2155be32408c435c5f4492/README.rst"><i class="icon-doc"></i><span>README.rst</span></a>')

			




	
	
	
		
 
        response.mustcontain('1.1 KiB')

			




	
	
	
		
 
        response.mustcontain('text/x-python')

			




	
	
	
		
 

			




	
	
	
		
 
    def test_index_different_branch(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 

			




	
	
	
		
 
        response = self.app.get(url(controller='files', action='index',

			




	
	
	
		
 
                                    repo_name=HG_REPO,

			




	
	
	
		
 
                                    revision='97e8b885c04894463c51898e14387d80c30ed1ee',

			




	
	
	
		
 
                                    f_path='/'))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""<option selected="selected" value="97e8b885c04894463c51898e14387d80c30ed1ee">git at 97e8b885c048</option>""")

			




	
	
	
		
 

			




	
	
	
		
 
    def test_index_paging(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 

			




	
	
	
		
 
        for r in [(73, 'a066b25d5df7016b45a41b7e2a78c33b57adc235'),

			




	
	
	
		
 
                  (92, 'cc66b61b8455b264a7a8a2d8ddc80fcfc58c221e'),

			




	
	
	
		
 
                  (109, '75feb4c33e81186c87eac740cee2447330288412'),

			




	
	
	
		
 
                  (1, '3d8f361e72ab303da48d799ff1ac40d5ac37c67e'),

			




	
	
	
		
 
                  (0, 'b986218ba1c9b0d6a259fac9b050b1724ed8e545')]:

			




	
	
	
		
 

			




	
	
	
		
 
            response = self.app.get(url(controller='files', action='index',

			




	
	
	
		
 
                                    repo_name=HG_REPO,

			




	
	
	
		
 
                                    revision=r[1],

			




	
	
	
		
 
                                    f_path='/'))

			




	
	
	
		
 

			




	
	
	
		
 
            response.mustcontain("""@ r%s:%s""" % (r[0], r[1][:12]))

			




	
	
	
		
 

			




	
	
	
		
 
    def test_file_source(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        response = self.app.get(url(controller='files', action='index',

			




	
	
	
		
 
                                    repo_name=HG_REPO,

			




	
	
	
		
 
                                    revision='8911406ad776fdd3d0b9932a2e89677e57405a48',

			




	
	
	
		
 
                                    f_path='vcs/nodes.py'))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""<div class="commit">Partially implemented <a class="issue-tracker-link" href="https://myissueserver.com/vcs_test_hg/issue/16">#16</a>. filecontent/commit message/author/node name are safe_unicode now.

			




	
	
	
		
 
In addition some other __str__ are unicode as well

			




	
	
	
		
 
Added test for unicode

			




	
	
	
		
 
Improved test to clone into uniq repository.

			




	
	
	
		
 
removed extra unicode conversion in diff.</div>

			




	
	
	
		
 
""")

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""<option selected="selected" value="8911406ad776fdd3d0b9932a2e89677e57405a48">default at 8911406ad776</option>""")

			




	
	
	
		
 

			




	
	
	
		
 
    def test_file_source_history(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        response = self.app.get(url(controller='files', action='history',

			




	
	
	
		
 
                                    repo_name=HG_REPO,

			




	
	
	
		
 
                                    revision='tip',

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.