Changeset - 7436b88cbd89
Parent rev.
Child rev.
[Not reviewed]
kallithea-2.2.5-rebrand
0 2 0
Bradley M. Kuhn - 11 years ago 2014-07-03 01:05:21
bkuhn@sfconservancy.org
Rename rhodecode_instanceid to instance_id
2 files changed with 2 insertions and 2 deletions:
kallithea/lib/base.py
1
1
kallithea/templates/base/base.html
1
1
0 comments (0 inline, 0 general)
kallithea/lib/base.py
➞
Show inline comments
 
@@ -286,49 +286,49 @@ class BaseController(WSGIController):
 
        rc_config = RhodeCodeSetting.get_app_settings()
 

			




	
	
	
		
 
        # Visual options

			




	
	
	
		
 
        c.visual = AttributeDict({})

			




	
	
	
		
 

			




	
	
	
		
 
        ## DB stored

			




	
	
	
		
 
        c.visual.show_public_icon = str2bool(rc_config.get('rhodecode_show_public_icon'))

			




	
	
	
		
 
        c.visual.show_private_icon = str2bool(rc_config.get('rhodecode_show_private_icon'))

			




	
	
	
		
 
        c.visual.stylify_metatags = str2bool(rc_config.get('rhodecode_stylify_metatags'))

			




	
	
	
		
 
        c.visual.dashboard_items = safe_int(rc_config.get('rhodecode_dashboard_items', 100))

			




	
	
	
		
 
        c.visual.admin_grid_items = safe_int(rc_config.get('rhodecode_admin_grid_items', 100))

			




	
	
	
		
 
        c.visual.repository_fields = str2bool(rc_config.get('rhodecode_repository_fields'))

			




	
	
	
		
 
        c.visual.show_version = str2bool(rc_config.get('rhodecode_show_version'))

			




	
	
	
		
 
        c.visual.use_gravatar = str2bool(rc_config.get('rhodecode_use_gravatar'))

			




	
	
	
		
 
        c.visual.gravatar_url = rc_config.get('rhodecode_gravatar_url')

			




	
	
	
		
 

			




	
	
	
		
 
        c.ga_code = rc_config.get('rhodecode_ga_code')

			




	
	
	
		
 
        c.site_name = rc_config.get('rhodecode_title')

			




	
	
	
		
 
        c.clone_uri_tmpl = rc_config.get('rhodecode_clone_uri_tmpl')

			




	
	
	
		
 

			




	
	
	
		
 
        ## INI stored

			




	
	
	
		
 
        c.visual.allow_repo_location_change = str2bool(config.get('allow_repo_location_change', True))

			




	
	
	
		
 
        c.visual.allow_custom_hooks_settings = str2bool(config.get('allow_custom_hooks_settings', True))

			




	
	
	
		
 

			




	
	
	
		
 
        c.rhodecode_instanceid = config.get('instance_id')

			




	
	
	
		
 
        c.instance_id = config.get('instance_id')

			




	
	
	
		
 
        c.issues_url = config.get('bugtracker', url('issues_url'))

			




	
	
	
		
 
        # END CONFIG VARS

			




	
	
	
		
 

			




	
	
	
		
 
        c.repo_name = get_repo_slug(request)  # can be empty

			




	
	
	
		
 
        c.backends = BACKENDS.keys()

			




	
	
	
		
 
        c.unread_notifications = NotificationModel()\

			




	
	
	
		
 
                        .get_unread_cnt_for_user(c.authuser.user_id)

			




	
	
	
		
 

			




	
	
	
		
 
        self.cut_off_limit = safe_int(config.get('cut_off_limit'))

			




	
	
	
		
 
        self.sa = meta.Session

			




	
	
	
		
 
        self.scm_model = ScmModel(self.sa)

			




	
	
	
		
 

			




	
	
	
		
 
    def __call__(self, environ, start_response):

			




	
	
	
		
 
        """Invoke the Controller"""

			




	
	
	
		
 
        # WSGIController.__call__ dispatches to the Controller method

			




	
	
	
		
 
        # the request is routed to. This routing information is

			




	
	
	
		
 
        # available in environ['pylons.routes_dict']

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            self.ip_addr = _get_ip_addr(environ)

			




	
	
	
		
 
            # make sure that we update permissions each time we call controller

			




	
	
	
		
 
            api_key = request.GET.get('api_key')

			




	
	
	
		
 

			




	
	
	
		
 
            if api_key:

			




	
	
	
		
 
                # when using API_KEY we are sure user exists.

			




        

    


    
    

    

        

                

                    kallithea/templates/base/base.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -13,49 +13,49 @@

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <!-- MENU -->

			




	
	
	
		
 
        ${self.page_nav()}

			




	
	
	
		
 
        <!-- END MENU -->

			




	
	
	
		
 
        ${self.body()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</div>

			




	
	
	
		
 
<!-- END HEADER -->

			




	
	
	
		
 

			




	
	
	
		
 
<!-- CONTENT -->

			




	
	
	
		
 
<div id="content">

			




	
	
	
		
 
    ${self.flash_msg()}

			




	
	
	
		
 
    <div id="main">

			




	
	
	
		
 
        ${next.main()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</div>

			




	
	
	
		
 
<!-- END CONTENT -->

			




	
	
	
		
 

			




	
	
	
		
 
<!-- FOOTER -->

			




	
	
	
		
 
<div id="footer">

			




	
	
	
		
 
   <div id="footer-inner" class="title">

			




	
	
	
		
 
       <div>

			




	
	
	
		
 
           <p class="footer-link">

			




	
	
	
		
 
               ${_('Server instance: %s') % c.rhodecode_instanceid if c.rhodecode_instanceid else ''}

			




	
	
	
		
 
               ${_('Server instance: %s') % c.instance_id if c.instance_id else ''}

			




	
	
	
		
 
           </p>

			




	
	
	
		
 
           <p class="footer-link-right">

			




	
	
	
		
 
               This site is powered by

			




	
	
	
		
 
               %if c.visual.show_version:

			




	
	
	
		
 
                   <a href="${h.url('kallithea_project_url')}" target="_blank">Kallithea</a> ${c.kallithea_version},

			




	
	
	
		
 
               %else:

			




	
	
	
		
 
                   <a href="${h.url('kallithea_project_url')}" target="_blank">Kallithea</a>,

			




	
	
	
		
 
               %endif

			




	
	
	
		
 
               which is

			




	
	
	
		
 
               <a href="${h.url('about')}#copyright">&copy; 2010&ndash;2014 by various authors &amp; licensed under GPLv3</a>.

			




	
	
	
		
 
               %if c.issues_url:

			




	
	
	
		
 
                   &ndash; <a href="${c.issues_url}" target="_blank">${_('Support')}</a>

			




	
	
	
		
 
               %endif

			




	
	
	
		
 
           </p>

			




	
	
	
		
 
       </div>

			




	
	
	
		
 
   </div>

			




	
	
	
		
 
</div>

			




	
	
	
		
 

			




	
	
	
		
 
<!-- END FOOTER -->

			




	
	
	
		
 

			




	
	
	
		
 
### MAKO DEFS ###

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="flash_msg()">

			




	
	
	
		
 
    <%include file="/base/flash_msg.html"/>

			




        

    



    


    



    



      

      





    
    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.