suzanne.soy/travis-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix branch selector on repo tools

Browse Source
This commit is contained in:
Sven Fuchs 2012-09-14 18:07:33 +02:00
parent c7fb4606d2
commit 2ecf7c8a00
11 changed files with 84 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Gemfile.lock
View File

@ -60,13 +60,13 @@ GIT
GIT
remote: git://github.com/travis-ci/travis-support.git
revision: df5bac85abf3df4e1011011bfb054fe0dede142c
revision: b150763d253331de9adadcb5b39f7df5efccb676
specs:
travis-support (0.0.1)
GIT
remote: git://github.com/wycats/rake-pipeline-web-filters.git
revision: 51915f60889fbf54fc2e81b86b594bf4c7be4ea5
revision: e14e78ae70d0d25b1668c5273e80cd05a4ee52e6
specs:
rake-pipeline-web-filters (0.6.0)
rack
@ -119,12 +119,11 @@ GEM
activerecord
rake
erubis (2.7.0)
eventmachine (0.12.10)
eventmachine (1.0.0)
execjs (1.4.0)
multi_json (~> 1.0)
faraday (0.8.4)
multipart-post (~> 1.1)
ffi (1.1.5)
fssm (0.2.9)
gh (0.8.0)
addressable
@ -143,10 +142,7 @@ GEM
journey (1.0.4)
json (1.6.7)
kgio (2.7.4)
listen (0.4.7)
rb-fchange (~> 0.0.5)
rb-fsevent (~> 0.9.1)
rb-inotify (~> 0.8.8)
listen (0.5.0)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
@ -191,11 +187,6 @@ GEM
thor (>= 0.14.6, < 2.0)
raindrops (0.10.0)
rake (0.9.2.2)
rb-fchange (0.0.5)
ffi
rb-fsevent (0.9.1)
rb-inotify (0.8.8)
ffi (>= 0.5.0)
rdoc (3.12)
json (~> 1.4)
redcarpet (2.1.1)
@ -206,7 +197,7 @@ GEM
simple_states (0.1.1)
activesupport
hashr (~> 0.0.10)
sinatra (1.3.2)
sinatra (1.3.3)
rack (~> 1.3, >= 1.3.6)
rack-protection (~> 1.2)
tilt (~> 1.3, >= 1.3.3)

1
assets/javascripts/app/templates/repos/show.hbs
View File

@ -24,6 +24,7 @@
</ul>
{{view Travis.RepoShowTabsView}}
{{view Travis.RepoShowToolsView}}
{{/with}}
{{else}}

26
assets/javascripts/app/templates/repos/show/tabs.hbs
View File

@ -42,29 +42,3 @@
</h5>
</li>
</ul>
<div id="tools">
<a href="#" {{action toggleTools}}></a>
<div class="pane">
<p>
<label>{{t repositories.branch}}:</label>
{{view Ember.Select contentBinding="view.branches" selectionBinding="view.branch" optionLabelPath="content.commit.branch" optionValuePath="content.commit.branch"}}
</p>
<p>
<label>{{t repositories.image_url}}:</label>
<input type="text" class="url" {{bindAttr value="view.urlStatusImage"}}></input>
</p>
<p>
<label>{{t repositories.markdown}}:</label>
<input type="text" class="markdown" {{bindAttr value="view.markdownStatusImage"}}></input>
</p>
<p>
<label>{{t repositories.textile}}:</label>
<input type="text" class="textile" {{bindAttr value="view.textileStatusImage"}}></input>
</p>
<p>
<label>{{t repositories.rdoc}}:</label>
<input type="text" class="rdoc" {{bindAttr value="view.rdocStatusImage"}}></input>
</p>
</div>
</div>

29
assets/javascripts/app/templates/repos/show/tools.hbs Normal file
View File

@ -0,0 +1,29 @@
<div id="tools">
<a href="#" {{action toggle}}></a>
<div class="pane">
<p>
<label>{{t repositories.branch}}:</label>
{{#if view.branches.isLoaded}}
{{view Ember.Select contentBinding="view.branches" selectionBinding="view.branch" optionLabelPath="content.commit.branch" optionValuePath="content.commit.branch"}}
{{else}}
<span class="loading"></span>
{{/if}}
</p>
<p>
<label>{{t repositories.image_url}}:</label>
<input type="text" class="url" {{bindAttr value="view.urlStatusImage"}}></input>
</p>
<p>
<label>{{t repositories.markdown}}:</label>
<input type="text" class="markdown" {{bindAttr value="view.markdownStatusImage"}}></input>
</p>
<p>
<label>{{t repositories.textile}}:</label>
<input type="text" class="textile" {{bindAttr value="view.textileStatusImage"}}></input>
</p>
<p>
<label>{{t repositories.rdoc}}:</label>
<input type="text" class="rdoc" {{bindAttr value="view.rdocStatusImage"}}></input>
</p>
</div>
</div>

1
assets/javascripts/app/views/repo/list.coffee
View File

@ -4,7 +4,6 @@
RepositoriesListView: Em.CollectionView.extend
elementId: 'repositories'
repositoryBinding: 'content'
tagName: 'ul'
emptyView: Ember.View.extend

23
assets/javascripts/app/views/repo/show.coffee
View File

@ -28,9 +28,6 @@
jobBinding: 'controller.job'
tabBinding: 'controller.tab'
toggleTools: ->
$('#tools .pane').toggle()
# hrm. how to parametrize bindAttr?
classCurrent: (->
'active' if @get('tab') == 'current'
@ -84,6 +81,26 @@
Travis.Urls.job(@get('repository.slug'), @get('job.id'))
).property('repository.slug', 'job.id')
RepoShowToolsView: Travis.View.extend
templateName: 'repos/show/tools'
repositoryBinding: 'controller.repository'
buildBinding: 'controller.build'
jobBinding: 'controller.job'
tabBinding: 'controller.tab'
toggle: ->
@set('active', !@get('active'))
$('#tools .pane').toggle()
branches: (->
@get('repository.branches') if @get('active')
).property('active', 'repository.branches')
urlRepository: (->
'https://' + location.host + Travis.Urls.repository(@get('repository.slug'))
).property('repository.slug')
urlStatusImage: (->
Travis.Urls.statusImage(@get('repository.slug'), @get('branch.commit.branch'))
).property('repository.slug', 'branch')

6
assets/stylesheets/application.sass
View File

@ -80,6 +80,12 @@ pre::-webkit-scrollbar-thumb:horizontal
.loading
display: none
span.loading
padding: 0 25px 0 0
font-size: 13px
color: #aaa
background: inline-image('spinner.gif') no-repeat right 4px
.emoji
vertical-align: middle
width: 20px

1
assets/stylesheets/left/list.sass
View File

@ -55,6 +55,7 @@
.loading
padding: 15px 25px 15px 30px
background-color: #fff
background-image: none
#owners
li

2
assets/stylesheets/main/tools.sass
View File

@ -33,7 +33,7 @@
display: inline-block
input
border: 1px solid #DDD
width: 510px
width: 505px
padding: 4px
@include border-radius(3px)

2
public/javascripts/application.js
View File

File diff suppressed because one or more lines are too long

31
public/stylesheets/application.css
View File

@ -112,13 +112,21 @@ pre::-webkit-scrollbar-thumb:horizontal {
}
/* line 83, /Users/sven/Development/projects/travis/travis-ember/assets/stylesheets/application.sass */
span.loading {
padding: 0 25px 0 0;
font-size: 13px;
color: #aaaaaa;
background: url('data:image/gif;base64,R0lGODlhEAAIAPMHAP///+vr66CgoN7e3rW1tYuLi/X19Wtra3t7e87OzsbGxqGhodfX142NjZaWlqurqyH/C05FVFNDQVBFMi4wAwEAAAAh/hoiQ3JlYXRlZCB3aXRoIENoaW1wbHkuY29tIgAh+QQACgD/ACwAAAAAEAAIAAADKXiq0P7glHmglRSMPUDgBlZUQ/B5ZhBOo2Z2qSqSL2qumaEbwK7PFkgCACH5BAAKAP8ALAAAAAAQAAgAAAQwsKCJwLkH6F2Er0dRZJvWfZaYBUNrnAKoAkEdvF6cjrSNoyGe7QaT8QxIpISyI5UiACH5BAAKAP8ALAAAAAAQAAgAAAQvcIkpALoInL0F+Y41ZUdhHh4oCqRZoB8RIqPmwirN2mcqr61ebFYrnSQUC4b3igAAIfkEAAoA/wAsAAAAABAACAAABDAQyCmqACijQpYnQEMQDWZxSgqKpFmhajiWyEmkyjq7ApzLrdqr8wHSThOKBaMpRAAAIfkEAAoA/wAsAAAAABAACAAABDMQyEmBuGKxxBl4y/IADmEKzKAmwMItpEmg6sC6CVye6dq+MV7tBtzNNp1PaGQUVJ6YTAQAIfkEAAoA/wAsAAAAABAACAAABC8QyEmrBSknQJYnxiAGgCIqnKKCQUuaA0qoCuuWZ7oa7pvPO4PQgNFwPAvCZQmIAAAh+QQACgD/ACwAAAAAEAAIAAAEKRDISau1LGlmhg+A5wGJyAUoOKADaRqpyrremYZzWRs8D/QGQGZzKQIiACH5BAAKAP8ALAAAAAAQAAgAAAMhCLrc/iyMGcCcQNLAueVD1o3eAIpk90koZ7wvABvyDEEJADs=') no-repeat right 4px;
}
/* line 89, /Users/sven/Development/projects/travis/travis-ember/assets/stylesheets/application.sass */
.emoji {
vertical-align: middle;
width: 20px;
height: 20px;
}
/* line 88, /Users/sven/Development/projects/travis/travis-ember/assets/stylesheets/application.sass */
/* line 94, /Users/sven/Development/projects/travis/travis-ember/assets/stylesheets/application.sass */
.help {
display: inline-block;
height: 19px;
@ -129,7 +137,7 @@ pre::-webkit-scrollbar-thumb:horizontal {
cursor: pointer;
}
/* line 97, /Users/sven/Development/projects/travis/travis-ember/assets/stylesheets/application.sass */
/* line 103, /Users/sven/Development/projects/travis/travis-ember/assets/stylesheets/application.sass */
.context_help_caption {
text-align: left;
font-size: 16px;
@ -138,27 +146,27 @@ pre::-webkit-scrollbar-thumb:horizontal {
border-bottom: 1px solid #cccccc;
}
/* line 104, /Users/sven/Development/projects/travis/travis-ember/assets/stylesheets/application.sass */
/* line 110, /Users/sven/Development/projects/travis/travis-ember/assets/stylesheets/application.sass */
.context_help {
display: none;
}
/* line 107, /Users/sven/Development/projects/travis/travis-ember/assets/stylesheets/application.sass */
/* line 113, /Users/sven/Development/projects/travis/travis-ember/assets/stylesheets/application.sass */
.context_help_body {
font-size: 1em;
line-height: 1.4286;
margin: 1.4286em 0;
}
/* line 113, /Users/sven/Development/projects/travis/travis-ember/assets/stylesheets/application.sass */
/* line 119, /Users/sven/Development/projects/travis/travis-ember/assets/stylesheets/application.sass */
#facebox .content {
display: block !important;
}
/* line 115, /Users/sven/Development/projects/travis/travis-ember/assets/stylesheets/application.sass */
/* line 121, /Users/sven/Development/projects/travis/travis-ember/assets/stylesheets/application.sass */
#facebox .close {
display: none;
}
/* line 117, /Users/sven/Development/projects/travis/travis-ember/assets/stylesheets/application.sass */
/* line 123, /Users/sven/Development/projects/travis/travis-ember/assets/stylesheets/application.sass */
#facebox pre::-webkit-scrollbar {
height: 0;
width: 0;
@ -287,19 +295,20 @@ body#profile {
#repositories .loading {
padding: 15px 25px 15px 30px;
background-color: white;
background-image: none;
}
/* line 60, /Users/sven/Development/projects/travis/travis-ember/assets/stylesheets/left/list.sass */
/* line 61, /Users/sven/Development/projects/travis/travis-ember/assets/stylesheets/left/list.sass */
#owners li {
margin-left: -4px;
padding-left: 52px;
}
/* line 63, /Users/sven/Development/projects/travis/travis-ember/assets/stylesheets/left/list.sass */
/* line 64, /Users/sven/Development/projects/travis/travis-ember/assets/stylesheets/left/list.sass */
#owners li.user {
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA0AAAAMCAMAAACOacfrAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNSBNYWNpbnRvc2giIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6RjNGNDlENDhGMkU2MTFFMUE0MzM5QThDQUQ3MDI4RTEiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6RjNGNDlENDlGMkU2MTFFMUE0MzM5QThDQUQ3MDI4RTEiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpGM0Y0OUQ0NkYyRTYxMUUxQTQzMzlBOENBRDcwMjhFMSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpGM0Y0OUQ0N0YyRTYxMUUxQTQzMzlBOENBRDcwMjhFMSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PgMNNIUAAABLUExURX9/f4eHh4WFhZCQkPLy8oiIiNra2vDw8LGxsf7+/sLCwvb29oCAgI+Pj5mZmdXV1ba2toODg52dnfPz87i4uN3d3aGhod/f3////yHAc80AAAAZdFJOU////////////////////////////////wABNAq3AAAAV0lEQVR42lTM2Q6AIAxE0YGCsuMu//+llqREvckkPS9F42pec+0HeJEAUBQZzdJGNP+lWHYXtYV1jC8tsILIT4VVJt91Xwm9tJ0NDm8O9iML0mqk6RFgAMVgBry2iJEPAAAAAElFTkSuQmCC');
background-position: 29px 17px;
}
/* line 66, /Users/sven/Development/projects/travis/travis-ember/assets/stylesheets/left/list.sass */
/* line 67, /Users/sven/Development/projects/travis/travis-ember/assets/stylesheets/left/list.sass */
#owners li.org {
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAOCAMAAAAc7xz/AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNSBNYWNpbnRvc2giIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6N0FEOEI1NUVGMkFDMTFFMTk0NjlDMDYzRjA5MDk2N0MiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6N0FEOEI1NUZGMkFDMTFFMTk0NjlDMDYzRjA5MDk2N0MiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo3QUQ4QjU1Q0YyQUMxMUUxOTQ2OUMwNjNGMDkwOTY3QyIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo3QUQ4QjU1REYyQUMxMUUxOTQ2OUMwNjNGMDkwOTY3QyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PsEVpaAAAACiUExURX9/f4WFhZaWluLi4vDw8IqKisfHx8/Pz/7+/pOTk8jIyOXl5aysrL6+voaGhsPDw7W1tfHx8fb29uTk5L29vdjY2KWlpfn5+f39/cXFxbi4uKioqJCQkKOjo4+Pj93d3ZycnNDQ0N7e3oCAgJ+fn5GRkZqamtnZ2dvb29fX18vLy+7u7piYmKKiop2dnZubm9HR0eDg4KGhoe3t7aSkpP///9cCsuEAAAA2dFJOU///////////////////////////////////////////////////////////////////////AKGPTjEAAACtSURBVHjaVM7nFoIwDAXgi0W2gsoW3HuvvP+rmUjx6P3RnHxtTwLSGaSGkQ7aDnKYpkMBOAE5ptlyDJTkCrtUArHmCuhSR7hDXaDSPGF21s1r5onmGXCilfBDPl00L4At7YSntAfuDWce0BsehZ/DHmBlzLktw85+KBz69ZIH2znG3G3mnztZ5XC7chFElLzwTZ1EUrzCUn38pK+swpNNFP6i9IIj4y8jprcAAwCY3RhR7P84QQAAAABJRU5ErkJggg==');
}
@ -702,7 +711,7 @@ pre#log .bg-white {
/* line 34, /Users/sven/Development/projects/travis/travis-ember/assets/stylesheets/main/tools.sass */
#tools .pane p input {
border: 1px solid #dddddd;
width: 510px;
width: 505px;
padding: 4px;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;