From 6a57b1b6266842bed5a8fa327f68912c826df27b Mon Sep 17 00:00:00 2001 From: Brad Date: Thu, 5 Jun 2014 16:48:45 -0700 Subject: [PATCH] added message to indicate empty feed on user and repo dashboard screens --- README.md | 3 ++ server/template/html/repo_feed.html | 30 +++++++++++----- server/template/repo_feed.amber | 55 ++++++++++++++++++----------- 3 files changed, 59 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 125f774ae..3c06931ff 100644 --- a/README.md +++ b/README.md @@ -19,3 +19,6 @@ Some of the fundamental changes include Normally I wouldn't post experimental code in such disarray, but given the amount of activity around the project I wanted to give the community visibility into these changes. I could also use the help! + +I'm tracking my TODO list here: +https://gist.github.com/bradrydzewski/85b7720c276a70a1bed5 \ No newline at end of file diff --git a/server/template/html/repo_feed.html b/server/template/html/repo_feed.html index 59628d34b..05a44528a 100644 --- a/server/template/html/repo_feed.html +++ b/server/template/html/repo_feed.html @@ -33,12 +33,12 @@ - -
{{$repo := .Repo}} -
{{range $commit := .Commits}}{{$__amber_17 := $repo.Name}}{{$__amber_18 := $repo.Owner}}{{$__amber_19 := $repo.Remote}}{{$__amber_20 := __amber_add "/" $__amber_19}}{{$__amber_21 := __amber_add $__amber_20 "/"}}{{$__amber_22 := __amber_add $__amber_21 $__amber_18}}{{$__amber_23 := __amber_add $__amber_22 "/"}}{{$__amber_24 := __amber_add $__amber_23 $__amber_17}}{{$__amber_25 := __amber_add $__amber_24 "/branch/"}}{{$__amber_26 := __amber_add $__amber_25 .Branch}}{{$__amber_27 := __amber_add $__amber_26 "/commit/"}}{{$__amber_28 := __amber_add $__amber_27 .Sha}} - -
{{$__amber_29 := __amber_add "https://secure.gravatar.com/avatar/" .Gravatar}}{{$__amber_30 := __amber_add $__amber_29 "?s=48&d=identicon"}} - + {{$repo := .Repo}}{{$__amber_17 := .Repo.Active}}{{if $__amber_17}}{{if .Commits}} +
+
{{range $commit := .Commits}}{{$__amber_18 := $repo.Name}}{{$__amber_19 := $repo.Owner}}{{$__amber_20 := $repo.Remote}}{{$__amber_21 := __amber_add "/" $__amber_20}}{{$__amber_22 := __amber_add $__amber_21 "/"}}{{$__amber_23 := __amber_add $__amber_22 $__amber_19}}{{$__amber_24 := __amber_add $__amber_23 "/"}}{{$__amber_25 := __amber_add $__amber_24 $__amber_18}}{{$__amber_26 := __amber_add $__amber_25 "/branch/"}}{{$__amber_27 := __amber_add $__amber_26 .Branch}}{{$__amber_28 := __amber_add $__amber_27 "/commit/"}}{{$__amber_29 := __amber_add $__amber_28 .Sha}} + +
{{$__amber_30 := __amber_add "https://secure.gravatar.com/avatar/" .Gravatar}}{{$__amber_31 := __amber_add $__amber_30 "?s=48&d=identicon"}} +

{{.Message}}

@@ -54,13 +54,25 @@
Recent Branches
    {{range $commit := .Branches}} -
  • {{$__amber_31 := $repo.Name}}{{$__amber_32 := $repo.Owner}}{{$__amber_33 := $repo.Remote}}{{$__amber_34 := __amber_add "/" $__amber_33}}{{$__amber_35 := __amber_add $__amber_34 "/"}}{{$__amber_36 := __amber_add $__amber_35 $__amber_32}}{{$__amber_37 := __amber_add $__amber_36 "/"}}{{$__amber_38 := __amber_add $__amber_37 $__amber_31}}{{$__amber_39 := __amber_add $__amber_38 "/branch/"}}{{$__amber_40 := __amber_add $__amber_39 .Branch}} - {{.Branch}} +
  • {{$__amber_32 := $repo.Name}}{{$__amber_33 := $repo.Owner}}{{$__amber_34 := $repo.Remote}}{{$__amber_35 := __amber_add "/" $__amber_34}}{{$__amber_36 := __amber_add $__amber_35 "/"}}{{$__amber_37 := __amber_add $__amber_36 $__amber_33}}{{$__amber_38 := __amber_add $__amber_37 "/"}}{{$__amber_39 := __amber_add $__amber_38 $__amber_32}}{{$__amber_40 := __amber_add $__amber_39 "/branch/"}}{{$__amber_41 := __amber_add $__amber_40 .Branch}} + {{.Branch}}
    • {{end}}
-
+
{{else}} +
+
Your Build history is empty. Push to your remote repository to trigger a build.
+
{{end}}{{else}} +
+
This Repository is not yet active. Please activate to start testing commits.
+
+
+
+ +
+
+
{{end}} diff --git a/server/template/repo_feed.amber b/server/template/repo_feed.amber index e67c44cf6..6d7b8f8c6 100644 --- a/server/template/repo_feed.amber +++ b/server/template/repo_feed.amber @@ -13,30 +13,45 @@ block content a.pure-button[href="/"+Repo.Remote+"/"+Repo.Owner+"/"+Repo.Name+"/settings"] i.fa.fa-cog - section.pure-u-3-5 - $repo=Repo - div.commit-list - each $commit in Commits - a.pure-g.commit-item[data-status=Status][href="/"+$repo.Remote+"/"+$repo.Owner+"/"+$repo.Name+"/branch/"+Branch+"/commit/"+Sha] - div.pure-u-1-8 - img[src="https://secure.gravatar.com/avatar/"+Gravatar+"?s=48&d=identicon"] + $repo=Repo + if Repo.Active + if Commits + section.pure-u-3-5 + div.commit-list + each $commit in Commits + a.pure-g.commit-item[data-status=Status][href="/"+$repo.Remote+"/"+$repo.Owner+"/"+$repo.Name+"/branch/"+Branch+"/commit/"+Sha] + div.pure-u-1-8 + img[src="https://secure.gravatar.com/avatar/"+Gravatar+"?s=48&d=identicon"] - div.pure-u-3-4 - h2 #{Message} - span.commit-sha #{ShaShort} - span.commit-branch #{Branch} - span.commit-date.timeago[title=FinishedString] + div.pure-u-3-4 + h2 #{Message} + span.commit-sha #{ShaShort} + span.commit-branch #{Branch} + span.commit-date.timeago[title=FinishedString] + div.pure-u-2-5 + section.pure-g.branches + div.pure-u-1.pure-menu.pure-menu-open + a.pure-menu-heading Recent Branches + ul + each $commit in Branches + li + a[data-status=Status][href="/"+$repo.Remote+"/"+$repo.Owner+"/"+$repo.Name+"/branch/"+Branch] #{Branch} - div.pure-u-2-5 - section.pure-g.branches - div.pure-u-1.pure-menu.pure-menu-open - a.pure-menu-heading Recent Branches - ul - each $commit in Branches - li - a[data-status=Status][href="/"+$repo.Remote+"/"+$repo.Owner+"/"+$repo.Name+"/branch/"+Branch] #{Branch} + else + section.pure-u-1 + div.alert.alert-info + | Your Build history is empty. Push to your remote repository to trigger a build. + else + section.pure-u-1 + div.alert.alert-info + | This Repository is not yet active. Please activate to start testing commits. + br + form.pure-form.pure-form-stacked + div.pure-controls + button.pure-button.pure-button-primary Click to Active Repository + block append scripts script $(document).ready(function() {