Skip to content

Commit

Permalink
Merge pull request #288 from pe4cey/beta-startup
Browse files Browse the repository at this point in the history
Add beta frame when connecting to a non ga version of the neo4j server
  • Loading branch information
oskarhane authored Oct 17, 2016
2 parents 0b9ff87 + 174249f commit 6942ce3
Show file tree
Hide file tree
Showing 6 changed files with 86 additions and 9 deletions.
58 changes: 58 additions & 0 deletions app/content/guides/beta.jade
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
article.guide
.container-fluid
.row
.col-sm-2
.box-max
img.img-responsive(src='images/neo4j-world.png')
p.lead.text-right BETA PROGRAMME
p.lead.text-right Copyright ©
a.no-icon(href='http://neo4j.com/') Neo Technology
|  2002–
span= new Date().getFullYear()

.col-sm-10
.teaser.teaser-2
h3 Features for 3.1
p.lead Have a peek at some of the exciting new things in the Neo4j Browser
.icon-holder
.icon.sl.sl-star.green.icon
ul.topic-bullets
li
| Running a Causal Cluster? Connect to different server members 
a(exec-topic='sysinfo') here
li
| View running 
a(exec-topic='queries') queries
li
| Execute queries even faster with 
a(help-topic='param') param
| support
li
| Explore the new 
a(exec-topic='server user list') user administration
| frames
li
| Take a look your data with the 
a(exec-topic='CALL db.schema()') schema viewer

button.btn.btn-cta-beta(ng-click="editor.execScript(settings.initCmd)") Continue
.clearfix
.teaser.teaser-2
h3 Feedback wanted
p.lead If you notice anything unusual (or amazing!) let us know.
.icon-holder
.icon.sl.sl-bubble-conversation.green.icon
ul.topic-bullets
li
| Send us an 
a(href="mailto:browser@neotechnology.com?subject=Neo4j Browser pre-release feedback") email
li
| Join our community on&nbsp
a(href="http://neo4j.com/slack") Slack
li
| Raise an issue on&nbsp
a(href="http://github.com/neo4j") Github
li
| Or sign in to Neo4j Browser Sync and send us a message via the settings drawer:
button.btn.btn-cta(play-topic="neo4j-sync") Neo4j Browser Sync
.clearfix
1 change: 0 additions & 1 deletion app/scripts/controllers/Auth.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ angular.module('neo4jApp.controllers')
$scope.static_is_authenticated = $scope.connection_summary.is_connected
$scope.static_host = Utils.getServerHostname(Settings)
setPolicyMessage()
Frame.create({input:"#{Settings.initCmd}"})
$scope.focusEditor()
,
(r) ->
Expand Down
8 changes: 6 additions & 2 deletions app/scripts/controllers/Main.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,6 @@ angular.module('neo4jApp.controllers')
AuthService.hasValidAuthorization(retainConnection = yes).then(
->
Frame.closeWhere "#{Settings.cmdchar}server connect"
Frame.create({input:"#{Settings.initCmd}"})
onboardingSequence() if Settings.onboarding
,
(r) ->
if Settings.onboarding then onboardingSequence()
Expand All @@ -233,6 +231,12 @@ angular.module('neo4jApp.controllers')
$scope.neo4j.edition = val.edition
$scope.neo4j.enterpriseEdition = val.edition is 'enterprise'
$scope.$emit 'db:updated:edition', val.edition

val = $scope.neo4j.version
if val.search /-/
Frame.create({input:"#{Settings.cmdchar}play beta"})
else
Frame.create({input:"#{Settings.initCmd}"})
if val.version then $scope.motd.setCallToActionVersion(val.version)
, true
]
Expand Down
16 changes: 14 additions & 2 deletions app/styles/help.styl
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
min-height: (frame-min-height - middlebar-height)
.proc-not-found
padding: 12px 16px
[help-topic], [play-topic], [server-topic]
[help-topic], [play-topic], [server-topic], .btn-cta-beta
background-color: #F8F8F8
border-radius: 3px
border: 1px solid #DADADA
Expand All @@ -34,7 +34,7 @@
margin-bottom: 5px
margin-right: 5px
padding: 0 4px
.btn-cta[help-topic], .btn-cta[play-topic], .btn-cta[server-topic]
.btn-cta[help-topic], .btn-cta[play-topic], .btn-cta[server-topic], .btn-cta-beta
padding: 1em
background-color: #008cc1
color: #fff
Expand All @@ -46,6 +46,18 @@
height: 270px
float: left
position: relative
&.teaser-2
width: 45%
min-width: 285px
height: 320px
overflow: hidden
.icon-holder
max-height: 150px
overflow-y: auto
.icon
width: 12%
.topic-bullets
max-width: 80%
&.teaser-3
width: 30%
min-width: 190px
Expand Down
4 changes: 2 additions & 2 deletions app/styles/main.styl
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ svg
width: 100%
overflow: hidden

[play-topic], [help-topic], [server-topic], [exec-topic], a[target], .warn, a[play-icon]
[play-topic], [help-topic], [server-topic], [exec-topic], a[target], .warn, a[play-icon], .btn-cta-beta
vertical-align: baseline
&:before
font-family: "streamline"
Expand All @@ -56,7 +56,7 @@ svg
padding-right: 0
content: '' !important

[play-topic], [server-topic], [exec-topic], a[play-icon]
[play-topic], [server-topic], [exec-topic], a[play-icon], .btn-cta-beta
&:before
content: "w"

Expand Down
8 changes: 6 additions & 2 deletions app/views/partials/drawer-credits.jade
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,12 @@
a.no-icon(href='http://groups.google.com/group/neo4j') Google Groups
li Visit a local
a.no-icon(href='http://neo4j.meetup.com/') Meetup Group
li Contribute code on
a.no-icon(href='http://github.com/neo4j') Github
li Contribute code to
a.no-icon(href='http://github.com/neo4j') Neo4j
| or
a.no-icon(href='http://github.com/neo4j/neo4j-browser') Neo4j Browser
li Send us your Browser feedback via 
a(href="mailto:browser@neotechnology.com?subject=Neo4j Browser feedback") email

h5 Thanks
p Neo4j wouldn't be possible without a fantastic community. Thanks for all the feedback, discussions and contributions.
Expand Down

0 comments on commit 6942ce3

Please sign in to comment.