kallithea Changeset - 0f7f93df5802

Changeset - 0f7f93df5802

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Marcin Kuzminski - 15 years ago 2010-05-19 00:18:48
marcin@python-works.com

implemented rawdiff and diff download into diff view.
Few css changes

4 files changed with 108 insertions and 56 deletions:

pylons_app/controllers/files.py

pylons_app/public/css/diff.css

pylons_app/public/css/monoblue_custom.css

pylons_app/templates/files/file_diff.html

0 comments (0 inline, 0 general)

pylons_app/controllers/files.py

➞

Show inline comments

@@ @@ -56,49 +56,62 @@ class FilesController(BaseController): @@
             c.files_list = c.changeset.get_node(f_path)
             c.file_history = self._get_history(repo, c.files_list, f_path)
         except (RepositoryError, ChangesetError):
             c.files_list = None
         return render('files/files.html')
     def rawfile(self, repo_name, revision, f_path):
         hg_model = HgModel()
         c.repo = hg_model.get_repo(c.repo_name)
         file_node = c.repo.get_changeset(revision).get_node(f_path)
         response.headers['Content-type'] = file_node.mimetype
         response.headers['Content-disposition'] = 'attachment; filename=%s' \
         response.content_type = file_node.mimetype
         response.content_disposition = 'attachment; filename=%s' \
                                                     % f_path.split('/')[-1]
         return file_node.content
     def archivefile(self, repo_name, revision, fileformat):
         return '%s %s %s' % (repo_name, revision, fileformat)
     def diff(self, repo_name, f_path):
         hg_model = HgModel()
         diff1 = request.GET.get('diff1')
         diff2 = request.GET.get('diff2')
         c.action = action = request.GET.get('diff')
         c.no_changes = diff1 == diff2
         c.f_path = f_path
         c.repo = hg_model.get_repo(c.repo_name)
         c.changeset_1 = c.repo.get_changeset(diff1)
         c.changeset_2 = c.repo.get_changeset(diff2)
         c.diff1 = 'r%s:%s' % (c.changeset_1.revision, c.changeset_1._short)
         c.diff2 = 'r%s:%s' % (c.changeset_2.revision, c.changeset_2._short)
         f_udiff = differ.get_udiff(c.changeset_1.get_node(f_path),
                             c.changeset_2.get_node(f_path))
         c.differ = differ.DiffProcessor(f_udiff)
         diff = differ.DiffProcessor(f_udiff)
         if action == 'download':
             diff_name = '%s_vs_%s.diff' % (diff1, diff2)
             response.content_type = 'text/plain'
             response.content_disposition = 'attachment; filename=%s' \
                                                     % diff_name
             return diff.raw_diff()
         elif action == 'raw':
             c.cur_diff = '<pre class="raw">%s</pre>' % diff.raw_diff()
         elif action == 'diff':
             c.cur_diff = diff.as_html()
         return render('files/file_diff.html')
     def _get_history(self, repo, node, f_path):
         from vcs.nodes import NodeKind
         if not node.kind is NodeKind.FILE:
             return []
         changesets = node.history
         hist_l = []
         for chs in changesets:
             n_desc = 'r%s:%s' % (chs.revision, chs._short)
             hist_l.append((chs._short, n_desc,))
         return hist_l

pylons_app/public/css/diff.css

➞

Show inline comments

@@ @@ -5,31 +5,35 @@ div.diffblock { @@
     background: #f8f8f8;
     font-size: 100%;
     line-height: 100%;
     /* new */
     line-height: 125%;
+}
 div.diffblock .code-header{
 	border-bottom: 1px solid #CCCCCC;
 	background: #EEEEEE;
 	color:blue;
 	padding:10px 0 10px 0;
+}
-div.diffblock .code-header span{
+div.diffblock .code-header div{
 	margin-left:25px;
 	font-weight: bold;
+}
 div.diffblock .code-body{
 	background: #EEEEEE;
+}
 div.diffblock pre.raw{
 	background: #FFFFFF;
 	color:#000000;
+}
 .code-difftable{
 	border-collapse: collapse;
 	width: 99%;
+}
 .code-difftable td:target *{
 	background:  repeat scroll 0 0 #FFFFBE !important;
 	text-decoration: underline;
+}
 .code-difftable .context{
 	background:none repeat scroll 0 0 #DDE7EF;
+}

pylons_app/public/css/monoblue_custom.css

➞

Show inline comments

@@ @@ -3,25 +3,27 @@ @@
 	margin: 15px 50px;
 	background: #DBD4C6;
 	font-family: sans-serif;
+}
 a {
 	color: #0000cc;
 	text-decoration: none;
+}
 a:HOVER{
 	text-decoration: underline;
+}
 /*** end of Initial Settings ***/ /** common settings **/
 /*** end of Initial Settings ***/
 /** common settings **/
 div#main {
 	padding: 5px;
+}
 div#container {
 	background: #FFFFFF;
 	position: relative;
 	color: #666;
+}
 div.page-header {
 	padding: 50px 20px 0;
@@ @@ -372,94 +374,115 @@ ul.changelog-entry li.description { @@
 /** end of changelog **/
 /** file **/
 p.files {
 	margin: 0 0 0 20px;
 	font-size: 2.0em;
 	font-weight: bold;
+}
 /** end of file **/
 /** changeset **/
 h3.changeset {
 	margin: 20px 0 5px 20px;
 	padding: 0 0 2px;
 	font-size: 1.6em;
 	border-bottom: dotted 1px #D5E1E6;
+}
 p.changeset-age {
 	position: relative;
 .cs_files{
 	border: 2px solid #CCCCCC;
 	width: 60%;
+}
 p.changeset-age span {
 	position: absolute;
 	top: -25px;
 	right: 10px;
 	font-size: 1.4em;
 	color: #CCC;
 	font-weight: bold;
 	font-style: italic;
 .cs_files .cs_added{
 	background:#BBFFBB;
+}
 p.description {
 	margin: 10px 30px 0 30px;
 	padding: 10px;
 	border: solid 1px #CCC;
 	font-size: 1.2em;
 .cs_files .cs_changed{
 	background: #FFDD88;
+}
 .cs_files .cs_removed{
 	background: #FF8888;
+}
 /** end of changeset **/
 /** canvas **/
 div#wrapper {
 	position: relative;
 	font-size: 1.2em;
+}
 canvas {
 	position: absolute;
 	z-index: 5;
 	top: -0.7em;
+}
 #graph{
 	overflow: hidden;
 ul#nodebgs li.parity0 {
 	background: #F1F6F7;
+}
 #graph_nodes{
 	width:160px;
 	float:left;
+}
 ul#nodebgs li.parity1 {
 	background: #FFFFFF;
 #graph_content{
 	width:800px;
 	float:left;
+}
 #graph_content .container_header{
 	border:1px solid #CCCCCC;
 	height:30px;
 	background: #EEEEEE;
+}
 #graph_content .container .wrapper{
 	width: 600px;
+}
 #graph_content .container{
 	border-bottom: 1px solid #CCCCCC;
 	border-left: 1px solid #CCCCCC;
 	border-right: 1px solid #CCCCCC;
 	height:120px;
+}
 ul#graphnodes {
 	position: absolute;
 	z-index: 10;
 	top: 7px;
 	list-style: none inside none;
 #graph_content .container .left{
 	float:left;
 	width: 70%;
 	padding-left: 5px;
+}
 ul#nodebgs {
 	list-style: none inside none;
 #graph_content .container .right{
 	float:right;
 	width: 25%;
+}
 #graph_content .container .left .date{
 	font-weight:bold;
+}
 #graph_content .container .left .author{
+}
 #graph_content .container .left .message{
 	font-size: 80%;
+}
 ul#graphnodes li,ul#nodebgs li {
 	height: 39px;
 .right .added,.changed,.removed{
 	border:1px solid #DDDDDD;
 	display:block;
 	float:right;
 	font-size:0.75em;
 	text-align:center;
 	min-width:15px;
+}
 ul#graphnodes li .info {
 	display: block;
 	position: relative;
 .right .added{
 	background:#BBFFBB;
+}
 .right .changed{
 	background: #FFDD88;
+}
 .right .removed{
 	background: #FF8888;
+}
 /** end of canvas **/
 /* FILE BROWSER */
 div.browserblock {
     overflow: hidden;
     padding: 0px;
     border: 1px solid #ccc;
     background: #f8f8f8;
     font-size: 100%;
     line-height: 100%;
     /* new */
     line-height: 125%;
@@ @@ -470,36 +493,39 @@ div.browserblock .browser-header{ @@
 	color:blue;
 	padding:10px 0 10px 0;
+}
 div.browserblock .browser-header span{
 	margin-left:25px;
 	font-weight: bold;
+}
 div.browserblock .browser-body{
 	background: #EEEEEE;
+}
 table.code-browser {
 	border-collapse:collapse;
 	border-collapse:collapse;
 	width: 100%;
+}
 table.code-browser tr{
 	margin:3px;
+}
 table.code-browser thead th {
 	background-color: #EEEEEE;
 	height: 20px;
 	font-size: 1.1em;
 	font-weight: bold;
 	text-align: center;
 	text-align: left;
 	padding-left: 10px;
+}
 table.code-browser tbody tr {
+}
 table.code-browser tbody td {
 	padding-left:10px;
 	height: 20px;
+}
 .info-table {

pylons_app/templates/files/file_diff.html

➞

Show inline comments

@@ @@ -19,23 +19,32 @@ @@
         </form>
 		${self.menu('files')}
 </%def>
 <%def name="css()">
 <link rel="stylesheet" href="/css/monoblue_custom.css" type="text/css" />
 <link rel="stylesheet" href="/css/diff.css" type="text/css" />
 </%def>
 <%def name="main()">
     <h2 class="no-link no-border">${'%s:  %s %s %s' % (_('File diff'),c.diff2,'&rarr;',c.diff1)|n}</h2>
 <div id="body" class="diffblock">
 	<div class="code-header">
 		<span>${h.link_to(c.f_path,h.url('files_home',repo_name=c.repo_name,revision=c.diff2.split(':')[1],f_path=c.f_path))}</span>
 		<div>
 		<span>${h.link_to(c.f_path,h.url('files_home',repo_name=c.repo_name,
 		revision=c.diff2.split(':')[1],f_path=c.f_path))}</span>
 		 &raquo; <span style="font-size:77%">${h.link_to(_('diff'),
 		h.url.current(diff2=c.diff2.split(':')[-1],diff1=c.diff1.split(':')[-1],diff='diff'))}</span>
 		 &raquo; <span style="font-size:77%">${h.link_to(_('raw diff'),
 		h.url.current(diff2=c.diff2.split(':')[-1],diff1=c.diff1.split(':')[-1],diff='raw'))}</span>
 		 &raquo; <span style="font-size:77%">${h.link_to(_('download diff'),
 		h.url.current(diff2=c.diff2.split(':')[-1],diff1=c.diff1.split(':')[-1],diff='download'))}</span>
 		</div>
 	</div>
 	<div class="code-body">
  			%if c.no_changes:
             	${_('No changes')}
             %else:
-				${c.differ.as_HTML()|n}
+				${c.cur_diff|n}
             %endif
 	</div>
 </div>
 </%def>
@@ \ No newline at end of file @@

0 comments (0 inline, 0 general)