static: change static path to serve rhodecode static assets from

dedicated rhodecode path.

This helps to serve statics via http server and then still allow
plugin statics to work under a common prefix

docs/admin/apache-reverse-proxy.rst

@@ -1,33 +1,33 b''
 Apache Reverse Proxy
 ^^^^^^^^^^^^^^^^^^^^
 
 Here is a sample configuration file for using Apache as a reverse proxy.
 
 .. code-block:: apache
 
     <VirtualHost *:80>
             ServerName hg.myserver.com
             ServerAlias hg.myserver.com
 
             ## uncomment to serve static files by Apache
-            ## ProxyPass /_static !
-            ## Alias /_static /path/to/.rccontrol/enterprise-1/static
+            ## ProxyPass /_static/rhodecode !
+            ## Alias /_static/rhodecode /path/to/.rccontrol/enterprise-1/static
 
             <Proxy *>
               Order allow,deny
               Allow from all
             </Proxy>
 
             ## Important !
             ## Directive to properly generate url (clone url) for pylons
             ProxyPreserveHost On
 
             ## RhodeCode instance running
             ProxyPass / http://127.0.0.1:10002/
             ProxyPassReverse / http://127.0.0.1:10002/
 
             ## to enable https use line below
             #SetEnvIf X-Url-Scheme https HTTPS=1
 
     </VirtualHost>
 

docs/admin/nginx-config-example.rst

@@ -1,92 +1,92 b''
 Nginx Configuration Example
 ---------------------------
 
 Use the following example to configure Nginx as a your web server.
 
 .. code-block:: nginx
 
     upstream rc {
 
         server 127.0.0.1:10002;
 
         # add more instances for load balancing
         # server 127.0.0.1:10003;
         # server 127.0.0.1:10004;
     }
 
     ## gist alias
 
     server {
         listen          443;
         server_name     gist.myserver.com;
         access_log      /var/log/nginx/gist.access.log;
         error_log       /var/log/nginx/gist.error.log;
 
         ssl on;
         ssl_certificate     gist.rhodecode.myserver.com.crt;
         ssl_certificate_key gist.rhodecode.myserver.com.key;
 
         ssl_session_timeout 5m;
 
         ssl_protocols SSLv3 TLSv1;
         ssl_ciphers DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:EDH-RSA-DES-CBC3-SHA:AES256-SHA:DES-CBC3-SHA:AES128-SHA:RC4-SHA:RC4-MD5;
         ssl_prefer_server_ciphers on;
         add_header Strict-Transport-Security "max-age=31536000; includeSubdomains;";
 
         # Diffie-Hellman parameter for DHE ciphersuites, recommended 2048 bits
         ssl_dhparam /etc/nginx/ssl/dhparam.pem;
 
         rewrite ^/(.+)$ https://rhodecode.myserver.com/_admin/gists/$1;
         rewrite (.*)    https://rhodecode.myserver.com/_admin/gists;
     }
 
     server {
         listen          443;
         server_name     rhodecode.myserver.com;
         access_log      /var/log/nginx/rhodecode.access.log;
         error_log       /var/log/nginx/rhodecode.error.log;
 
         ssl on;
         ssl_certificate     rhodecode.myserver.com.crt;
         ssl_certificate_key rhodecode.myserver.com.key;
 
         ssl_session_timeout 5m;
 
         ssl_protocols SSLv3 TLSv1;
         ssl_ciphers DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:EDH-RSA-DES-CBC3-SHA:AES256-SHA:DES-CBC3-SHA:AES128-SHA:RC4-SHA:RC4-MD5;
         ssl_prefer_server_ciphers on;
 
         include         /etc/nginx/proxy.conf;
 
         ## uncomment to serve static files by nginx
-        # location /_static {
+        # location /_static/rhodecode {
         #    alias /path/to/.rccontrol/enterprise-1/static;
         # }
 
         ## channel stream live components
         location /_channelstream {
             rewrite /_channelstream/(.*) /$1 break;
             proxy_connect_timeout        10;
             proxy_send_timeout           10m;
             proxy_read_timeout           10m;
             tcp_nodelay		             off;
             proxy_pass                   http://127.0.0.1:9800;
             proxy_set_header             Host $host;
             proxy_set_header             X-Real-IP $remote_addr;
             proxy_set_header	         X-Url-Scheme $scheme;
             proxy_set_header	         X-Forwarded-Proto $scheme;
             proxy_set_header 	         X-Forwarded-For $proxy_add_x_forwarded_for;
             gzip                         off;
             proxy_http_version           1.1;
             proxy_set_header Upgrade     $http_upgrade;
             proxy_set_header Connection  "upgrade";
         }
 
         location / {
             try_files $uri @rhode;
         }
 
         location @rhode {
             proxy_pass      http://rc;
         }
     }

rhodecode/config/middleware.py

@@ -1,395 +1,395 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2016  RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 """
 Pylons middleware initialization
 """
 import logging
 
 from paste.registry import RegistryManager
 from paste.gzipper import make_gzip_middleware
 from pylons.wsgiapp import PylonsApp
 from pyramid.authorization import ACLAuthorizationPolicy
 from pyramid.config import Configurator
 from pyramid.static import static_view
 from pyramid.settings import asbool, aslist
 from pyramid.wsgi import wsgiapp
 from pyramid.httpexceptions import HTTPError, HTTPInternalServerError
 from pylons.controllers.util import abort, redirect
 import pyramid.httpexceptions as httpexceptions
 from pyramid.renderers import render_to_response, render
 from routes.middleware import RoutesMiddleware
 import routes.util
 
 import rhodecode
 import rhodecode.integrations # do not remove this as it registers celery tasks
 from rhodecode.config import patches
 from rhodecode.config.routing import STATIC_FILE_PREFIX
 from rhodecode.config.environment import (
     load_environment, load_pyramid_environment)
 from rhodecode.lib.middleware import csrf
 from rhodecode.lib.middleware.appenlight import wrap_in_appenlight_if_enabled
 from rhodecode.lib.middleware.disable_vcs import DisableVCSPagesWrapper
 from rhodecode.lib.middleware.https_fixup import HttpsFixup
 from rhodecode.lib.middleware.vcs import VCSMiddleware
 from rhodecode.lib.plugins.utils import register_rhodecode_plugin
 
 
 log = logging.getLogger(__name__)
 
 
 # this is used to avoid avoid the route lookup overhead in routesmiddleware
 # for certain routes which won't go to pylons to - eg. static files, debugger
 # it is only needed for the pylons migration and can be removed once complete
 class SkippableRoutesMiddleware(RoutesMiddleware):
     """ Routes middleware that allows you to skip prefixes """
 
     def __init__(self, *args, **kw):
         self.skip_prefixes = kw.pop('skip_prefixes', [])
         super(SkippableRoutesMiddleware, self).__init__(*args, **kw)
 
     def __call__(self, environ, start_response):
         for prefix in self.skip_prefixes:
             if environ['PATH_INFO'].startswith(prefix):
                 return self.app(environ, start_response)
 
         return super(SkippableRoutesMiddleware, self).__call__(
             environ, start_response)
 
 
 def make_app(global_conf, full_stack=True, static_files=True, **app_conf):
     """Create a Pylons WSGI application and return it
 
     ``global_conf``
         The inherited configuration for this application. Normally from
         the [DEFAULT] section of the Paste ini file.
 
     ``full_stack``
         Whether or not this application provides a full WSGI stack (by
         default, meaning it handles its own exceptions and errors).
         Disable full_stack when this application is "managed" by
         another WSGI middleware.
 
     ``app_conf``
         The application's local configuration. Normally specified in
         the [app:<name>] section of the Paste ini file (where <name>
         defaults to main).
 
     """
     # Apply compatibility patches
     patches.kombu_1_5_1_python_2_7_11()
     patches.inspect_getargspec()
 
     # Configure the Pylons environment
     config = load_environment(global_conf, app_conf)
 
     # The Pylons WSGI app
     app = PylonsApp(config=config)
     if rhodecode.is_test:
         app = csrf.CSRFDetector(app)
 
     expected_origin = config.get('expected_origin')
     if expected_origin:
         # The API can be accessed from other Origins.
         app = csrf.OriginChecker(app, expected_origin,
                                  skip_urls=[routes.util.url_for('api')])
 
 
     if asbool(full_stack):
 
         # Appenlight monitoring and error handler
         app, appenlight_client = wrap_in_appenlight_if_enabled(app, config)
 
         # we want our low level middleware to get to the request ASAP. We don't
         # need any pylons stack middleware in them
         app = VCSMiddleware(app, config, appenlight_client)
 
     # Establish the Registry for this application
     app = RegistryManager(app)
 
     app.config = config
 
     return app
 
 
 def make_pyramid_app(global_config, **settings):
     """
     Constructs the WSGI application based on Pyramid and wraps the Pylons based
     application.
 
     Specials:
 
     * We migrate from Pylons to Pyramid. While doing this, we keep both
       frameworks functional. This involves moving some WSGI middlewares around
       and providing access to some data internals, so that the old code is
       still functional.
 
     * The application can also be integrated like a plugin via the call to
       `includeme`. This is accompanied with the other utility functions which
       are called. Changing this should be done with great care to not break
       cases when these fragments are assembled from another place.
 
     """
     # The edition string should be available in pylons too, so we add it here
     # before copying the settings.
     settings.setdefault('rhodecode.edition', 'Community Edition')
 
     # As long as our Pylons application does expect "unprepared" settings, make
     # sure that we keep an unmodified copy. This avoids unintentional change of
     # behavior in the old application.
     settings_pylons = settings.copy()
 
     sanitize_settings_and_apply_defaults(settings)
     config = Configurator(settings=settings)
     add_pylons_compat_data(config.registry, global_config, settings_pylons)
 
     load_pyramid_environment(global_config, settings)
 
     includeme_first(config)
     includeme(config)
     pyramid_app = config.make_wsgi_app()
     pyramid_app = wrap_app_in_wsgi_middlewares(pyramid_app, config)
     return pyramid_app
 
 
 def add_pylons_compat_data(registry, global_config, settings):
     """
     Attach data to the registry to support the Pylons integration.
     """
     registry._pylons_compat_global_config = global_config
     registry._pylons_compat_settings = settings
 
 
 def webob_to_pyramid_http_response(webob_response):
     ResponseClass = httpexceptions.status_map[webob_response.status_int]
     pyramid_response = ResponseClass(webob_response.status)
     pyramid_response.status = webob_response.status
     pyramid_response.headers.update(webob_response.headers)
     if pyramid_response.headers['content-type'] == 'text/html':
         pyramid_response.headers['content-type'] = 'text/html; charset=UTF-8'
     return pyramid_response
 
 
 def error_handler(exception, request):
     # TODO: dan: replace the old pylons error controller with this
     from rhodecode.model.settings import SettingsModel
     from rhodecode.lib.utils2 import AttributeDict
 
     try:
         rc_config = SettingsModel().get_all_settings()
     except Exception:
         log.exception('failed to fetch settings')
         rc_config = {}
 
     base_response = HTTPInternalServerError()
     # prefer original exception for the response since it may have headers set
     if isinstance(exception, HTTPError):
         base_response = exception
 
     c = AttributeDict()
     c.error_message = base_response.status
     c.error_explanation = base_response.explanation or str(base_response)
     c.visual = AttributeDict()
 
     c.visual.rhodecode_support_url = (
         request.registry.settings.get('rhodecode_support_url') or
         request.route_url('rhodecode_support')
     )
     c.redirect_time = 0
     c.rhodecode_name = rc_config.get('rhodecode_title', '')
     if not c.rhodecode_name:
         c.rhodecode_name = 'Rhodecode'
 
     response = render_to_response(
         '/errors/error_document.html', {'c': c}, request=request,
         response=base_response)
 
     return response
 
 
 def includeme(config):
     settings = config.registry.settings
 
     # plugin information
     config.registry.rhodecode_plugins = {}
 
     config.add_directive(
         'register_rhodecode_plugin', register_rhodecode_plugin)
 
     if asbool(settings.get('appenlight', 'false')):
         config.include('appenlight_client.ext.pyramid_tween')
 
     # Includes which are required. The application would fail without them.
     config.include('pyramid_mako')
     config.include('pyramid_beaker')
     config.include('rhodecode.admin')
     config.include('rhodecode.authentication')
     config.include('rhodecode.integrations')
     config.include('rhodecode.login')
     config.include('rhodecode.tweens')
     config.include('rhodecode.api')
     config.add_route(
         'rhodecode_support', 'https://rhodecode.com/help/', static=True)
 
     # Set the authorization policy.
     authz_policy = ACLAuthorizationPolicy()
     config.set_authorization_policy(authz_policy)
 
     # Set the default renderer for HTML templates to mako.
     config.add_mako_renderer('.html')
 
     # include RhodeCode plugins
     includes = aslist(settings.get('rhodecode.includes', []))
     for inc in includes:
         config.include(inc)
 
     pylons_app = make_app(
         config.registry._pylons_compat_global_config,
         **config.registry._pylons_compat_settings)
     config.registry._pylons_compat_config = pylons_app.config
 
     pylons_app_as_view = wsgiapp(pylons_app)
 
     # Protect from VCS Server error related pages when server is not available
     vcs_server_enabled = asbool(settings.get('vcs.server.enable', 'true'))
     if not vcs_server_enabled:
         pylons_app_as_view = DisableVCSPagesWrapper(pylons_app_as_view)
 
 
     def pylons_app_with_error_handler(context, request):
         """
         Handle exceptions from rc pylons app:
 
         - old webob type exceptions get converted to pyramid exceptions
         - pyramid exceptions are passed to the error handler view
         """
         try:
             response = pylons_app_as_view(context, request)
             if 400 <= response.status_int <= 599: # webob type error responses
                 return error_handler(
                     webob_to_pyramid_http_response(response), request)
         except HTTPError as e: # pyramid type exceptions
             return error_handler(e, request)
         except Exception:
             if settings.get('debugtoolbar.enabled', False):
                 raise
             return error_handler(HTTPInternalServerError(), request)
         return response
 
     # This is the glue which allows us to migrate in chunks. By registering the
     # pylons based application as the "Not Found" view in Pyramid, we will
     # fallback to the old application each time the new one does not yet know
     # how to handle a request.
     config.add_notfound_view(pylons_app_with_error_handler)
 
     if not settings.get('debugtoolbar.enabled', False):
         # if no toolbar, then any exception gets caught and rendered
         config.add_view(error_handler, context=Exception)
 
     config.add_view(error_handler, context=HTTPError)
 
 
 def includeme_first(config):
     # redirect automatic browser favicon.ico requests to correct place
     def favicon_redirect(context, request):
         return redirect(
             request.static_url('rhodecode:public/images/favicon.ico'))
 
     config.add_view(favicon_redirect, route_name='favicon')
     config.add_route('favicon', '/favicon.ico')
 
     config.add_static_view(
         '_static/deform', 'deform:static')
     config.add_static_view(
-        '_static', path='rhodecode:public', cache_max_age=3600 * 24)
+        '_static/rhodecode', path='rhodecode:public', cache_max_age=3600 * 24)
 
 def wrap_app_in_wsgi_middlewares(pyramid_app, config):
     """
     Apply outer WSGI middlewares around the application.
 
     Part of this has been moved up from the Pylons layer, so that the
     data is also available if old Pylons code is hit through an already ported
     view.
     """
     settings = config.registry.settings
 
     # enable https redirects based on HTTP_X_URL_SCHEME set by proxy
     pyramid_app = HttpsFixup(pyramid_app, settings)
 
     # Add RoutesMiddleware to support the pylons compatibility tween during
     # migration to pyramid.
     pyramid_app = SkippableRoutesMiddleware(
         pyramid_app, config.registry._pylons_compat_config['routes.map'],
         skip_prefixes=(STATIC_FILE_PREFIX, '/_debug_toolbar'))
 
     if asbool(settings.get('appenlight', 'false')):
         pyramid_app, _ = wrap_in_appenlight_if_enabled(
             pyramid_app, config.registry._pylons_compat_config)
 
     if asbool(settings.get('gzip_responses', 'true')):
         pyramid_app = make_gzip_middleware(
             pyramid_app, settings, compress_level=1)
 
     return pyramid_app
 
 
 def sanitize_settings_and_apply_defaults(settings):
     """
     Applies settings defaults and does all type conversion.
 
     We would move all settings parsing and preparation into this place, so that
     we have only one place left which deals with this part. The remaining parts
     of the application would start to rely fully on well prepared settings.
 
     This piece would later be split up per topic to avoid a big fat monster
     function.
     """
 
     # Pyramid's mako renderer has to search in the templates folder so that the
     # old templates still work. Ported and new templates are expected to use
     # real asset specifications for the includes.
     mako_directories = settings.setdefault('mako.directories', [
         # Base templates of the original Pylons application
         'rhodecode:templates',
     ])
     log.debug(
         "Using the following Mako template directories: %s",
         mako_directories)
 
     # Default includes, possible to change as a user
     pyramid_includes = settings.setdefault('pyramid.includes', [
         'rhodecode.lib.middleware.request_wrapper',
     ])
     log.debug(
         "Using the following pyramid.includes: %s",
         pyramid_includes)
 
     # TODO: johbo: Re-think this, usually the call to config.include
     # should allow to pass in a prefix.
     settings.setdefault('rhodecode.api.url', '/_admin/api')
 
     _bool_setting(settings, 'vcs.server.enable', 'true')
     _bool_setting(settings, 'is_test', 'false')
 
     return settings
 
 
 def _bool_setting(settings, name, default):
     settings[name] = asbool(settings.get(name, default))

rhodecode/public/js/src/rhodecode/utils/pyroutes.js

@@ -1,235 +1,235 b''
 // # Copyright (C) 2010-2016  RhodeCode GmbH
 // #
 // # This program is free software: you can redistribute it and/or modify
 // # it under the terms of the GNU Affero General Public License, version 3
 // # (only), as published by the Free Software Foundation.
 // #
 // # This program is distributed in the hope that it will be useful,
 // # but WITHOUT ANY WARRANTY; without even the implied warranty of
 // # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // # GNU General Public License for more details.
 // #
 // # You should have received a copy of the GNU Affero General Public License
 // # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #
 // # This program is dual-licensed. If you wish to learn more about the
 // # RhodeCode Enterprise Edition, including its added features, Support services,
 // # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 /**
 * Object holding the registered pyroutes.
 * Routes will be registered with the generated script
 * rhodecode/public/js/rhodecode/base/pyroutes.js
 */
 var PROUTES_MAP = {};
 
 /**
 * PyRoutesJS
 *
 * Usage pyroutes.url('mark_error_fixed',{"error_id":error_id}) // /mark_error_fixed/<error_id>
 */
 var pyroutes = (function() {
   // access global map defined in special file pyroutes
   var matchlist = PROUTES_MAP;
   var sprintf = (function() {
     function get_type(variable) {
       return Object.prototype.toString.call(variable).slice(8, -1).toLowerCase();
     }
     function str_repeat(input, multiplier) {
       for (var output = []; multiplier > 0; output[--multiplier] = input) {
           /* do nothing */
       }
       return output.join('');
     }
     var str_format = function() {
       if (!str_format.cache.hasOwnProperty(arguments[0])) {
           str_format.cache[arguments[0]] = str_format.parse(arguments[0]);
       }
       return str_format.format.call(null, str_format.cache[arguments[0]], arguments);
     };
 
     str_format.format = function(parse_tree, argv) {
       var cursor = 1,
                    tree_length = parse_tree.length,
                    node_type = '',
                    arg,
                    output = [],
                    i, k,
                    match,
                    pad,
                    pad_character,
                    pad_length;
       for (i = 0; i < tree_length; i++) {
         node_type = get_type(parse_tree[i]);
         if (node_type === 'string') {
             output.push(parse_tree[i]);
         }
         else if (node_type === 'array') {
           match = parse_tree[i]; // convenience purposes only
           if (match[2]) { // keyword argument
               arg = argv[cursor];
               for (k = 0; k < match[2].length; k++) {
                   if (!arg.hasOwnProperty(match[2][k])) {
                       throw(sprintf('[sprintf] property "%s" does not exist', match[2][k]));
                   }
                   arg = arg[match[2][k]];
               }
           }
           else if (match[1]) { // positional argument (explicit)
               arg = argv[match[1]];
           }
           else { // positional argument (implicit)
               arg = argv[cursor++];
           }
 
           if (/[^s]/.test(match[8]) && (get_type(arg) !== 'number')) {
               throw(sprintf('[sprintf] expecting number but found %s', get_type(arg)));
           }
           switch (match[8]) {
               case 'b': arg = arg.toString(2); break;
               case 'c': arg = String.fromCharCode(arg); break;
               case 'd': arg = parseInt(arg, 10); break;
               case 'e': arg = match[7] ? arg.toExponential(match[7]) : arg.toExponential(); break;
               case 'f': arg = match[7] ? parseFloat(arg).toFixed(match[7]) : parseFloat(arg); break;
               case 'o': arg = arg.toString(8); break;
               case 's': arg = ((arg = String(arg)) && match[7] ? arg.substring(0, match[7]) : arg);
                 break;
               case 'u': arg = Math.abs(arg); break;
               case 'x': arg = arg.toString(16); break;
               case 'X': arg = arg.toString(16).toUpperCase(); break;
           }
           arg = (/[def]/.test(match[8]) && match[3] && arg >= 0 ? '+'+ arg : arg);
           pad_character =
               match[4] ? match[4] === '0' ? '0' : match[4].charAt(1) : ' ';
           pad_length = match[6] - String(arg).length;
           pad = match[6] ? str_repeat(pad_character, pad_length) : '';
           output.push(match[5] ? arg + pad : pad + arg);
         }
       }
       return output.join('');
     };
 
     str_format.cache = {};
 
     str_format.parse = function(fmt) {
     var _fmt = fmt, match = [], parse_tree = [], arg_names = 0;
     while (_fmt) {
       if ((match = /^[^\x25]+/.exec(_fmt)) !== null) {
           parse_tree.push(match[0]);
       }
       else if ((match = /^\x25{2}/.exec(_fmt)) !== null) {
           parse_tree.push('%');
       }
       else if (
           (match = /^\x25(?:([1-9]\d*)\$|\(([^\)]+)\))?(\+)?(0|'[^$])?(-)?(\d+)?(?:\.(\d+))?([b-fosuxX])/.exec(_fmt)) !== null) {
         if (match[2]) {
           arg_names |= 1;
           var field_list = [], replacement_field = match[2], field_match = [];
           if ((field_match = /^([a-z_][a-z_\d]*)/i.exec(replacement_field)) !== null) {
             field_list.push(field_match[1]);
             while ((replacement_field = replacement_field.substring(field_match[0].length)) !== '') {
               if ((field_match = /^\.([a-z_][a-z_\d]*)/i.exec(replacement_field)) !== null) {
                 field_list.push(field_match[1]);
               }
               else if ((field_match = /^\[(\d+)\]/.exec(replacement_field)) !== null) {
                 field_list.push(field_match[1]);
               }
               else {
                 throw('[sprintf] huh?');
               }
             }
           }
           else {
               throw('[sprintf] huh?');
           }
           match[2] = field_list;
         }
         else {
             arg_names |= 2;
         }
         if (arg_names === 3) {
             throw('[sprintf] mixing positional and named placeholders is not (yet) supported');
         }
         parse_tree.push(match);
       }
       else {
           throw('[sprintf] huh?');
       }
       _fmt = _fmt.substring(match[0].length);
     }
     return parse_tree;
     };
     return str_format;
   })();
 
   var vsprintf = function(fmt, argv) {
     argv.unshift(fmt);
     return sprintf.apply(null, argv);
   };
   return {
     'asset': function(path, ver) {
-      var asset_url = ASSET_URL || '/_static/';
+      var asset_url = ASSET_URL || '/_static/rhodecode/';
       var ret = asset_url + path;
       if (ver !== undefined) {
         ret += '?ver=' + ver;
       }
       return ret;
     },
     'url': function(route_name, params) {
       var result = route_name;
       if (typeof(params) !== 'object'){
           params = {};
       }
       if (matchlist.hasOwnProperty(route_name)) {
           var route = matchlist[route_name];
         // param substitution
         for(var i=0; i < route[1].length; i++) {
             var param_name = route[1][i];
             if (!params.hasOwnProperty(param_name))
                 throw new Error(
                     'parameter '+
                     param_name +
                     ' is missing in route"' +
                     route_name + '" generation');
         }
         result = sprintf(route[0], params);
 
         var ret = [];
         // extra params => GET
         for (var param in params){
             if (route[1].indexOf(param) === -1){
                 ret.push(encodeURIComponent(param) + "=" +
                 encodeURIComponent(params[param]));
             }
         }
         var _parts = ret.join("&");
         if(_parts){
             result = result +'?'+ _parts;
         }
         if(APPLICATION_URL) {
             result = APPLICATION_URL + result;
         }
       }
 
       return result;
     },
     'register': function(route_name, route_tmpl, req_params) {
       if (typeof(req_params) !== 'object') {
         req_params = [];
       }
       // fix escape
       route_tmpl = unescape(route_tmpl);
       keys = [];
       for(var i=0; i < req_params.length; i++) {
         keys.push(req_params[i]);
       }
       matchlist[route_name] = [
       route_tmpl,
       keys
       ];
     },
     '_routes': function(){
         return matchlist;
     }
   };
 })();

rhodecode/templates/debug_style/tables.html

@@ -1,545 +1,545 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="/debug_style/index.html"/>
 
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Style'), h.url('debug_style_home'))}
     &raquo;
     ${c.active}
 </%def>
 
 
 <%def name="real_main()">
 <div class="box">
     <div class="title">
         ${self.breadcrumbs()}
     </div>
 
     <div class='sidebar-col-wrapper'>
       ##main
       ${self.sidebar()}
 
       <div class="main-content">
 
       <div style="opacity:.5">
 
         <h2>Simple tables</h2>
 
         <p>These styles will be adjusted later to provide a baseline style
             for all tables without classes added, whether part of the
             application or not. Currently, some of the
             application-specific styles are applied to this table.</p>
         <p>This is a baseline style for all tables, whether part of the
             application or not. It has no class applied for styling. Use
             the "rctable" class as outlined before for tables which are
             part of the RhodeCode application.</p>
         <table>
           <tbody>
             <tr>
               <th>Header A</th>
               <th>Header B</th>
               <th>Header C</th>
               <th>Header D</th>
             </tr>
             <tr>
               <td>Content of col A</td>
               <td>Content of col B</td>
               <td>Content of col C</td>
               <td>Content of col D</td>
             </tr>
             <tr>
               <td>Content of col A</td>
               <td>Content of col B</td>
               <td>Content of col C</td>
               <td>Content of col D</td>
             </tr>
             <tr>
               <td>Content of col A</td>
               <td>Content of col B</td>
               <td>Content of col C</td>
               <td>Content of col D</td>
             </tr>
             <tr>
               <td>Content of col A</td>
               <td>Content of col B</td>
               <td>Content of col C</td>
               <td>Content of col D</td>
             </tr>
           </tbody>
         </table>
       </div>
 
 
 
 
       <h2>RC application table with examples</h2>
 
       <p>This is a standard table which applies the rhodecode-specific styling to be used
           throughout the application; it has <code>&lt;table class="rctable"&gt;</code>.
           <br/>
           By default, table data is not truncated, and wraps inside of the <code>&lt;td&gt
           ;</code>. To prevent wrapping and contain data on one line, use the <code>&lt;
           class="truncate-wrap"&gt;</code> on the <code>&lt;td&gt;</code>, and <code>span
           class="truncate"</code> around the specific data to be truncated.
       </p>
       <p>
           Ellipsis is added via CSS. Please always add a row of headers using <code>&lt;th
           &gt;</code> to the top of a table.
       </p>
 
       ## TODO: johbo: in case we have more tables with examples, we should
       ## create a generic class here.
       <table class="rctable issuetracker">
         <thead>
           <tr>
             <th>Header A</th>
             <th>Header B</th>
             <th>Header C</th>
             <th>Header D</th>
           </tr>
         </thead>
         <tbody>
           <tr>
             <td class="issue-tracker-example">
               Example of col A
             </td>
             <td class="issue-tracker-example">
               Example of col B
             </td>
             <td class="issue-tracker-example">
               Example of col C
             </td>
             <td class="issue-tracker-example">
               Example of col D
             </td>
           </tr>
           <tr>
             <td>Content of col A</td>
             <td>Content of col B</td>
             <td>Content of col C which is very long and will not be
               truncated because sometimes people just want to write
               really, really long commit messages which explain what
               they did in excruciating detail and you really, really
               want to read them.</td>
             <td>Content of col D</td>
           </tr>
           <tr>
             <td>Content of col A</td>
             <td>Content of col B</td>
             <td>Content of col C</td>
             <td class="truncate-wrap"><span class="truncate">Truncated
                 content of column D truncate truncate truncatetruncate
                 truncate truncate</span></td>
           </tr>
         </tbody>
       </table>
 
       <h2>RC application table data classes</h2>
 
       <p>The following tables contain documentation of all existing table data classes.
          Please update when new classes are made.
       </p>
       <table class="rctable examples">
         <thead>
           <tr>
             <th>Class</th>
             <th>Description</th>
             <th>Example</th>
           </tr>
         </thead>
         <tbody>
             <td>td-user</td>
             <td>Any username/gravatar combination (see also Icons style).</td>
             <td class="td-user author">
               <img class="gravatar" alt="gravatar" src="https://secure.gravatar.com/avatar/0c9a7e6674b6f0b35d98dbe073e3f0ab?d=identicon&amp;s=32" height="16" width="16">
               <span title="Oliver Strobel <[e-mail]>" class="user">ostrobel (Oliver Strobel)</span>
             </td>
           </tr>
           <tr>
             <td>td-hash</td>
             <td>Any hash; a commit, revision, etc. Use <code>&lt;pre&gt;</code> and header 'Commit'</td>
             <td class="td-commit">
               <pre><a href="/anothercpythonforkkkk/files/8d6b27837c6979983b037693fe975cdbb761b500/">r93699:8d6b27837c69</a></pre>
             </td>
           </tr>
           <tr>
             <td>td-rss</td>
             <td>RSS feed link icon</td>
             <td class="td-rss">
               <a title="Subscribe to rss feed" href="/feed/rss"><i class="icon-rss-sign"></i></a>
             </td>
           </tr>
           <tr>
             <td>td-componentname</td>
             <td>Any group, file, gist, or directory name.</td>
             <td class="td-componentname">
               <a href="/cpythonfork">
                 <span title="Mercurial repository"><i class="icon-hg"></i></span>
                 <i class="icon-unlock-alt" title="Public repository"></i>
                 rhodecode-dev-restyle-fork
               </a>
             </td>
           </tr>
           <tr>
             <td>td-tags</td>
             <td>Any cell containing tags, including branches and bookmarks.</td>
             <td class="td-tags">
               <span class="branchtag tag" title="Branch default">
                 <a href="/rhodecode-dev-restyle-  fork/changelog?branch=default"><i class="icon-code-fork"></i>default</a>
              </span>
             </td>
           </tr>
           <tr>
             <td>tags-truncate</td>
             <td>Used to truncate a cell containing tags; avoid if possible.</td>
             <td class="td-tags truncate-wrap">
               <div class="truncate tags-truncate">
                 <div class="autoexpand">
                   <span class="tagtag tag" title="Tag tip">
                     <a href="/rhodecode-dev-restyle-fork/files/e519d5a0e71466d27257ddff921c4a13c540408e/"><i class="icon-tag"></i>tip</a>
                   </span>
                   <span class="branchtag tag" title="Branch default">
                    <a href="/rhodecode-dev-restyle-fork/changelog?branch=default"><i class="icon-code-fork"></i>default</a>
                   </span>
                   <span class="branchtag tag" title="Branch default">
                    <a href="/rhodecode-dev-restyle-fork/changelog?branch=default"><i class="icon-code-fork"></i>default</a>
                   </span>
                 </div>
               </div>
             </td>
           </tr>
           <tr>
             <td>td-ip</td>
             <td>Any ip address.</td>
             <td class="td-ip">
               172.16.115.168
             </td>
           </tr>
           <tr>
             <td>td-type</td>
             <td>A state or an auth type.</td>
             <td class="td-type">
               rhodecode
             </td>
           </tr>
           <tr>
             <td>td-authtoken</td>
             <td>For auth tokens. Use truncate classes for hover expand; see html.</td>
             <td class="truncate-wrap td-authtoken">
               <div class="truncate autoexpand">
                 <code>688df65b87d3ad16ae9f8fc6338a551d40f41c7a</code>
               </div>
             </td>
           </tr>
           <tr>
             <td>td-action</td>
             <td>Buttons which perform an action.</td>
             <td class="td-action">
               <div class="grid_edit">
                 <a href="/_admin/users/2/edit" title="edit">
                   <i class="icon-pencil"></i>Edit</a>
               </div>
               <div class="grid_delete">
               <form action="/_admin/users/2" method="post">
                 <i class="icon-remove-sign"></i>
                 <input class="btn btn-danger btn-link" id="remove_user_2" name="remove_"  type="submit" value="delete">
               </form>
              </div>
             </td>
           </tr>
           <tr>
             <td>td-radio</td>
             <td>Radio buttons for a form. Centers element.</td>
             <td class="td-radio">
               <input type="radio" checked="checked" value="" name="1" id="read"></td>
           </tr>
           <tr>
             <td>td-checkbox</td>
             <td>Checkbox for a form. Centers element.</td>
             <td class="td-checkbox">
               <input type="checkbox" checked="checked" value="" name="1" id="read"></td>
           </tr>
           <tr>
           <tr>
             <td>td-buttons</td>
             <td>Buttons.</td>
             <td class="td-buttons">
                 <span class="btn btn-mini btn-primary">feed access</span>
             </td>
           </tr>
           <tr>
             <td>td-compare</td>
             <td>Radio buttons to compare commits.</td>
             <td class=" td-compare">
                 <input class="compare-radio-button" type="radio" name="compare_source" value="2.0">
                 <input class="compare-radio-button" type="radio" name="compare_target" value="2.0">
             </td>
           </tr>
           <tr>
             <td>td-comments</td>
             <td>Comments indicator icon.</td>
             <td>
               <i class="icon-comment icon-comment-colored"></i> 0
             </td>
           </tr>
           <tr>
             <td>td-status</td>
             <td>Status indicator icon.</td>
             <td class="td-description">
               <div class="flag_status under_review pull-left"></div>
             </td>
           </tr>
         </tbody>
       </table>
       <table class="dataTable rctable examples">
         <tbody>
           <tr>
             <td>quick_repo_menu</td>
             <td>Hidden menu generated by dataTable.</td>
             <td class="quick_repo_menu">
               <i class="pointer icon-more"></i>
               <div class="menu_items_container" style="display: none;">
                 <ul class="menu_items">
                   <li>
                      <a title="Summary" href="/anothercpythonforkkkk-fork">
                      <span>Summary</span>
                      </a>
                   </li>
                   <li>
                      <a title="Changelog" href="/anothercpythonforkkkk-fork/changelog">
                      <span>Changelog</span>
                      </a>
                   </li>
                   <li>
                      <a title="Files" href="/anothercpythonforkkkk-fork/files/tip/">
                      <span>Files</span>
                      </a>
                   </li>
                   <li>
                      <a title="Fork" href="/anothercpythonforkkkk-fork/fork">
                      <span>Fork</span>
                      </a>
                   </li>
                 </ul>
               </div>
             </td>
             <td></td>
           </tr>
         </tbody>
       </table>
       <script>quick_repo_menu();</script>
       <table class="rctable examples">
         <tbody>
           <tr>
             <td>td-description</td>
             <td>Any description. They may be rather long, and using the expand_commit outlined below is recommended.</td>
             <td class="td-description">
               Ultrices mattis! Enim pellentesque lacus, sit magna natoque risus turpis ut, auctor ultrices facilisis dapibus odio? Parturient! Porta egestas nascetur, quis, elementum dolor, in magna ac dis sit etiam turpis, scelerisque! Integer tristique aliquam.
             </td>
           </tr>
         </tbody>
       </table>
       <table id="changesets" class="rctable examples end">
         <tbody>
           <tr>
             <td>expand_commit</td>
             <td>Expands a long message; see html+js.</td>
             <td class="expand_commit" data-commit-id="2ffc6faabc7a9c790b1b452943a3f0c047b8b436" title="Expand commit message">
                 <div class="show_more_col">
                 <i class="show_more"></i>
                 </div>
             </td>
             <td class="mid td-description">
                 <div class="log-container truncate-wrap">
                     <div id="c-2ffc6faabc7a9c790b1b452943a3f0c047b8b436" class="message truncate" data-message-raw="tests: Test echo method on the server object
 
             This only works for Pyro4 so far, have to extend it still for HTTP to work.">tests: Test echo method on the server object
 
             This only works for Pyro4 so far, have to extend it still for HTTP to work.</div>
                 </div>
             </td>
           </tr>
         </tbody>
       </table>
         <script type="text/javascript">
             var cache = {}
             $('.expand_commit').on('click',function(e){
               var target_expand = $(this);
               var cid = target_expand.data('commitId');
 
               if (target_expand.hasClass('open')){
                 $('#c-'+cid).css({'height': '1.5em', 'white-space': 'nowrap', 'text-overflow': 'ellipsis', 'overflow':'hidden'});
                 $('#t-'+cid).css({'height': '1.5em', 'max-height': '1.5em', 'text-overflow': 'ellipsis', 'overflow':'hidden', 'white-space':'nowrap'});
                 target_expand.removeClass('open');
               }
               else {
                 $('#c-'+cid).css({'height': 'auto', 'white-space': 'pre-line', 'text-overflow': 'initial', 'overflow':'visible'});
                 $('#t-'+cid).css({'height': 'auto', 'max-height': 'none', 'text-overflow': 'initial', 'overflow':'visible', 'white-space':'normal'});
                 target_expand.addClass('open');
               }
             });
 
         </script>
         <p>The following classes currently do not have unique styles applied.</p>
         <table class="rctable examples end">
           <tbody>
             <tr>
               <td>td-regex</td>
               <td>Regex patterns</td>
               <td class="td-regex">(?:#)(?P<issue_id>\d+)</td>
             </tr>
             <tr>
               <td>td-url</td>
               <td>Any URL.</td>
               <td class="td-url">https://rhodecode.com</td>
             </tr>
             <tr>
               <td>td-journalaction</td>
               <td>Action listed in a journal</td>
               <td class="td-journalaction">started following repository supervisor-fork-4</td>
             </tr>
             <tr>
               <td>td-iprange</td>
               <td>Any ip address.</td>
               <td class="td-ip">127.0.0.1-127.0.0.10</td>
             </tr>
             <tr>
               <td>td-exp</td>
               <td>Expiration time.</td>
               <td class="td-exp">never</td>
             </tr>
             <tr>
               <td>td-prefix</td>
               <td>Prefixes outlined in settings.</td>
               <td class="td-prefix">ubuntu-92539</td>
             </tr>
             <tr>
               <td>td-cachekey</td>
               <td>Cache key value.</td>
               <td class="td-cachekey">ubuntu-92539supervisor</td>
             </tr>
             <tr>
               <td>td-email</td>
               <td>Any email address.</td>
               <td class="td-email">[e-mail]</td>
             </tr>
             <tr>
               <td>td-active</td>
               <td>Shows active state with icon-true/icon-false.</td>
               <td class="td-active"><i class="icon-false"></i></td>
             </tr>
             <tr>
               <td>td-size</td>
               <td>File, repo, or directory size.</td>
               <td class="td-size">89 MB</td>
             </tr>
             <tr>
               <td>td-number</td>
               <td>Any numerical data.</td>
               <td class="td-number">42</td>
             </tr>
             <tr>
               <td>td-message</td>
               <td>Any commit message. Often treated with the truncate class used for descriptions as well.</td>
               <td class="td-message">Updated the files</td>
             </tr>
           </tbody>
         </table>
 
 
       <h2>Permissions table</h2>
 
       <p>
         This is a special-case table; it has
         <code>table class="rctable permissions"</code>
         where "rctable" applies the rhodecode styling as above, and
         "permissions" adds an extra layer of customization specific to
         permissions tables. Other special-case tables may exist or be
         created if necessary.
       </p>
 
       <table class="rctable permissions">
         <tr>
           <th class="td-radio">none</th>
           <th class="td-radio">read</th>
           <th class="td-radio">write</th>
           <th class="td-radio">admin</th>
           <th>user/user group</th>
           <th></th>
         </tr>
         <tr class="perm_admin_row">
           <td class="td-radio"><input type="radio" value="repository.none"
             name="admin_perm_2" id="admin_perm_2_repositorynone"
             disabled="disabled"></td>
           <td class="td-radio"><input type="radio" value="repository.read"
             name="admin_perm_2" id="admin_perm_2_repositoryread"
             disabled="disabled"></td>
           <td class="td-radio"><input type="radio" value="repository.write"
             name="admin_perm_2" id="admin_perm_2_repositorywrite"
             disabled="disabled"></td>
           <td class="td-radio"><input type="radio" value="repository.admin"
             name="admin_perm_2" id="admin_perm_2_repositoryadmin"
             disabled="disabled" checked="checked"></td>
           <td>
             <img class="gravatar" src="https://secure.gravatar.com/avatar/be9d18f611892a738e54f2a3a171e2f9?d=identicon&amp;s=32" height="16" width="16">
             <span class="user">dev (super admin) (owner)</span>
           </td>
           <td></td>
         </tr>
         <tr>
           <td colspan="4">
               <span class="private_repo_msg">
               private repository
               </span>
           </td>
           <td class="private_repo_msg">
               <i class="icon-user"></i>
               default - only people explicitly added here will have access</td>
           <td></td>
         </tr>
         <tr>
           <td class="td-radio"><input type="radio" value="repository.none"
             name="u_perm_1" id="u_perm_1_repositorynone"></td>
           <td class="td-radio"><input type="radio" checked="checked"
             value="repository.read" name="u_perm_1"
             id="u_perm_1_repositoryread"></td>
           <td class="td-radio"><input type="radio" value="repository.write"
             name="u_perm_1" id="u_perm_1_repositorywrite"></td>
           <td class="td-radio"><input type="radio" value="repository.admin"
             name="u_perm_1" id="u_perm_1_repositoryadmin"></td>
           <td>
-            <img class="gravatar" src="/_static/images/user30.png" height="16" width="16">
+            <img class="gravatar" src="/_static/rhodecode/images/user30.png" height="16" width="16">
             <span class="user">default</span>
           </td>
           <td></td>
         </tr>
         <tr>
           <td class="td-radio"><input type="radio" value="repository.none"
             name="u_perm_2" id="u_perm_2_repositorynone"></td>
           <td class="td-radio"><input type="radio" checked="checked"
             value="repository.read" name="u_perm_2"
             id="u_perm_2_repositoryread"></td>
           <td class="td-radio"><input type="radio" value="repository.write"
             name="u_perm_2" id="u_perm_2_repositorywrite"></td>
           <td class="td-radio"><input type="radio" value="repository.admin"
             name="u_perm_2" id="u_perm_2_repositoryadmin"></td>
           <td>
             <img class="gravatar" src="https://secure.gravatar.com/avatar/be9d18f611892a738e54f2a3a171e2f9?d=identicon&amp;s=32" height="16" width="16">
             <a class="user" href="/_admin/users/2/edit">dev</a>
           </td>
           <td>
             <span member_type="user" member="2"
                   class="btn action_button btn-link btn-danger">revoke</span>
           </td>
         </tr>
         </tbody>
       </table>
       <div class="link" id="add_perm">
         Add new
       </div>
 
 
 
     </div>
   </div>
 </div>
 </%def>