Changeset - fb5760e8ba43
Parent rev.
Child rev.
[Not reviewed]
default
0 3 0
domruf - 11 years ago 2014-08-18 21:04:36
dominikruf@gmail.com
support other analytic systems then just Google Analytics

Fallback to Google Analytics code if the string starts with "UA-"
3 files changed with 20 insertions and 17 deletions:
kallithea/lib/base.py
13
kallithea/templates/admin/settings/settings_global.html
3
2
kallithea/templates/base/root.html
4
15
0 comments (0 inline, 0 general)
kallithea/lib/base.py
➞
Show inline comments
 
@@ -260,96 +260,109 @@ class BaseVCSController(object):
 
                    locked = True
 
            if action == 'pull':
 
                if repo.locked[0] and repo.locked[1]:
 
                    locked = True
 
                else:
 
                    log.debug('Setting lock on repo %s by %s' % (repo, user))
 
                    make_lock = True
 

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            log.debug('Repository %s do not have locking enabled' % (repo))

			




	
	
	
		
 
        log.debug('FINAL locking values make_lock:%s,locked:%s,locked_by:%s'

			




	
	
	
		
 
                  % (make_lock, locked, locked_by))

			




	
	
	
		
 
        return make_lock, locked, locked_by

			




	
	
	
		
 

			




	
	
	
		
 
    def __call__(self, environ, start_response):

			




	
	
	
		
 
        start = time.time()

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            return self._handle_request(environ, start_response)

			




	
	
	
		
 
        finally:

			




	
	
	
		
 
            log = logging.getLogger('kallithea.' + self.__class__.__name__)

			




	
	
	
		
 
            log.debug('Request time: %.3fs' % (time.time() - start))

			




	
	
	
		
 
            meta.Session.remove()

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class BaseController(WSGIController):

			




	
	
	
		
 

			




	
	
	
		
 
    def __before__(self):

			




	
	
	
		
 
        """

			




	
	
	
		
 
        __before__ is called before controller methods and after __call__

			




	
	
	
		
 
        """

			




	
	
	
		
 
        c.kallithea_version = __version__

			




	
	
	
		
 
        rc_config = Setting.get_app_settings()

			




	
	
	
		
 

			




	
	
	
		
 
        # Visual options

			




	
	
	
		
 
        c.visual = AttributeDict({})

			




	
	
	
		
 

			




	
	
	
		
 
        ## DB stored

			




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

			




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

			




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

			




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

			




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

			




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

			




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

			




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

			




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

			




	
	
	
		
 

			




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

			




	
	
	
		
 
        # TODO: replace undocumented backwards compatibility hack with db upgrade and rename ga_code

			




	
	
	
		
 
        if c.ga_code and '<' not in c.ga_code:

			




	
	
	
		
 
            c.ga_code = '''<script type="text/javascript">

			




	
	
	
		
 
                var _gaq = _gaq || [];

			




	
	
	
		
 
                _gaq.push(['_setAccount', '%s']);

			




	
	
	
		
 
                _gaq.push(['_trackPageview']);

			




	
	
	
		
 

			




	
	
	
		
 
                (function() {

			




	
	
	
		
 
                    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;

			




	
	
	
		
 
                    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';

			




	
	
	
		
 
                    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);

			




	
	
	
		
 
                    })();

			




	
	
	
		
 
            </script>''' % c.ga_code

			




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

			




	
	
	
		
 
        c.clone_uri_tmpl = rc_config.get('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.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'))

			




	
	
	
		
 

			




	
	
	
		
 
        c.my_pr_count = PullRequestModel().get_pullrequest_cnt_for_user(c.authuser.user_id)

			




	
	
	
		
 

			




	
	
	
		
 
        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.

			




	
	
	
		
 
                auth_user = AuthUser(api_key=api_key, ip_addr=self.ip_addr)

			




	
	
	
		
 
                authenticated = False

			




	
	
	
		
 
            else:

			




	
	
	
		
 
                cookie_store = CookieStoreWrapper(session.get('authuser'))

			




	
	
	
		
 
                try:

			




	
	
	
		
 
                    auth_user = AuthUser(user_id=cookie_store.get('user_id', None),

			




	
	
	
		
 
                                         ip_addr=self.ip_addr)

			




	
	
	
		
 
                except UserCreationError, e:

			




	
	
	
		
 
                    from kallithea.lib import helpers as h

			




	
	
	
		
 
                    h.flash(e, 'error')

			




	
	
	
		
 
                    # container auth or other auth functions that create users on

			




	
	
	
		
 
                    # the fly can throw this exception signaling that there's issue

			




	
	
	
		
 
                    # with user creation, explanation should be provided in

			




        

    


    
    

    

        

                

                    kallithea/templates/admin/settings/settings_global.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
${h.form(url('admin_settings_global'), method='post')}

			




	
	
	
		
 
    <div class="form">

			




	
	
	
		
 

			




	
	
	
		
 
        <div class="fields">

			




	
	
	
		
 

			




	
	
	
		
 
             <div class="field">

			




	
	
	
		
 
                <div class="label">

			




	
	
	
		
 
                    <label for="title">${_('Site branding')}:</label>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="input">

			




	
	
	
		
 
                    ${h.text('title',size=30)}

			




	
	
	
		
 
                    <span class="help-block">${_('Set a custom title for your Kallithea Service.')}</span>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
             </div>

			




	
	
	
		
 

			




	
	
	
		
 
            <div class="field">

			




	
	
	
		
 
                <div class="label">

			




	
	
	
		
 
                    <label for="realm">${_('HTTP authentication realm')}:</label>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="input">

			




	
	
	
		
 
                    ${h.text('realm',size=30)}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 

			




	
	
	
		
 
            <div class="field">

			




	
	
	
		
 
                <div class="label">

			




	
	
	
		
 
                    <label for="ga_code">${_('Google Analytics code')}:</label>

			




	
	
	
		
 
                    <label for="ga_code">${_('Analytics HTML block')}:</label>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="input">

			




	
	
	
		
 
                    ${h.text('ga_code',size=30)}

			




	
	
	
		
 
                    ${h.textarea('ga_code', cols=80, rows=10)}

			




	
	
	
		
 
                    <span class="help-block">${_('HTML with JavaScript for web analytics systems like Google Analytics or Piwik. This will be added at the bottom of every page.')}</span>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 

			




	
	
	
		
 
            <div class="field">

			




	
	
	
		
 
                <div class="label">

			




	
	
	
		
 
                    <label for="captcha_public_key">${_('ReCaptcha public key')}:</label>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="input">

			




	
	
	
		
 
                    ${h.text('captcha_public_key',size=60)}

			




	
	
	
		
 
                    <span class="help-block">${_('Public key for reCaptcha system.')}</span>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 

			




	
	
	
		
 
            <div class="field">

			




	
	
	
		
 
                <div class="label">

			




	
	
	
		
 
                    <label for="captcha_private_key">${_('ReCaptcha private key')}:</label>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="input">

			




	
	
	
		
 
                    ${h.text('captcha_private_key',size=60)}

			




	
	
	
		
 
                    <span class="help-block">${_('Private key for reCaptcha system. Setting this value will enable captcha on registration')}</span>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 

			




	
	
	
		
 
            <div class="buttons">

			




	
	
	
		
 
                ${h.submit('save',_('Save settings'),class_="btn")}

			




	
	
	
		
 
                ${h.reset('reset',_('Reset'),class_="btn")}

			




	
	
	
		
 
           </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
${h.end_form()}

			




        

    


    
    

    

        

                

                    kallithea/templates/base/root.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
## -*- coding: utf-8 -*-

			




	
	
	
		
 
<!DOCTYPE html>

			




	
	
	
		
 

			




	
	
	
		
 
<html xmlns="http://www.w3.org/1999/xhtml">

			




	
	
	
		
 
    <head>

			




	
	
	
		
 
        <title>${self.title()}</title>

			




	
	
	
		
 
        <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />

			




	
	
	
		
 
        <meta name="robots" content="index, nofollow"/>

			




	
	
	
		
 
        <link rel="icon" href="${h.url('/images/favicon.ico')}" type="image/png" />

			




	
	
	
		
 

			




	
	
	
		
 
        ## CSS ###

			




	
	
	
		
 
        <%def name="css()">

			




	
	
	
		
 
            <link rel="stylesheet" type="text/css" href="${h.url('/js/select2/select2.css', ver=c.kallithea_version)}"/>

			




	
	
	
		
 
            <link rel="stylesheet" type="text/css" href="${h.url('/css/pygments.css', ver=c.kallithea_version)}"/>

			




	
	
	
		
 
            <link rel="stylesheet" type="text/css" href="${h.url('/css/style.css', ver=c.kallithea_version)}" media="screen"/>

			




	
	
	
		
 
            <link rel="stylesheet" type="text/css" href="${h.url('/css/contextbar.css', ver=c.kallithea_version)}" media="screen"/>

			




	
	
	
		
 
            ## EXTRA FOR CSS

			




	
	
	
		
 
            ${self.css_extra()}

			




	
	
	
		
 
        </%def>

			




	
	
	
		
 

			




	
	
	
		
 
        <%def name="css_extra()"></%def>

			




	
	
	
		
 

			




	
	
	
		
 
        ${self.css()}

			




	
	
	
		
 

			




	
	
	
		
 
        %if c.ga_code:

			




	
	
	
		
 
        <!-- Analytics -->

			




	
	
	
		
 
        <script type="text/javascript">

			




	
	
	
		
 
            var _gaq = _gaq || [];

			




	
	
	
		
 
            _gaq.push(['_setAccount', '${c.ga_code}']);

			




	
	
	
		
 
            _gaq.push(['_trackPageview']);

			




	
	
	
		
 

			




	
	
	
		
 
            (function() {

			




	
	
	
		
 
                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;

			




	
	
	
		
 
                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';

			




	
	
	
		
 
                var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);

			




	
	
	
		
 
                })();

			




	
	
	
		
 
        </script>

			




	
	
	
		
 
        %endif

			




	
	
	
		
 

			




	
	
	
		
 
        ## JAVASCRIPT ##

			




	
	
	
		
 
        <%def name="js()">

			




	
	
	
		
 
            <script type="text/javascript">

			




	
	
	
		
 
            //JS translations map

			




	
	
	
		
 
            var TRANSLATION_MAP = {

			




	
	
	
		
 
                'Add another comment':'${_("Add another comment")}',

			




	
	
	
		
 
                'Stop following this repository':"${_('Stop following this repository')}",

			




	
	
	
		
 
                'Start following this repository':"${_('Start following this repository')}",

			




	
	
	
		
 
                'Group':"${_('Group')}",

			




	
	
	
		
 
                'members':"${_('members')}",

			




	
	
	
		
 
                'Loading ...':"${_('Loading ...')}",

			




	
	
	
		
 
                'loading ...':"${_('loading ...')}",

			




	
	
	
		
 
                'Search truncated': "${_('Search truncated')}",

			




	
	
	
		
 
                'No matching files': "${_('No matching files')}",

			




	
	
	
		
 
                'Open new pull request': "${_('Open new pull request')}",

			




	
	
	
		
 
                'Open new pull request for selected changesets':  "${_('Open new pull request for selected changesets')}",

			




	
	
	
		
 
                'Show selected changesets __S &rarr; __E': "${h.literal(_('Show selected changesets __S &rarr; __E'))}",

			




	
	
	
		
 
                'Show selected changeset __S': "${_('Show selected changeset __S')}",

			




	
	
	
		
 
                'Selection link': "${_('Selection link')}",

			




	
	
	
		
 
                'Collapse diff': "${_('Collapse diff')}",

			




	
	
	
		
 
                'Expand diff': "${_('Expand diff')}",

			




	
	
	
		
 
                'Failed to revoke permission': "${_('Failed to revoke permission')}",

			




	
	
	
		
 
                'Confirm to revoke permission for {0}: {1} ?': "${_('confirm to revoke permission for {0}: {1} ?')}",

			




	
	
	
		
 
                'enabled': "${_('enabled')}",

			




	
	
	
		
 
                'disabled': "${_('disabled')}",

			




	
	
	
		
 
                'Select changeset': "${_('Select changeset')}",

			




	
	
	
		
 
                'Specify changeset': "${_('Specify changeset')}",

			




	
	
	
		
 
                'MSG_SORTASC': "${_('Click to sort ascending')}",

			




	
	
	
		
 
                'MSG_SORTDESC': "${_('Click to sort descending')}",

			




	
	
	
		
 
                'MSG_EMPTY': "${_('No records found.')}",

			




	
	
	
		
 
                'MSG_ERROR': "${_('Data error.')}",

			




	
	
	
		
 
                'MSG_LOADING': "${_('Loading...')}",

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
            };

			




	
	
	
		
 
            var _TM = TRANSLATION_MAP;

			




	
	
	
		
 

			




	
	
	
		
 
            var TOGGLE_FOLLOW_URL  = "${h.url('toggle_following')}";

			




	
	
	
		
 

			




	
	
	
		
 
            var REPO_NAME = "";

			




	
	
	
		
 
            %if hasattr(c, 'repo_name'):

			




	
	
	
		
 
                var REPO_NAME = "${c.repo_name}";

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
            </script>

			




	
	
	
		
 
            <script type="text/javascript" src="${h.url('/js/yui.2.9.js', ver=c.kallithea_version)}"></script>

			




	
	
	
		
 
            <script type="text/javascript" src="${h.url('/js/jquery-1.10.2.min.js', ver=c.kallithea_version)}"></script>

			




	
	
	
		
 
            <script type="text/javascript" src="${h.url('/js/bootstrap.js', ver=c.kallithea_version)}"></script>

			




	
	
	
		
 
            <script type="text/javascript" src="${h.url('/js/select2/select2.js', ver=c.kallithea_version)}"></script>

			




	
	
		
 
@@ -104,50 +89,54 @@

			




	
	
	
		
 
                     // This is because we can optionally choose to support HTML4 browsers or not.

			




	
	
	
		
 
                    return false;

			




	
	
	
		
 
                }

			




	
	
	
		
 
            })(window);

			




	
	
	
		
 

			




	
	
	
		
 
            $(document).ready(function(){

			




	
	
	
		
 
              tooltip_activate();

			




	
	
	
		
 
              show_more_event();

			




	
	
	
		
 
              show_changeset_tooltip();

			




	
	
	
		
 
              // routes registration

			




	
	
	
		
 
              pyroutes.register('home', "${h.url('home')}", []);

			




	
	
	
		
 
              pyroutes.register('new_gist', "${h.url('new_gist')}", []);

			




	
	
	
		
 
              pyroutes.register('gists', "${h.url('gists')}", []);

			




	
	
	
		
 
              pyroutes.register('new_repo', "${h.url('new_repo')}", []);

			




	
	
	
		
 

			




	
	
	
		
 
              pyroutes.register('summary_home', "${h.url('summary_home', repo_name='%(repo_name)s')}", ['repo_name']);

			




	
	
	
		
 
              pyroutes.register('changelog_home', "${h.url('changelog_home', repo_name='%(repo_name)s')}", ['repo_name']);

			




	
	
	
		
 
              pyroutes.register('files_home', "${h.url('files_home', repo_name='%(repo_name)s',revision='%(revision)s',f_path='%(f_path)s')}", ['repo_name', 'revision', 'f_path']);

			




	
	
	
		
 
              pyroutes.register('edit_repo', "${h.url('edit_repo', repo_name='%(repo_name)s')}", ['repo_name']);

			




	
	
	
		
 
              pyroutes.register('edit_repo_perms', "${h.url('edit_repo_perms', repo_name='%(repo_name)s')}", ['repo_name']);

			




	
	
	
		
 
              pyroutes.register('pullrequest_home', "${h.url('pullrequest_home', repo_name='%(repo_name)s')}", ['repo_name']);

			




	
	
	
		
 

			




	
	
	
		
 
              pyroutes.register('toggle_following', "${h.url('toggle_following')}");

			




	
	
	
		
 
              pyroutes.register('changeset_info', "${h.url('changeset_info', repo_name='%(repo_name)s', revision='%(revision)s')}", ['repo_name', 'revision']);

			




	
	
	
		
 
              pyroutes.register('repo_size', "${h.url('repo_size', repo_name='%(repo_name)s')}", ['repo_name']);

			




	
	
	
		
 
              pyroutes.register('changeset_comment_preview', "${h.url('changeset_comment_preview', repo_name='%(repo_name)s')}", ['repo_name']);

			




	
	
	
		
 
              pyroutes.register('repo_refs_data', "${h.url('repo_refs_data', repo_name='%(repo_name)s')}", ['repo_name']);

			




	
	
	
		
 
           });

			




	
	
	
		
 
            </script>

			




	
	
	
		
 
        </%def>

			




	
	
	
		
 
        <%def name="js_extra()"></%def>

			




	
	
	
		
 
        ${self.js()}

			




	
	
	
		
 
        <%def name="head_extra()"></%def>

			




	
	
	
		
 
        ${self.head_extra()}

			




	
	
	
		
 
    </head>

			




	
	
	
		
 
    <body id="body">

			




	
	
	
		
 
     ## IE hacks

			




	
	
	
		
 
      <!--[if IE 7]>

			




	
	
	
		
 
      <script>$(document.body).addClass('ie7')</script>

			




	
	
	
		
 
      <![endif]-->

			




	
	
	
		
 
      <!--[if IE 8]>

			




	
	
	
		
 
      <script>$(document.body).addClass('ie8')</script>

			




	
	
	
		
 
      <![endif]-->

			




	
	
	
		
 
      <!--[if IE 9]>

			




	
	
	
		
 
      <script>$(document.body).addClass('ie9')</script>

			




	
	
	
		
 
      <![endif]-->

			




	
	
	
		
 

			




	
	
	
		
 
      ${next.body()}

			




	
	
	
		
 

			




	
	
	
		
 
      %if c.ga_code:

			




	
	
	
		
 
      ${h.literal(c.ga_code)}

			




	
	
	
		
 
      %endif

			




	
	
	
		
 
    </body>

			




	
	
	
		
 
</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.