From 8cd1cc2ac8064a770c6284a9b095bff20d8fade3 Mon Sep 17 00:00:00 2001 From: Makis Maropoulos Date: Wed, 1 Jun 2016 04:45:11 +0300 Subject: [PATCH] Iris is looking for a new website design and logo --- README.md | 5 +---- context/context.go | 9 +++++++++ context_renderer.go | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index a25a24d9..bfddd5d7 100644 --- a/README.md +++ b/README.md @@ -18,10 +18,6 @@ [Language]: http://golang.org [Platform Widget]: https://img.shields.io/badge/platform-Any--OS-gray.svg?style=flat-square -Iris is 3 months baby which has succeeded to be the fastest go web framework that exists, so far, while providing a robust set of features for building web applications. - -- [why v3 has 1 commit ?](https://github.com/kataras/iris/issues/162) - [![Benchmark Wizzard Processing Time Horizontal Graph](https://raw.githubusercontent.com/iris-contrib/website/cf71811e6acb2f9bf1e715e25660392bf090b923/assets/benchmark_horizontal_transparent.png)](#benchmarks) ```sh @@ -90,6 +86,7 @@ If you'd like to discuss this package, or ask questions about it, feel free to Open debates + - [Contribute: New website and logo for Iris](https://github.com/kataras/iris/issues/153) - [E-book Cover - Which one you suggest?](https://github.com/kataras/iris/issues/67) **TIP** Be sure to read the [history](HISTORY.md) for Migrating from 2.x to 3.x. diff --git a/context/context.go b/context/context.go index 746c3c18..51fbc1a9 100644 --- a/context/context.go +++ b/context/context.go @@ -48,6 +48,15 @@ type ( HTML(status int, name string, binding interface{}, layout ...string) error // Render same as .HTML but with status to iris.StatusOK (200) Render(name string, binding interface{}, layout ...string) error + // RenderString accepts a template filename, its context data and returns the result of the parsed template (string) + RenderString(name string, binding interface{}, layout ...string) (result string, err error) + // MarkdownString parses the (dynamic) markdown string and returns the converted html string + MarkdownString(markdown string) string + // Markdown parses and renders to the client a particular (dynamic) markdown string + // accepts two parameters + // first is the http status code + // second is the markdown string + Markdown(status int, markdown string) // JSON marshals the given interface object and writes the JSON response. JSON(status int, v interface{}) error // JSONP marshals the given interface object and writes the JSON response. diff --git a/context_renderer.go b/context_renderer.go index b5b113ad..7138a86c 100644 --- a/context_renderer.go +++ b/context_renderer.go @@ -43,7 +43,7 @@ func (ctx *Context) Render(name string, binding interface{}, layout ...string) e return ctx.HTML(StatusOK, name, binding, layout...) } -// Render accepts a template filename, its context data and returns the result of the parsed template (string) +// RenderStrings accepts a template filename, its context data and returns the result of the parsed template (string) func (ctx *Context) RenderString(name string, binding interface{}, layout ...string) (result string, err error) { return ctx.station.templates.RenderString(name, binding, layout...) }