kallithea Changeset - c6b811f11c94

Changeset - c6b811f11c94

Parent rev.

Child rev.

[Not reviewed]

beta

! ! !

Marcin Kuzminski - 14 years ago 2011-07-09 20:07:59
marcin@python-works.com

Javascripts rewrite: updated yui to latest 2.9, simplified ajax loading for multiple pages. Removed YUI dev package

8 files changed:

rhodecode/controllers/admin/admin.py

rhodecode/controllers/followers.py

rhodecode/controllers/forks.py

rhodecode/controllers/journal.py

rhodecode/controllers/shortlog.py

rhodecode/lib/helpers.py

rhodecode/public/css/style.css

rhodecode/public/js/rhodecode.js

138

Changeset was too big and was cut off... Show full diff anyway

0 comments (0 inline, 0 general)

rhodecode/controllers/admin/admin.py

➞

Show inline comments

@@ @@ -50,9 +50,10 @@ class AdminController(BaseController): @@
                 .options(joinedload(UserLog.repository))\
                 .order_by(UserLog.action_date.desc())
         p = int(request.params.get('page', 1))
         c.users_log = Page(users_log, page=p, items_per_page=10)
         c.log_data = render('admin/admin_log.html')
         if request.params.get('partial'):
         if request.environ.get('HTTP_X_PARTIAL_XHR'):
             return c.log_data
         return render('admin/admin.html')

rhodecode/controllers/followers.py

➞

Show inline comments

@@ @@ -48,10 +48,10 @@ class FollowersController(BaseRepoContro @@
         d = UserFollowing.get_repo_followers(repo_id)\
             .order_by(UserFollowing.follows_from)
         c.followers_pager = Page(d, page=p, items_per_page=20)
         c.followers_data = render('/followers/followers_data.html')
-        if request.params.get('partial'):
+        if request.environ.get('HTTP_X_PARTIAL_XHR'):
             return c.followers_data
         return render('/followers/followers.html')

rhodecode/controllers/forks.py

➞

Show inline comments

@@ @@ -47,10 +47,10 @@ class ForksController(BaseRepoController @@
         repo_id = c.rhodecode_db_repo.repo_id
         d = Repository.get_repo_forks(repo_id)
         c.forks_pager = Page(d, page=p, items_per_page=20)
         c.forks_data = render('/forks/forks_data.html')
-        if request.params.get('partial'):
+        if request.environ.get('HTTP_X_PARTIAL_XHR'):
             return c.forks_data
         return render('/forks/forks.html')

rhodecode/controllers/journal.py

➞

Show inline comments

@@ @@ -67,13 +67,13 @@ class JournalController(BaseController): @@
         c.journal_pager = Page(journal, page=p, items_per_page=20)
         c.journal_day_aggreagate = self._get_daily_aggregate(c.journal_pager)
         c.journal_data = render('journal/journal_data.html')
-        if request.params.get('partial'):
+        if request.environ.get('HTTP_X_PARTIAL_XHR'):
             return c.journal_data
         return render('journal/journal.html')
     def _get_daily_aggregate(self, journal):
         groups = []
         for k, g in groupby(journal, lambda x: x.action_as_day):
@@ @@ -154,13 +154,13 @@ class JournalController(BaseController): @@
         c.journal_pager = Page(journal, page=p, items_per_page=20)
         c.journal_day_aggreagate = self._get_daily_aggregate(c.journal_pager)
         c.journal_data = render('journal/journal_data.html')
-        if request.params.get('partial'):
+        if request.environ.get('HTTP_X_PARTIAL_XHR'):
             return c.journal_data
         return render('journal/public_journal.html')
     @LoginRequired(api_access=True)
     def public_journal_atom(self):
         """

rhodecode/controllers/shortlog.py

➞

Show inline comments

@@ @@ -50,10 +50,10 @@ class ShortlogController(BaseRepoControl @@
             return url('shortlog_home', repo_name=repo_name, size=size, **kw)
         c.repo_changesets = RepoPage(c.rhodecode_repo, page=p,
                                                        items_per_page=size,
                                                        url=url_generator)
         c.shortlog_data = render('shortlog/shortlog_data.html')
-        if request.params.get('partial'):
+        if request.environ.get('HTTP_X_PARTIAL_XHR'):
             return c.shortlog_data
         r = render('shortlog/shortlog.html')
         return r

rhodecode/lib/helpers.py

➞

Show inline comments

@@ @@ -86,50 +86,13 @@ class _ToolTip(object): @@
     def __call__(self, tooltip_title, trim_at=50):
         """Special function just to wrap our text into nice formatted
         autowrapped text
         :param tooltip_title:
         """
         return escape(tooltip_title)
     def activate(self):
         """Adds tooltip mechanism to the given Html all tooltips have to have
         set class `tooltip` and set attribute `tooltip_title`.
         Then a tooltip will be generated based on that. All with yui js tooltip
         """
         js = '''
         YAHOO.util.Event.onDOMReady(function(){
             function toolTipsId(){
                 var ids = [];
                 var tts = YAHOO.util.Dom.getElementsByClassName('tooltip');
                 for (var i = 0; i < tts.length; i++) {
                     //if element doesn't not have and id autogenerate one for tooltip
                     if (!tts[i].id){
                         tts[i].id='tt'+i*100;
+                    }
                     ids.push(tts[i].id);
+                }
                 return ids
             };
             var myToolTips = new YAHOO.widget.Tooltip("tooltip", {
                 context: [[toolTipsId()],"tl","bl",null,[0,5]],
                 monitorresize:false,
                 xyoffset :[0,0],
                 autodismissdelay:300000,
                 hidedelay:5,
                 showdelay:20,
             });
         });
         '''
         return literal(js)
 tooltip = _ToolTip()
 class _FilesBreadCrumbs(object):
     def __call__(self, repo_name, rev, paths):
         if isinstance(paths, str):
@@ @@ -363,13 +326,13 @@ def action_parser(user_log, feed=False): @@
     x = action.split(':')
     if len(x) > 1:
         action, action_params = x
     def get_cs_links():
-        revs_limit = 5 #display this amount always
+        revs_limit = 3 #display this amount always
         revs_top_limit = 50 #show upto this amount of changesets hidden
         revs = action_params.split(',')
         repo_name = user_log.repository.repo_name
         from rhodecode.model.scm import ScmModel
         repo = user_log.repository.scm_instance

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -1943,14 +1943,12 @@ color:#000; @@
 font-family:Lucida Grande, Verdana, Lucida Sans Regular, Lucida Sans Unicode, Arial, sans-serif;
 font-size:12px;
 margin:0;
 padding:1px 5px 1px;
+}
 .info_box input#view {
 text-align:center;
 padding:4px 3px 2px 2px;
+}
 .yui-overlay,.yui-panel-container {
@@ @@ -1972,13 +1970,13 @@ opacity:1px; @@
 padding:8px;
 white-space: pre-wrap;
 -webkit-border-radius: 8px 8px 8px 8px;
 -khtml-border-radius: 8px 8px 8px 8px;
 -moz-border-radius: 8px 8px 8px 8px;
 border-radius: 8px 8px 8px 8px;
+box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
+}
 .ac {
 vertical-align:top;
+}

rhodecode/public/js/rhodecode.js

➞

Show inline comments

@@ new file 100644 @@
 /**
 RhodeCode JS Files
 **/
 if (typeof console == "undefined" || typeof console.log == "undefined"){
 	console = { log: function() {} }
+}
 function str_repeat(i, m) {
 	for (var o = []; m > 0; o[--m] = i);
 	return o.join('');
+}
 /**
  * INJECT .format function into String
  * Usage: "My name is {0} {1}".format("Johny","Bravo")
  * Return "My name is Johny Bravo"
  * Inspired by https://gist.github.com/1049426
  */
 String.prototype.format = function() {
 	  function format() {
 	    var str = this;
 	    var len = arguments.length+1;
 	    var safe = undefined;
 	    var arg = undefined;
 	    // For each {0} {1} {n...} replace with the argument in that position.  If
 	    // the argument is an object or an array it will be stringified to JSON.
 	    for (var i=0; i < len; arg = arguments[i++]) {
 	      safe = typeof arg === 'object' ? JSON.stringify(arg) : arg;
 	      str = str.replace(RegExp('\\{'+(i-1)+'\\}', 'g'), safe);
+	    }
 	    return str;
+	  }
 	  // Save a reference of what may already exist under the property native.
 	  // Allows for doing something like: if("".format.native) { /* use native */ }
 	  format.native = String.prototype.format;
 	  // Replace the prototype property
 	  return format;
 	}();
 /**
  * GLOBAL YUI Shortcuts
  */
 var YUC = YAHOO.util.Connect;
 var YUD = YAHOO.util.Dom;
 var YUE = YAHOO.util.Event;
 var YUQ = YAHOO.util.Selector.query;
 // defines if push state is enabled for this browser ?
 var push_state_enabled = Boolean(
 		window.history && window.history.pushState && window.history.replaceState
 		&& !(   /* disable for versions of iOS before version 4.3 (8F190) */
 				(/ Mobile\/([1-7][a-z]|(8([abcde]|f(1[0-8]))))/i).test(navigator.userAgent)
 				/* disable for the mercury iOS browser, or at least older versions of the webkit engine */
 				|| (/AppleWebKit\/5([0-2]|3[0-2])/i).test(navigator.userAgent)
+		)
+)
 /**
  * Partial Ajax Implementation
+ *
  * @param url: defines url to make partial request
  * @param container: defines id of container to input partial result
  * @param s_call: success callback function that takes o as arg
  *  o.tId
  *  o.status
  *  o.statusText
  *  o.getResponseHeader[ ]
  *  o.getAllResponseHeaders
  *  o.responseText
  *  o.responseXML
  *  o.argument
  * @param f_call: failure callback
  * @param args arguments
  */
 function ypjax(url,container,s_call,f_call,args){
 	var method='GET';
 	if(args===undefined){
 		args=null;
+	}
 	// Set special header for partial ajax == HTTP_X_PARTIAL_XHR
 	YUC.initHeader('X-PARTIAL-XHR',true);
 	// wrapper of passed callback
 	var s_wrapper = (function(o){
 		return function(o){
 			YUD.get(container).innerHTML=o.responseText;
 			YUD.setStyle(container,'opacity','1.0');
     		//execute the given original callback
     		if (s_call !== undefined){
     			s_call(o);
+    		}
+		}
 	})()
 	YUD.setStyle(container,'opacity','0.3');
 	YUC.asyncRequest(method,url,{
 		success:s_wrapper,
 		failure:function(o){
 			//failure
 			window.location = url;
+		}
 	},args);
+}
 /**
  * tooltip activate
  */
 function tooltip_activate(){
     function toolTipsId(){
         var ids = [];
         var tts = YUQ('.tooltip');
         for (var i = 0; i < tts.length; i++) {
             // if element doesn't not have and id
         	//  autogenerate one for tooltip
             if (!tts[i].id){
                 tts[i].id='tt'+((i*100)+tts.length);
+            }
             ids.push(tts[i].id);
+        }
         return ids
     };
     var myToolTips = new YAHOO.widget.Tooltip("tooltip", {
         context: [[toolTipsId()],"tl","bl",null,[0,5]],
         monitorresize:false,
         xyoffset :[0,0],
         autodismissdelay:300000,
         hidedelay:5,
         showdelay:20,
     });
+}

Changeset was too big and was cut off... Show full diff anyway

0 comments (0 inline, 0 general)