No OneTemporary
Actions

Size

38 KB

Subscribers

None

View Options

	diff --git a/account_import.go b/account_import.go
	index 8d8a6e7..87882c6 100644
	--- a/account_import.go
	+++ b/account_import.go
	@@ -1,161 +1,161 @@
	package writefreely

	import (
	"fmt"
	"html/template"
	"io"
	"io/ioutil"
	"net/http"
	"os"
	"path/filepath"
	"strings"

	"github.com/hashicorp/go-multierror"
	"github.com/writeas/impart"
	wfimport "github.com/writeas/import"
	"github.com/writeas/web-core/log"
	)

	func viewImport(app App, u User, w http.ResponseWriter, r *http.Request) error {
	// Fetch extra user data
	- p := NewUserPage(app, r, u, "Import", nil)
	+ p := NewUserPage(app, r, u, "Import Posts", nil)

	c, err := app.db.GetCollections(u, app.Config().App.Host)
	if err != nil {
	return impart.HTTPError{http.StatusInternalServerError, fmt.Sprintf("unable to fetch collections: %v", err)}
	}

	d := struct {
	*UserPage
	Collections *[]Collection
	Flashes []template.HTML
	Message string
	InfoMsg bool
	}{
	UserPage: p,
	Collections: c,
	Flashes: []template.HTML{},
	}

	flashes, _ := getSessionFlashes(app, w, r, nil)
	for _, flash := range flashes {
	if strings.HasPrefix(flash, "SUCCESS: ") {
	d.Message = strings.TrimPrefix(flash, "SUCCESS: ")
	} else if strings.HasPrefix(flash, "INFO: ") {
	d.Message = strings.TrimPrefix(flash, "INFO: ")
	d.InfoMsg = true
	} else {
	d.Flashes = append(d.Flashes, template.HTML(flash))
	}
	}

	showUserPage(w, "import", d)
	return nil
	}

	func handleImport(app App, u User, w http.ResponseWriter, r *http.Request) error {
	// limit 10MB per submission
	r.ParseMultipartForm(10 << 20)
	files := r.MultipartForm.File["files"]
	var fileErrs []error
	filesSubmitted := len(files)
	var filesImported int
	for _, formFile := range files {
	file, err := formFile.Open()
	if err != nil {
	fileErrs = append(fileErrs, fmt.Errorf("failed to open form file: %s", formFile.Filename))
	log.Error("import textfile: open from form: %v", err)
	continue
	}
	defer file.Close()

	tempFile, err := ioutil.TempFile("", "post-upload-*.txt")
	if err != nil {
	fileErrs = append(fileErrs, fmt.Errorf("failed to create temporary file for: %s", formFile.Filename))
	log.Error("import textfile: create temp file: %v", err)
	continue
	}
	defer tempFile.Close()

	_, err = io.Copy(tempFile, file)
	if err != nil {
	fileErrs = append(fileErrs, fmt.Errorf("failed to copy file into temporary location: %s", formFile.Filename))
	log.Error("import textfile: copy to temp: %v", err)
	continue
	}

	info, err := tempFile.Stat()
	if err != nil {
	fileErrs = append(fileErrs, fmt.Errorf("failed to get file info of: %s", formFile.Filename))
	log.Error("import textfile: stat temp file: %v", err)
	continue
	}
	post, err := wfimport.FromFile(filepath.Join(os.TempDir(), info.Name()))
	if err == wfimport.ErrEmptyFile {
	// not a real error so don't log
	_ = addSessionFlash(app, w, r, fmt.Sprintf("%s was empty, import skipped", formFile.Filename), nil)
	continue
	} else if err == wfimport.ErrInvalidContentType {
	// same as above
	_ = addSessionFlash(app, w, r, fmt.Sprintf("%s is not a supported post file", formFile.Filename), nil)
	continue
	} else if err != nil {
	fileErrs = append(fileErrs, fmt.Errorf("failed to read copy of %s", formFile.Filename))
	log.Error("import textfile: file to post: %v", err)
	continue
	}

	post.Collection = r.PostFormValue("collection")
	coll, _ := app.db.GetCollection(post.Collection)
	if coll == nil {
	coll = &Collection{
	ID: 0,
	}
	}
	coll.hostName = app.cfg.App.Host
	created := post.Created.Format("2006-01-02T15:04:05Z")
	submittedPost := SubmittedPost{
	Title: &post.Title,
	Content: &post.Content,
	Font: "norm",
	Created: &created,
	}
	rp, err := app.db.CreatePost(u.ID, coll.ID, &submittedPost)
	if err != nil {
	fileErrs = append(fileErrs, fmt.Errorf("failed to create post from %s", formFile.Filename))
	log.Error("import textfile: create db post: %v", err)
	continue
	}

	// create public post

	if coll.ID != 0 && app.cfg.App.Federation {
	go federatePost(
	app,
	&PublicPost{
	Post: rp,
	Collection: &CollectionObj{
	Collection: *coll,
	},
	},
	coll.ID,
	false,
	)
	}
	filesImported++
	}
	if len(fileErrs) != 0 {
	_ = addSessionFlash(app, w, r, multierror.ListFormatFunc(fileErrs), nil)
	}

	if filesImported == filesSubmitted {
	verb := "posts"
	if filesSubmitted == 1 {
	verb = "post"
	}
	_ = addSessionFlash(app, w, r, fmt.Sprintf("SUCCESS: Import complete, %d %s imported.", filesImported, verb), nil)
	} else if filesImported > 0 {
	_ = addSessionFlash(app, w, r, fmt.Sprintf("INFO: %d of %d posts imported, see details below.", filesImported, filesSubmitted), nil)
	}
	return impart.HTTPError{http.StatusFound, "/me/import"}
	}
	diff --git a/less/core.less b/less/core.less
	index 8844c84..c963e1a 100644
	--- a/less/core.less
	+++ b/less/core.less
	@@ -1,1520 +1,1538 @@
	@primary: rgb(114, 120, 191);
	@secondary: rgb(114, 191, 133);
	@subheaders: #444;
	@headerTextColor: black;
	@sansFont: 'Open Sans', 'Segoe UI', Tahoma, Arial, sans-serif;
	@serifFont: Lora, 'Palatino Linotype', 'Book Antiqua', 'New York', 'DejaVu serif', serif;
	@monoFont: Hack, consolas, Menlo-Regular, Menlo, Monaco, 'ubuntu mono', monospace, monospace;
	@dangerCol: #e21d27;
	@errUrgentCol: #ecc63c;
	@proSelectedCol: #71D571;
	@textLinkColor: rgb(0, 0, 238);

	body {
	font-family: @serifFont;
	font-size-adjust: 0.5;
	-webkit-font-smoothing: antialiased;
	-moz-osx-font-smoothing: grayscale;
	background-color: white;
	color: #111;

	h1, header h2 {
	a {
	color: @headerTextColor;
	.transition-duration(0.2s);
	&:hover {
	color: #303030;
	text-decoration: none;
	}
	}
	}
	h1, h2, h3 {
	line-height: 1.2;
	}

	&#post article, &#collection article p, &#subpage article p {
	display: block;
	unicode-bidi: embed;
	white-space: pre;
	}

	&#post {
	#wrapper, pre {
	max-width: 40em;
	margin: 0 auto;
	a:hover {
	text-decoration: underline;
	}
	}

	blockquote {
	p + p {
	margin: -2em 0 0.5em;
	}
	}
	article {
	margin-bottom: 2em !important;

	h1, h2, h3, h4, h5, h6, p, ul, ol, code {
	display: inline;
	margin: 0;
	}
	hr + p, ol, ul {
	display: block;
	margin-top: -1rem;
	margin-bottom: -1rem;
	}
	ol, ul {
	margin: 2rem 0 -1rem;
	ol, ul {
	margin: 1.25rem 0 -0.5rem;
	}
	}
	li {
	margin-top: -0.5rem;
	margin-bottom: -0.5rem;
	}
	h2#title {
	.article-title;
	}
	h1 {
	font-size: 1.5em;
	}
	h2 {
	font-size: 1.17em;
	}
	}

	header {
	nav {
	span, a {
	&.pinned {
	&.selected {
	font-weight: bold;
	}
	&+.views {
	margin-left: 2em;
	}
	}
	}
	}
	}
	.owner-visible {
	display: none;
	}
	}

	&#post, &#collection, &#subpage {
	code {
	.article-code;
	}
	img, video, audio {
	max-width: 100%;
	}
	audio {
	width: 100%;
	white-space: initial;
	}
	pre {
	.code-block;

	code {
	background: transparent;
	border: 0;
	padding: 0;
	font-size: 1em;
	white-space: pre-wrap; /* CSS 3 */
	white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
	white-space: -pre-wrap; /* Opera 4-6 */
	white-space: -o-pre-wrap; /* Opera 7 */
	word-wrap: break-word; /* Internet Explorer 5.5+ */
	}
	}
	blockquote {
	.article-blockquote;
	}
	article {
	hr {
	margin-top: 0;
	margin-bottom: 0;
	}
	p.badge {
	background-color: #aaa;
	display: inline-block;
	padding: 0.25em 0.5em;
	margin: 0;
	float: right;
	color: white;
	.rounded(.25em);
	}
	}
	header {
	nav {
	span, a {
	&.pinned {
	&+.pinned {
	margin-left: 1.5em;
	}
	}
	}
	}
	}
	footer {
	nav {
	a {
	margin-top: 0;
	}
	}
	}
	}
	&#collection {
	#welcome, .access {
	margin: 0 auto;
	max-width: 35em;
	h2 {
	font-weight: normal;
	margin-bottom: 1em;
	}
	p {
	font-size: 1.2em;
	line-height: 1.6;
	}
	}
	.access {
	margin: 8em auto;
	text-align: center;
	h2, ul.errors {
	font-size: 1.2em;
	margin-bottom: 1.5em !important;
	}
	}
	header {
	padding: 0 1em;
	text-align: center;
	max-width: 50em;
	margin: 3em auto 4em;

	.writeas-prefix {
	a {
	color: #aaa;
	}
	display: block;
	margin-bottom: 0.5em;
	}
	nav {
	display: block;
	margin: 1em 0;
	a:first-child {
	margin: 0;
	}
	}
	}
	nav#manage {
	position: absolute;
	top: 1em;
	left: 1.5em;
	li a.write {
	font-family: @serifFont;
	padding-top: 0.2em;
	padding-bottom: 0.2em;
	}
	}
	pre {
	line-height: 1.5;
	}
	}
	&#subpage {
	#wrapper {
	h1 {
	font-size: 2.5em;
	letter-spacing: -2px;
	padding: 0 2rem 2rem;
	}
	}
	}
	&#post {
	pre {
	font-size: 0.75em;
	}
	}

	&#collection, &#subpage {
	#wrapper {
	margin-left: auto;
	margin-right: auto;

	article {
	margin-bottom: 4em;

	&:hover {
	.hidden {
	.opacity(1);
	}
	}
	}
	h2 {
	margin-top: 0em;
	margin-bottom: 0.25em;
	&+time {
	display: block;
	margin-top: 0.25em;
	margin-bottom: 0.25em;
	}
	}
	time {
	font-size: 1.1em;

	&+p {
	margin-top: 0.25em;
	}
	}
	footer {
	text-align: left;
	padding: 0;
	}
	}
	#paging {
	overflow: visible;
	padding: 1em 6em 0;
	}
	a.read-more {
	color: #666;
	}
	}

	&#me #official-writing {
	h2 {
	font-weight: normal;
	a {
	font-size: 0.6em;
	margin-left: 1em;
	}
	a[name] {
	margin-left: 0;
	}
	a:link, a:visited {
	color: @textLinkColor;
	}
	a:hover {
	text-decoration: underline;
	}
	}
	}
	&#promo {
	div.heading {
	margin: 8em 0;
	}
	div.heading, div.attention-form {
	h1 {
	font-size: 3.5em;
	}
	input {
	padding-left: 0.75em;
	padding-right: 0.75em;
	&[type=email] {
	max-width: 16em;
	}
	&[type=submit] {
	padding-left: 1.5em;
	padding-right: 1.5em;
	}
	}
	}
	h2 {
	margin-bottom: 0;
	font-size: 1.8em;
	font-weight: normal;
	span.write-as {
	color: black;
	}
	&.soon {
	color: lighten(@subheaders, 50%);
	span {
	&.write-as {
	color: lighten(#000, 50%);
	}
	&.note {
	color: lighten(#333, 50%);
	font-variant: small-caps;
	margin-left: 0.5em;
	}
	}
	}
	}
	.half-col a {
	margin-left: 1em;
	margin-right: 1em;
	}
	}
	nav#top-nav {
	display: inline;
	position: absolute;
	top: 1.5em;
	right: 1.5em;
	font-size: 0.95rem;
	font-family: @sansFont;
	text-transform: uppercase;
	a {
	color: #777;
	}
	a + a {
	margin-left: 1em;
	}
	}

	footer {
	nav, ul {
	a {
	display: inline-block;
	margin-top: 0.8em;
	.transition-duration(0.1s);
	text-decoration: none;
	+ a {
	margin-left: 0.8em;
	}
	&:link, &:visited {
	color: #999;
	}
	&:hover {
	color: #666;
	text-decoration: none;
	}
	}
	}
	a.home {
	&:link, &:visited {
	color: #333;
	}
	font-weight: bold;
	text-decoration: none;
	&:hover {
	color: #000;
	}
	}
	ul {
	list-style: none;
	text-align: left;
	padding-left: 0 !important;
	margin-left: 0 !important;
	.icons img {
	height: 16px;
	width: 16px;
	fill: #999;
	}
	}
	}
	}

	nav#full-nav {
	margin: 0;

	.left-side {
	display: inline-block;

	a:first-child {
	margin-left: 0;
	}
	}

	.right-side {
	float: right;
	}
	}

	nav#full-nav a.simple-btn, .tool button {
	font-family: @sansFont;
	border: 1px solid #ccc !important;
	padding: .5rem 1rem;
	margin: 0;
	.rounded(.25em);
	text-decoration: none;
	}

	.post-title {
	a {
	&:link {
	color: #333;
	}
	&:visited {
	color: #444;
	}
	}
	time, time a:link, time a:visited, &+.time {
	color: #999;
	}
	}

	.hidden {
	-moz-transition-property: opacity;
	-webkit-transition-property: opacity;
	-o-transition-property: opacity;
	transition-property: opacity;
	.transition-duration(0.4s);
	.opacity(0);
	}

	a {
	text-decoration: none;
	&:hover {
	text-decoration: underline;
	}
	&.subdued {
	color: #999;
	&:hover {
	border-bottom: 1px solid #999;
	text-decoration: none;
	}
	}
	&.danger {
	color: @dangerCol;
	font-size: 0.86em;
	}
	&.simple-cta {
	text-decoration: none;
	border-bottom: 1px solid #ccc;
	color: #333;
	padding-bottom: 2px;
	&:hover {
	text-decoration: none;
	}
	}
	&.action-btn {
	font-family: @sansFont;
	text-transform: uppercase;
	.rounded(.25em);
	background-color: red;
	color: white;
	font-weight: bold;
	padding: 0.5em 0.75em;
	&:hover {
	background-color: lighten(#f00, 5%);
	text-decoration: none;
	}
	}
	&.hashtag:hover {
	text-decoration: none;
	span + span {
	text-decoration: underline;
	}
	}
	&.hashtag {
	span:first-child {
	color: #999;
	margin-right: 0.1em;
	font-size: 0.86em;
	text-decoration: none;
	}
	}
	}

	abbr {
	border-bottom: 1px dotted #999;
	text-decoration: none;
	cursor: help;
	}

	body#collection article p, body#subpage article p {
	.article-p;
	}
	pre, body#post article, #post .alert, #subpage .alert, body#collection article, body#subpage article, body#subpage #wrapper h1 {
	max-width: 40rem;
	margin: 0 auto;
	}
	#collection header .alert, #post .alert, #subpage .alert {
	margin-bottom: 1em;
	p {
	text-align: left;
	line-height: 1.4;
	}
	}
	textarea, pre, body#post article, body#collection article p {
	&.norm, &.sans, &.wrap {
	line-height: 1.4em;
	white-space: pre-wrap; /* CSS 3 */
	white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
	white-space: -pre-wrap; /* Opera 4-6 */
	white-space: -o-pre-wrap; /* Opera 7 */
	word-wrap: break-word; /* Internet Explorer 5.5+ */
	}
	}
	textarea, pre, body#post article, body#collection article, body#subpage article, span, .font {
	&.norm {
	font-family: @serifFont;
	}
	&.sans {
	font-family: @sansFont;
	}
	&.mono, &.wrap, &.code {
	font-family: @monoFont;
	}
	&.mono, &.code {
	max-width: none !important;
	}
	}
	textarea {
	&.section {
	border: 1px solid #ccc;
	padding: 0.65em 0.75em;
	.rounded(.25em);
	&.codable {
	height: 12em;
	resize: vertical;
	}
	}
	}
	.ace_editor {
	height: 12em;
	border: 1px solid #333;
	max-width: initial;
	width: 100%;
	font-size: 0.86em !important;
	border: 1px solid #ccc;
	padding: 0.65em 0.75em;
	margin: 0;
	.rounded(.25em);
	}

	p {
	-webkit-font-smoothing: antialiased;
	-moz-osx-font-smoothing: grayscale;
	&.intro {
	font-size: 1.25em;
	text-align: center;
	}
	&.upgrade-prompt {
	font-size: 0.9em;
	color: #444;
	}
	&.text-cta {
	font-size: 1.2em;
	text-align: center;
	margin-bottom: 0.5em;
	&+ p {
	text-align: center;
	font-size: 0.7em;
	margin-top: 0;
	color: #666;
	}
	}
	&.error {
	font-style: italic;
	color: @errUrgentCol;
	}
	&.headeresque {
	font-size: 2em;
	}
	}

	table.classy {
	width: 95%;
	border-collapse: collapse;
	margin-bottom: 2em;

	tr + tr {
	border-top: 1px solid #ccc;
	}
	th {
	text-transform: uppercase;
	font-weight: normal;
	font-size: 95%;
	font-family: @sansFont;
	padding: 1rem 0.75rem;
	text-align: center;
	}
	td {
	height: 3.5rem;
	}
	p {
	margin-top: 0 !important;
	margin-bottom: 0 !important;
	}

	&.export {
	.disabled {
	color: #999;
	}
	.disabled, a {
	text-transform: lowercase;
	}
	}
	}

	body#collection article, body#subpage article {
	padding-top: 0;
	padding-bottom: 0;
	.book {
	h2 {
	font-size: 1.4em;
	}
	a.hidden.action {
	color: #666;
	float: right;
	font-size: 1em;
	margin-left: 1em;
	margin-bottom: 1em;
	}
	}
	}
	body#post article {
	p.badge {
	font-size: 0.9em;
	}
	}

	article {
	h2.post-title a[rel=nofollow]::after {
	content: '\a0 \2934';
	}
	}


	table.downloads {
	width: 100%;
	td {
	text-align: center;
	}
	img.os {
	width: 48px;
	vertical-align: middle;
	margin-bottom: 6px;
	}
	}

	select.inputform, textarea.inputform {
	border: 1px solid #999;
	}

	input, button, select.inputform, textarea.inputform {
	padding: 0.5em;
	font-family: @serifFont;
	font-size: 100%;
	.rounded(.25em);
	&[type=submit], &.submit {
	border: 1px solid @primary;
	background: @primary;
	color: white;
	.transition(0.2s);
	&:hover {
	background-color: lighten(@primary, 3%);
	}
	&:disabled {
	cursor: default;
	background-color: desaturate(@primary, 100%) !important;
	border-color: desaturate(@primary, 100%) !important;
	}
	}
	&.error[type=text], textarea.error {
	-webkit-transition: all 0.30s ease-in-out;
	-moz-transition: all 0.30s ease-in-out;
	-ms-transition: all 0.30s ease-in-out;
	-o-transition: all 0.30s ease-in-out;
	outline: none;
	}
	&.danger {
	border: 1px solid @dangerCol;
	background: @dangerCol;
	color: white;
	&:hover {
	background-color: lighten(@dangerCol, 3%);
	}
	}

	&.error[type=text]:focus, textarea.error:focus {
	box-shadow: 0 0 5px @errUrgentCol;
	border: 1px solid @errUrgentCol;
	}
	}

	div.flat-select {
	display: inline-block;
	position: relative;
	select {
	border: 0;
	background: 0;
	-webkit-appearance: none;
	-moz-appearance: none;
	appearance: none;
	position: absolute;
	top: 0;
	left: 0;
	right: 0;
	bottom: 0;
	width: 100%;
	height: 100%;
	opacity: 0;
	}

	&.action {
	&:hover {
	label {
	text-decoration: underline;
	}
	}
	label, select {
	cursor: pointer;
	}
	}
	}

	input {
	&.underline{
	border: none;
	border-bottom: 1px solid #ccc;
	padding: 0 .2em .2em;
	font-size: 0.9em;
	color: #333;
	}
	&.inline {
	padding: 0.2rem 0.2rem;
	margin-left: 0;
	font-size: 1em;
	border: 0 !important;
	border-bottom: 1px solid #999 !important;
	width: 7em;
	.rounded(0);
	}

	&[type=tel], &[type=text], &[type=email], &[type=password] {
	border: 1px solid #999;
	}
	&.boxy {
	border: 1px solid #999 !important;
	}
	}

	#beta, .content-container {
	max-width: 50em;
	margin: 0 auto 3em;
	font-size: 1.2em;

	&.tight {
	max-width: 30em;
	}
	&.snug {
	max-width: 40em;
	}
	&.regular {
	font-size: 1em;
	}
	.app {
	+ .app {
	margin-top: 1.5em;
	}
	h2 {
	margin-bottom: 0.25em;
	}
	p {
	margin-top: 0.25em;
	}
	}

	h2.intro {
	font-weight: normal;
	}
	p {
	line-height: 1.4;
	}
	li {
	margin: 0.3em 0;
	}
	h2 {
	&.light {
	font-weight: normal;
	}
	a {
	.transition-duration(0.2s);
	-moz-transition-property: color;
	-webkit-transition-property: color;
	-o-transition-property: color;
	transition-property: color;

	&:link, &:visited, &:hover {
	color: @subheaders;
	}
	&:hover {
	color: lighten(@subheaders, 10%);
	text-decoration: none;
	}
	}
	}
	}
	.content-container {
	&#pricing {
	button {
	cursor: pointer;
	color: white;
	margin-top: 1em;
	margin-bottom: 1em;
	padding-left: 1.5em;
	padding-right: 1.5em;
	border: 0;
	background: @primary;
	.rounded(.25em);
	.transition(0.2s);

	&:hover {
	background-color: lighten(@primary, 5%);
	}
	&.unselected {
	cursor: pointer;
	}
	}
	h2 span {
	font-weight: normal;
	}
	.half {
	margin: 0 0 1em 0;
	text-align: center;
	}
	}
	div.features {
	margin-top: 1.5em;
	text-align: center;
	font-size: 0.86em;
	ul {
	text-align: left;
	max-width: 26em;
	margin-left: auto !important;
	margin-right: auto !important;
	li.soon, span.soon {
	color: lighten(#111, 40%);
	}
	}
	}
	div.blurbs {
	>h2 {
	text-align: center;
	color: #333;
	font-weight: normal;
	}
	p.price {
	font-size: 1.2em;
	margin-bottom: 0;
	color: #333;
	margin-top: 0.5em;
	&+p {
	margin-top: 0;
	font-size: 0.8em;
	}
	}
	p.text-cta {
	font-size: 1em;
	}
	}
	}
	footer div.blurbs {
	display: flex;
	flex-flow: row;
	flex-wrap: wrap;
	}
	div.blurbs {
	.half, .third, .fourth {
	font-size: 0.86em;
	h3 {
	font-weight: normal;
	}
	p, ul {
	color: #595959;
	}
	hr {
	margin: 1em 0;
	}
	}
	.half {
	padding: 0 1em 0 0;
	width: ~"calc(50% - 1em)";
	&+.half {
	padding: 0 0 0 1em;
	}
	}
	.third {
	padding: 0;
	width: ~"calc(33% - 1em)";
	&+.third {
	padding: 0 0 0 1em;
	}
	}
	.fourth {
	flex: 1 1 25%;
	-webkit-flex: 1 1 25%;
	h3 {
	margin-bottom: 0.5em;
	}
	ul {
	margin-top: 0.5em;
	}
	}
	}
	.contain-me {
	text-align: left;
	margin: 0 auto 4em;
	max-width: 50em;
	h2 + p, h2 + p + p, p.describe-me {
	margin-left: 1.5em;
	margin-right: 1.5em;
	color: #333;
	}
	}
	footer.contain-me {
	font-size: 1.1em;
	}
	#official-writing, #wrapper {
	h2, h3, h4 {
	color: @subheaders;
	}
	ul {
	&.collections {
	margin-left: 0;
	li {
	&.collection {
	a.title {
	&:link, &:visited {
	color: @headerTextColor;
	}
	}
	}
	a.create {
	color: #444;
	}
	}
	& + p {
	margin-top: 2em;
	margin-left: 1em;
	}
	}
	}
	}

	#official-writing, #wrapper {
	h2 {
	&.major {
	color: #222;
	}
	&.bugfix {
	color: #666;
	}

	+.android-version {
	a {
	color: #999;
	&:hover {
	text-decoration: underline;
	}
	}
	}
	}
	}

	li {
	line-height: 1.4;

	.item-desc, .prog-lang {
	font-size: 0.6em;
	font-family: 'Open Sans', sans-serif;
	font-weight: bold;
	margin-left: 0.5em;
	margin-right: 0.5em;
	text-transform: uppercase;
	color: #999;
	}
	}

	.success {
	color: darken(@proSelectedCol, 20%);
	}

	.alert {
	padding: 1em;
	margin-bottom: 1.25em;
	border: 1px solid transparent;
	.rounded(.25em);
	&.info {
	color: #31708f;
	background-color: #d9edf7;
	border-color: #bce8f1;
	}
	&.success {
	color: #3c763d;
	background-color: #dff0d8;
	border-color: #d6e9c6;
	}

	p {
	margin: 0;
	&+p {
	margin-top: 0.5em;
	}
	}
	p.dismiss {
	font-family: @sansFont;
	text-align: right;
	font-size: 0.86em;
	text-transform: uppercase;
	}
	}

	ul.errors {
	padding: 0;
	text-indent: 0;
	li.urgent {
	list-style: none;
	font-style: italic;
	text-align: center;
	color: @errUrgentCol;
	a:link, a:visited {
	color: purple;
	}
	}
	li.info {
	list-style: none;
	font-size: 1.1em;
	text-align: center;
	}
	}

	body#pad #target a.upgrade-prompt {
	padding-left: 1em;
	padding-right: 1em;
	text-align: center;
	font-style: italic;
	color: @primary;
	}

	body#pad-sub #posts, .atoms {
	margin-top: 1.5em;

	h3 {
	margin-bottom: 0.25em;
	&+ h4 {
	margin-top: 0.25em;
	margin-bottom: 0.5em;
	&+ p {
	margin-top: 0.5em;
	}
	}
	.electron {
	font-weight: normal;
	margin-left: 0.5em;
	}
	}
	h3, h4 {
	a {
	.transition-duration(0.2s);
	-moz-transition-property: color;
	-webkit-transition-property: color;
	-o-transition-property: color;
	transition-property: color;
	}
	}
	h4 {
	font-size: 0.9em;
	font-weight: normal;
	}
	date, .electron {
	margin-right: 0.5em;
	}
	.action {
	font-size: 1em;
	}
	#more-posts p {
	text-align: center;
	font-size: 1.1em;
	}
	p {
	font-size: 0.86em;
	}
	.error {
	display: inline-block;
	font-size: 0.8em;
	font-style: italic;
	color: @errUrgentCol;

	strong {
	font-style: normal;
	}
	}
	.error + nav {
	display: inline-block;
	font-size: 0.8em;
	margin-left: 1em;

	a + a {
	margin-left: 0.75em;
	}
	}
	}

	h2 {
	a, time {
	&+.action {
	margin-left: 0.5em;
	}
	}
	}
	.action {
	font-size: 0.7em;
	font-weight: normal;
	font-family: @serifFont;

	&+ .action {
	margin-left: 0.5em;
	}
	&.new-post {
	font-weight: bold;
	}
	}
	article.moved {
	p {
	font-size: 1.2em;
	color: #999;
	}
	}
	span.as {
	.opacity(0.2);
	font-weight: normal;
	}
	span.ras {
	.opacity(0.6);
	font-weight: normal;
	}

	header {
	nav {
	.username {
	font-size: 2em;
	font-weight: normal;
	color: #555;
	}
	&#user-nav {
	margin-left: 0;
	& > a, .tabs > a {
	&.selected {
	cursor: default;
	font-weight: bold;
	&:hover {
	text-decoration: none;
	}
	}
	& + a {
	margin-left: 2em;
	}
	}
	a {
	font-size: 1.2em;
	font-family: @sansFont;
	span {
	font-size: 0.7em;
	color: #999;
	text-transform: uppercase;
	margin-left: 0.5em;
	margin-right: 0.5em;
	}
	&.title {
	font-size: 1.6em;
	font-family: @serifFont;
	font-weight: bold;
	}
	}
	nav > ul > li:first-child {
	&> a {
	display: inline-block;
	}
	img {
	position: relative;
	top: -0.5em;
	right: 0.3em;
	}
	}
	ul ul {
	font-size: 0.8em;
	a {
	padding-top: 0.25em;
	padding-bottom: 0.25em;
	}
	}
	li {
	line-height: 1.5;
	}
	}
	&.tabs {
	margin: 0 0 0 1em;
	}
	&+ nav.tabs {
	margin: 0;
	}
	}
	&.singleuser {
	margin: 0.5em 0.25em;
	nav#user-nav {
	nav > ul > li:first-child {
	img {
	top: -0.75em;
	}
	}
	}
	}
	.dash-nav {
	font-weight: bold;
	}
	}

	li#create-collection {
	display: none;
	h4 {
	margin-top: 0px;
	margin-bottom: 0px;
	}
	input[type=submit] {
	margin-left: 0.5em;
	}
	}

	#collection-options {
	.option {
	textarea {
	font-size: 0.86em;
	font-family: @monoFont;
	}
	.section > p.explain {
	font-size: 0.8em;
	}
	}
	}

	.img-placeholder {
	text-align: center;
	img {
	max-width: 100%;
	}
	}

	dl {
	&.admin-dl-horizontal {
	dt {
	font-weight: bolder;
	width: 360px;
	}
	dd {
	line-height: 1.5;
	}
	}
	}
	dt {
	float: left;
	clear: left;
	overflow: hidden;
	text-overflow: ellipsis;
	white-space: nowrap;
	}
	form {
	dt, dd {
	padding: 0.5rem 0;
	}
	dt {
	line-height: 1.8;
	}
	dd {
	font-size: 0.86em;
	line-height: 2;
	}
	+
	+ &.prominent {
	+ margin: 1em 0;
	+
	+ label {
	+ font-weight: bold;
	+ }
	+ input, select {
	+ width: 100%;
	+ }
	+ select {
	+ font-size: 1em;
	+ padding: 0.5rem;
	+ display: block;
	+ border-radius: 0.25rem;
	+ margin: 0.5rem 0;
	+ }
	+ }
	}
	div.row {
	display: flex;
	align-items: center;
	> div {
	flex: 1;
	}
	}

	@media all and (max-width: 450px) {
	body#post {
	header {
	nav {
	.xtra-feature {
	display: none;
	}
	}
	}
	}
	}
	@media all and (min-width: 1280px) {
	body#promo {
	div.heading {
	margin: 10em 0;
	}
	}
	}

	@media all and (min-width: 1600px) {
	body#promo {
	div.heading {
	margin: 14em 0;
	}
	}
	}

	@media all and (max-width: 900px) {
	.half.big {
	padding: 0 !important;
	width: 100% !important;
	}
	.third {
	padding: 0 !important;
	float: none;
	width: 100% !important;
	p.introduction {
	font-size: 0.86em;
	}
	}
	div.blurbs {
	.fourth {
	flex: 1 1 15em;
	-webkit-flex: 1 1 15em;
	}
	}
	.blurbs .third, .blurbs .half {
	p, ul {
	text-align: left;
	}
	}
	.half-col, .big {
	float: none;
	text-align: center;

	&+.half-col, &+.big {
	margin-top: 4em !important;
	margin-left: 0;
	}
	}
	#beta, .content-container {
	font-size: 1.15em;
	}
	}

	@media all and (max-width: 600px) {
	div.row {
	flex-direction: column;
	}
	.half {
	padding: 0 !important;
	width: 100% !important;
	}
	.third {
	width: 100% !important;
	float: none;
	}
	body#promo {
	div.heading {
	margin: 6em 0;
	}
	h2 {
	font-size: 1.6em;
	}
	.half-col a + a {
	margin-left: 1em;
	}
	.half-col a.channel {
	margin-left: auto !important;
	margin-right: auto !important;
	}
	}
	ul.add-integrations {
	li {
	display: list-item;
	&+ li {
	margin-left: 0;
	}
	}
	}
	}

	@media all and (max-height: 500px) {
	body#promo {
	div.heading {
	margin: 5em 0;
	}
	}
	}

	@media all and (max-height: 400px) {
	body#promo {
	div.heading {
	margin: 0em 0;
	}
	}
	}

	/* Smartphones (portrait and landscape) ----------- */
	@media only screen and (min-device-width : 320px) and (max-device-width : 480px) {
	header {
	.opacity(1);
	}
	}

	/* Smartphones (portrait) ----------- */
	@media only screen and (max-width : 320px) {
	.content-container#pricing {
	.half {
	float: none;
	width: 100%;
	}
	}
	header {
	.opacity(1);
	}
	}

	/* iPads (portrait and landscape) ----------- */
	@media only screen and (min-device-width : 768px) and (max-device-width : 1024px) {
	header {
	.opacity(1);
	}
	}

	@media (pointer: coarse) {
	body footer nav a:not(.pubd) {
	padding: 0.8em 1em;
	margin-left: 0;
	margin-top: 0;
	}
	}

	@media print {
	h1 {
	page-break-before: always;
	}

	h1, h2, h3, h4, h5, h6 {
	page-break-after: avoid;
	}

	table, figure {
	page-break-inside: avoid;
	}

	header, footer {
	display: none;
	}
	article#post-body {
	margin-top: 2em;
	margin-left: 0;
	margin-right: 0;
	}
	hr {
	border: 1px solid #ccc;
	}
	}

	.code-block {
	padding: 0;
	max-width: 100%;
	margin: 0;
	background: #f8f8f8;
	border: 1px solid #ccc;
	padding: 0.375em 0.625em;
	font-size: 0.86em;
	.rounded(.25em);
	}
	pre.code-block {
	overflow-x: auto;
	}
	diff --git a/templates/user/import.tmpl b/templates/user/import.tmpl
	index 0fd8a93..2b6a4c3 100644
	--- a/templates/user/import.tmpl
	+++ b/templates/user/import.tmpl
	@@ -1,38 +1,49 @@
	{{define "import"}}
	{{template "header" .}}
	+ <style>
	+ input[type=file] {
	+ padding: 0;
	+ font-size: 0.86em;
	+ display: block;
	+ margin: 0.5rem 0;
	+ }
	+ label {
	+ display: block;
	+ margin: 1em 0;
	+ }
	+ </style>

	<div class="snug content-container">
	+ <h1 id="import-header">Import posts</h1>
	{{if .Message}}
	<div class="alert {{if .InfoMsg}}info{{else}}success{{end}}">
	<p>{{.Message}}</p>
	</div>
	{{end}}
	- <h2 id="posts-header">Import</h2>
	- <p>Upload text or markdown files to import as posts.</p>
	+ {{if .Flashes}}
	+ <ul class="errors">
	+ {{range .Flashes}}<li class="urgent">{{.}}</li>{{end}}
	+ </ul>
	+ {{end}}
	+ <p>Publish plain text or Markdown files to your account by uploading them below.</p>
	<div class="formContainer">
	- <form id="importPosts" class="import" enctype="multipart/form-data" action="/api/me/import" method="POST">
	- <label for="file" hidden>Browse files to upload</label>
	- <input class="fileInput" name="files" type="file" multiple accept="text/markdown, text/plain"/>
	- <br />
	- <label for="collection">Select a blog to import the posts under.</label>
	- <select name="collection">
	- {{range $i, $el := .Collections}}
	- <option value={{.Alias}}>
	- {{if .Title}}{{.Title}}{{else}}{{.Alias}}{{end}}
	- </option>
	- {{end}}
	- <option value="" selected>drafts</option>
	- </select>
	- <br />
	+ <form id="importPosts" class="prominent" enctype="multipart/form-data" action="/api/me/import" method="POST">
	+ <label>Select some files to import:
	+ <input class="fileInput" name="files" type="file" multiple accept="text/markdown, text/plain"/>
	+ </label>
	+ <label>
	+ Import these posts to:
	+ <select name="collection">
	+ {{range $i, $el := .Collections}}
	+ <option value="{{.Alias}}" {{if eq $i 0}}selected{{end}}>{{.DisplayTitle}}</option>
	+ {{end}}
	+ <option value="">Drafts</option>
	+ </select>
	+ </label>
	<input type="submit" value="Import" />
	</form>
	</div>
	- {{if .Flashes}}
	- <ul class="errors">
	- {{range .Flashes}}<li class="urgent">{{.}}</li>{{end}}
	- </ul>
	- {{end}}
	</div>

	{{template "footer" .}}
	{{end}}
	diff --git a/templates/user/include/header.tmpl b/templates/user/include/header.tmpl
	index 3b57387..0704854 100644
	--- a/templates/user/include/header.tmpl
	+++ b/templates/user/include/header.tmpl
	@@ -1,108 +1,108 @@
	{{define "user-navigation"}}
	<header class="{{if .SingleUser}}singleuser{{else}}multiuser{{end}}">
	{{if .SingleUser}}
	<nav id="user-nav">
	<nav class="dropdown-nav">
	<ul><li><a href="/" title="View blog" class="title">{{.SiteName}}</a> <img class="ic-18dp" src="/img/ic_down_arrow_dark@2x.png" />
	<ul>
	<li><a href="/me/c/{{.Username}}">Customize</a></li>
	<li><a href="/me/c/{{.Username}}/stats">Stats</a></li>
	<li class="separator"><hr /></li>
	{{if .IsAdmin}}<li><a href="/admin">Admin</a></li>{{end}}
	<li><a href="/me/settings">Settings</a></li>
	+ <li><a href="/me/import">Import posts</a></li>
	<li><a href="/me/export">Export</a></li>
	- <li><a href="/me/import">Import</a></li>
	<li class="separator"><hr /></li>
	<li><a href="/me/logout">Log out</a></li>
	</ul></li>
	</ul>
	</nav>
	<nav class="tabs">
	<a href="/me/posts/"{{if eq .Path "/me/posts/"}} class="selected"{{end}}>Drafts</a>
	<a href="/me/new">New Post</a>
	</nav>
	</nav>
	{{else}}
	<nav id="full-nav">
	<div class="left-side">
	<h1><a href="/" title="Return to editor">{{.SiteName}}</a></h1>
	</div>
	<nav id="user-nav">
	{{if .Username}}
	<nav class="dropdown-nav">
	<ul><li><a>{{.Username}}</a> <img class="ic-18dp" src="/img/ic_down_arrow_dark@2x.png" /><ul>
	{{if .IsAdmin}}<li><a href="/admin">Admin dashboard</a></li>{{end}}
	<li><a href="/me/settings">Account settings</a></li>
	+ <li><a href="/me/import">Import posts</a></li>
	<li><a href="/me/export">Export</a></li>
	- <li><a href="/me/import">Import</a></li>
	{{if .CanInvite}}<li><a href="/me/invites">Invite people</a></li>{{end}}
	<li class="separator"><hr /></li>
	<li><a href="/me/logout">Log out</a></li>
	</ul></li>
	</ul>
	</nav>
	{{end}}
	<nav class="tabs">
	{{if .SimpleNav}}
	{{ if not .SingleUser }}
	{{if and (and .LocalTimeline .CanViewReader) .Chorus}}<a href="/"{{if eq .Path "/"}} class="selected"{{end}}>Home</a>{{end}}
	{{ end }}
	<a href="/about">About</a>
	{{ if not .SingleUser }}
	{{ if .Username }}
	{{if gt .MaxBlogs 1}}<a href="/me/c/"{{if eq .Path "/me/c/"}} class="selected"{{end}}>Blogs</a>{{end}}
	{{if and .Chorus (eq .MaxBlogs 1)}}<a href="/{{.Username}}/"{{if eq .Path (printf "/%s/" .Username)}} class="selected"{{end}}>My Posts</a>{{end}}
	{{if not .DisableDrafts}}<a href="/me/posts/"{{if eq .Path "/me/posts/"}} class="selected"{{end}}>Drafts</a>{{end}}
	{{ end }}
	{{if and (and .LocalTimeline .CanViewReader) (not .Chorus)}}<a href="/read">Reader</a>{{end}}
	{{if and (and (and .Chorus .OpenRegistration) (not .Username)) (or (not .Private) (ne .Landing ""))}}<a href="/signup"{{if eq .Path "/signup"}} class="selected"{{end}}>Sign up</a>{{end}}
	{{if .Username}}<a href="/me/logout">Log out</a>{{else}}<a href="/login">Log in</a>{{end}}
	{{ end }}
	{{else}}
	<a href="/me/c/"{{if eq .Path "/me/c/"}} class="selected"{{end}}>Blogs</a>
	{{if not .DisableDrafts}}<a href="/me/posts/"{{if eq .Path "/me/posts/"}} class="selected"{{end}}>Drafts</a>{{end}}
	{{if and (and .LocalTimeline .CanViewReader) (not .Chorus)}}<a href="/read">Reader</a>{{end}}
	{{end}}
	</nav>
	</nav>
	{{if .Chorus}}{{if .Username}}<div class="right-side">
	<a class="simple-btn" href="/new">New Post</a>
	</div>{{end}}
	</nav>
	{{end}}
	{{end}}
	</header>
	{{end}}
	{{define "header"}}<!DOCTYPE HTML>
	<html>
	<head>
	<meta charset="utf-8">

	<title>{{.PageTitle}} {{if .Separator}}{{.Separator}}{{else}}—{{end}} {{.SiteName}}</title>

	<link rel="stylesheet" type="text/css" href="/css/write.css" />
	<link rel="shortcut icon" href="/favicon.ico" />
	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
	<meta name="theme-color" content="#888888" />
	<meta name="apple-mobile-web-app-title" content="{{.SiteName}}">
	<link rel="apple-touch-icon" sizes="152x152" href="/img/touch-icon-152.png">
	<link rel="apple-touch-icon" sizes="167x167" href="/img/touch-icon-167.png">
	<link rel="apple-touch-icon" sizes="180x180" href="/img/touch-icon-180.png">
	</head>
	<body id="me">
	{{template "user-navigation" .}}
	<div id="official-writing">
	{{end}}

	{{define "admin-header"}}
	<header class="admin">
	<h1>Admin</h1>
	<nav id="admin">
	<a href="/admin" {{if eq .Path "/admin"}}class="selected"{{end}}>Dashboard</a>
	{{if not .SingleUser}}
	<a href="/admin/users" {{if eq .Path "/admin/users"}}class="selected"{{end}}>Users</a>
	<a href="/admin/pages" {{if eq .Path "/admin/pages"}}class="selected"{{end}}>Pages</a>
	{{end}}
	</nav>
	</header>
	{{end}}
	diff --git a/templates/user/invite.tmpl b/templates/user/invite.tmpl
	index 1985bd5..4365e07 100644
	--- a/templates/user/invite.tmpl
	+++ b/templates/user/invite.tmpl
	@@ -1,92 +1,81 @@
	{{define "invite"}}
	{{template "header" .}}
	<style>
	.half {
	margin-right: 0.5em;
	}
	.half + .half {
	margin-left: 0.5em;
	margin-right: 0;
	}
	-label {
	- font-weight: bold;
	-}
	-select {
	- font-size: 1em;
	- width: 100%;
	- padding: 0.5rem;
	- display: block;
	- border-radius: 0.25rem;
	- margin: 0.5rem 0;
	-}
	-input, table.classy {
	+table.classy {
	width: 100%;
	}
	table.classy.export a {
	text-transform: initial;
	}
	table td {
	font-size: 0.86em;
	}
	</style>

	<div class="snug content-container">
	<h1>Invite people</h1>
	<p>Invite others to join <em>{{.SiteName}}</em> by generating and sharing invite links below.</p>

	- <form style="margin: 2em 0" action="/api/me/invites" method="post">
	+ <form style="margin: 2em 0" class="prominent" action="/api/me/invites" method="post">
	<div class="row">
	<div class="half">
	<label for="uses">Maximum number of uses:</label>
	<select id="uses" name="uses">
	<option value="0">No limit</option>
	<option value="1">1 use</option>
	<option value="5">5 uses</option>
	<option value="10">10 uses</option>
	<option value="25">25 uses</option>
	<option value="50">50 uses</option>
	<option value="100">100 uses</option>
	</select>
	</div>
	<div class="half">
	<label for="expires">Expire after:</label>
	<select id="expires" name="expires">
	<option value="0">Never</option>
	<option value="30">30 minutes</option>
	<option value="60">1 hour</option>
	<option value="360">6 hours</option>
	<option value="720">12 hours</option>
	<option value="1440">1 day</option>
	<option value="4320">3 days</option>
	<option value="10080">1 week</option>
	</select>
	</div>
	</div>
	<div class="row">
	<input type="submit" value="Generate" />
	</div>
	</form>

	<table class="classy export">
	<tr>
	<th>Link</th>
	<th>Uses</th>
	<th>Expires</th>
	</tr>
	{{range .Invites}}
	<tr>
	<td><a href="{{$.Host}}/invite/{{.ID}}">{{$.Host}}/invite/{{.ID}}</a></td>
	<td>{{.Uses}}{{if gt .MaxUses.Int64 0}} / {{.MaxUses.Int64}}{{end}}</td>
	<td>{{ if .Expires }}{{if .Expired}}Expired{{else}}{{.ExpiresFriendly}}{{end}}{{ else }}∞{{ end }}</td>
	</tr>
	{{else}}
	<tr>
	<td colspan="3">No invites generated yet.</td>
	</tr>
	{{end}}
	</table>

	</div>

	{{template "footer" .}}
	{{end}}

File Metadata

Mime Type: text/x-diff
Expires: Thu, Nov 20, 6:32 AM (1 d, 16 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 3498395

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions