Skip to content

Commit

Permalink
Updated README, changed method name in filenames.go
Browse files Browse the repository at this point in the history
  • Loading branch information
kabukky committed Jun 6, 2015
1 parent 48983c9 commit d358f44
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 26 deletions.
6 changes: 5 additions & 1 deletion README.md
Expand Up @@ -35,7 +35,11 @@ This slimness makes Journey an ideal candidate for setting up micro blogs or hos
## Installing Journey
To get started with Journey, go to the the [Releases Page](https://github.com/kabukky/journey/releases) and download the zip file corresponding to your operating system and cpu architecture. Then extract Journey anywhere you like. Why not place it in your home folder (e.g. /home/youruser/journey/)?

After that, head over to [Setting up Journey](https://github.com/kabukky/journey/wiki/Setting-up-Journey) to configure your Journey blog on your local machine. If you'd like to set up Journey on a linux server, head over to [Installing Journey on Ubuntu Server](https://github.com/kabukky/journey/wiki/Installing-Journey-on-Ubuntu-Server) for a step-by-step tutorial.
After that, head over to [Setting up Journey](https://github.com/kabukky/journey/wiki/Setting-up-Journey) to configure your Journey blog on your local machine.

If you'd like to set up Journey on a Linux server, head over to [Installing Journey on Ubuntu Server](https://github.com/kabukky/journey/wiki/Installing-Journey-on-Ubuntu-Server) for a step-by-step tutorial.

Journey even runs as a Windows Azure Web App. It's a great way to try out or host a low traffic Journey blog for free on the internet! Head over to [Hosting Journey as a Windows Azure Web App](https://github.com/kabukky/journey/wiki/Hosting-Journey-as-a-Windows-Azure-Web-App) for a step-by-step tutorial.

## Plugins
Did you create a Journey plugin? Write me [@kabukky](https://twitter.com/kabukky) or me@kaihag.com and I'll add a link to it here.
Expand Down
48 changes: 25 additions & 23 deletions built-in/admin/admin-angular.js
@@ -1,27 +1,29 @@
//register the modules (don't forget ui bootstrap and bootstrap switch)
// TODO: Split this Angular app into a proper directory structure

//register the modules
var adminApp = angular.module('adminApp', ['ngRoute', 'frapontillo.bootstrap-switch', 'ui.bootstrap', 'infinite-scroll']);

adminApp.config(function($routeProvider) {
$routeProvider.
when('/', {
templateUrl: 'content.html',
controller: 'ContentCtrl'
}).
when('/edit/:Id', {
templateUrl: 'post.html',
controller: 'EditCtrl'
}).
when('/create/', {
templateUrl: 'post.html',
controller: 'CreateCtrl'
}).
$routeProvider.
when('/', {
templateUrl: 'content.html',
controller: 'ContentCtrl'
}).
when('/edit/:Id', {
templateUrl: 'post.html',
controller: 'EditCtrl'
}).
when('/create/', {
templateUrl: 'post.html',
controller: 'CreateCtrl'
}).
when('/settings/', {
templateUrl: 'settings.html',
controller: 'SettingsCtrl'
}).
otherwise({
redirectTo: '/'
});
otherwise({
redirectTo: '/'
});
});

//service for sharing the markdown content across controllers
Expand Down Expand Up @@ -176,9 +178,9 @@ adminApp.controller('CreateCtrl', function ($scope, $http, $sce, $location, shar
var converter = new Showdown.converter();
//change the navbar according to controller
$scope.navbarHtml = $sce.trustAsHtml('<ul class="nav navbar-nav"><li><a href="#/">Content</a></li><li class="active"><a href="#/create/">New Post<span class="sr-only">(current)</span></a></li><li><a href="#/settings/">Settings</a></li><li><a href="logout/" class="logout">Log Out</a></li></ul>');
$scope.shared = sharingService.shared;
$scope.shared = sharingService.shared;
$scope.shared.post = {Title: 'New Post', Slug: '', Markdown: 'Write something!', IsPublished: false, Image: '', Tags: ''}
$scope.change = function() {
$scope.change = function() {
document.getElementById('html-div').innerHTML = '<h1>' + $scope.shared.post.Title + '</h1><br>' + converter.makeHtml($scope.shared.post.Markdown);
//resize the markdown textarea
$('.textarea-autosize').val($scope.shared.post.Markdown).trigger('autosize.resize');
Expand All @@ -203,12 +205,12 @@ adminApp.controller('EditCtrl', function ($scope, $routeParams, $http, $sce, $lo
//resize the markdown textarea
$('.textarea-autosize').val($scope.shared.post.Markdown).trigger('autosize.resize');
};
$http.get('/admin/api/post/' + $routeParams.Id).success(function(data) {
$scope.shared.post = data;
$http.get('/admin/api/post/' + $routeParams.Id).success(function(data) {
$scope.shared.post = data;
$scope.change();
});
$scope.save = function() {
$http.patch('/admin/api/post', $scope.shared.post).success(function(data) {
$http.patch('/admin/api/post', $scope.shared.post).success(function(data) {
$location.url('/');
});
};
Expand Down Expand Up @@ -245,7 +247,7 @@ adminApp.controller('EmptyModalCtrl', function ($scope, $modal, $http, sharingSe

//modal for image selection and upload
adminApp.controller('ImageModalCtrl', function ($scope, $modal, $http, sharingService, infiniteScrollFactory) {
$scope.shared = sharingService.shared;
$scope.shared = sharingService.shared;
$scope.shared.infiniteScrollFactory = new infiniteScrollFactory('/admin/api/images/');
$scope.shared.infiniteScrollFactory.nextPage();
$scope.open = function (size, callingFrom) {
Expand Down
4 changes: 2 additions & 2 deletions filenames/filenames.go
Expand Up @@ -13,7 +13,7 @@ var (
ExecutablePath = determineExecutablePath()

// Determine the path the the assets folder (default: Journey root folder)
AssetPath = determineContentPath()
AssetPath = determineAssetPath()

// For assets that are created, changed, our user-provided while running journey
ConfigFilename = filepath.Join(AssetPath, "config.json")
Expand Down Expand Up @@ -71,7 +71,7 @@ func createDirectories() error {
return nil
}

func determineContentPath() string {
func determineAssetPath() string {
contentPath := ""
if flags.CustomPath != "" {
contentPath = flags.CustomPath
Expand Down

0 comments on commit d358f44

Please sign in to comment.