[Ngetsuite-cvs] ngetsuite/ngetsuite utils.rb,1.13,1.14 web.rb,1.7,1.8

[<ys...@us...>]

Update of /cvsroot/ngetsuite/ngetsuite/ngetsuite
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15352/ngetsuite

Modified Files:
	utils.rb web.rb 
Log Message:
UI somewhat "improved", fixed ugly pretty_size


Index: utils.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/utils.rb,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** utils.rb	20 Feb 2004 16:44:39 -0000	1.13
--- utils.rb	21 Feb 2004 15:58:18 -0000	1.14
***************
*** 89,93 ****
  	end
  
! 	def Utils.spreadbase(value, base, delimiters)
  		return '-1' unless value
  		last = delimiters.pop
--- 89,93 ----
  	end
  
! 	def Utils.spreadbase(value, base, nbunits, delimiters)
  		return '-1' unless value
  		last = delimiters.pop
***************
*** 97,105 ****
  			"#{v}#{d}"
  		} << "#{value}#{last}"
! 		return arr.reverse[0..1].join(' ')
  	end
  	
  	def Utils.cooltime(seconds)
! 		Utils.spreadbase(seconds.to_i, 60, ['s', 'm', 'h'])
  	end
  	def cooltime(seconds)
--- 97,111 ----
  			"#{v}#{d}"
  		} << "#{value}#{last}"
! 		
! 		a = arr.last
! 		while a.to_i == 0
! 			a = arr.pop
! 		end
! 		
! 		return arr.reverse[0..nbunits-1].join(' ')
  	end
  	
  	def Utils.cooltime(seconds)
! 		Utils.spreadbase(seconds.to_i, 60, 2, ['s', 'm', 'h'])
  	end
  	def cooltime(seconds)
***************
*** 108,113 ****
  	
  	def Utils.pretty_size(size)
! 		Utils.spreadbase(size.to_i, 1024, ['b', 'kb', 'Mb', 'Gb'])
  	end
  	def pretty_size(asize)
  		Utils.pretty_size(asize)
--- 114,120 ----
  	
  	def Utils.pretty_size(size)
! 		Utils.spreadbase(size.to_i, 1024, 1, ['b', 'kb', 'Mb'])
  	end
+ 
  	def pretty_size(asize)
  		Utils.pretty_size(asize)

Index: web.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/web.rb,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** web.rb	20 Feb 2004 23:07:45 -0000	1.7
--- web.rb	21 Feb 2004 15:58:18 -0000	1.8
***************
*** 115,118 ****
--- 115,127 ----
  	end	
  
+ 	def Web.date_str(isodate)
+ 		if isodate == "any"
+ 			"All articles"
+ 		else
+ 			y, m, d = isodate.split('-')
+ 			Time.local(y,m,d).strftime("%A, %B %d")
+ 		end
+ 	end	
+ 
  end #class