* bg.gif:
* asc.gif:
* desc.gif:
* style.css: moved to App_Themes
* style.css:
* bg.gif:
* asc.gif:
* bg.png:
* rect.png:
* asc.png:
* desc.gif:
* jquery-ui.css:
* mdd_styles.css:
* croix.png:
* desc.png:
* style.css:
* jquery-ui.min.css:
* mdd_gripper.png:
* mdd_toolbar.png:
* jquery.timepicker.css:
* mdd_ajax_loader.gif:
* mdd_modal_background.png: moved to /App_Themes
* NpgsqlBlogProvider.cs: * Remove post by id
* Manage collections of entries on a couple (user,title), not a single
post
* NpgsqlCircleProvider.cs: Fixes the "Match" method.
* IDbModule.cs:
* Edit.aspx:
* Estimates.aspx:
* WorkFlowManager.cs:
* NpgsqlContentProvider.cs: refactoring
* NpgsqlMRPProviders.csproj: new NpgsqlUserName provider
* NpgsqlRoleProvider.cs: simpler init method
* NpgsqlUserNameProvider.cs: impements a UserNameProvider
* MyClass.cs: refactoring from Yavsc.Model
* BlogsController.cs: access control simplified
* FrontOfficeController.cs: Pdf generation made public ni case of
formatting exception
* mdd_styles.css: Theme -> App_Themes
* style.css: yet another style impact
* AccountController.cs: Fixes the user name modification
* BlogsController.cs: * Fixes the removal process
* On a title and user name, we get collection of posts, not only one.
* Implements an Access on circle
* FrontOfficeController.cs: * implements a new Get method.
* ensure a membership existence before delivering an estimate.
* GoogleController.cs: Fixes the user name modification on a Google
account
* ErrorHtmlFormatter.cs: nice error message in html (using Markdown
helper)
* FormatterException.cs: formatter exception exposes error and
standard output of the process
* TexToPdfFormatter.cs: * generates temporary files in the folder
returned by Path.GetTempPath()
* throws FormatterException
* Global.asax.cs: new route map:
Blogs/{action}/{user}/{title}
Blog/{user}/{title}
B/{id}
{controller}/{action}/{id}
* App.master: * refactoring: Theme moved to App_Themes
* a link to the logged user's blog
*
* NoLogin.master: refactoring: Theme moved to App_Themes
* Circles.aspx: refactoring : circles now are given as select items
* Login.aspx: fixes the html presentation
* Register.aspx: Fixes a Typo
* Index.aspx: Implements a blog index, due to M&C changes with this
commit
* RemovePost.aspx: links to the new route to the "RemovePost" action,
giving it a post id
* RemoveTitle.aspx: fixes a not yet linked page to remove a post
collection under a given title
* EventPub.aspx: code refactoring
* Writting.ascx: cleans the code
* Web.config: fills the config with new names in the space
* Web.config: configures the new NpgsqlUserNameProvider
* Web.csproj: refactoring and others
* BlogEntryCollection.cs: implement the BlogEntryCollection
* BlogManager.cs: the manager helps to filter on access
* BlogProvider.cs: The title is not unique anymore, and one can modify
it, post a lot under it, drop all posts under it.
A Post is deleted by id.
* UUBlogEntryCollection.cs: implements a collection of post under a
given user name.
* UUTBlogEntryCollection.cs: implements a collection of post under a
given couple (user name, title).
* ListItem.cs: ListItem is declared obsolete in this model, helpers
can build MVC SelectListItem on data returned by the manager.
* LocalizedText.Designer.cs:
* LocalizedText.fr.Designer.cs: autogenerated from xml
* LocalizedText.resx:
* LocalizedText.fr.resx: new labels
* ChangeUserNameProvider.cs: xml doc
* Profile.cs: the UserName property is read only, and comes from
authentication, to change it, we set a Name and validate it agains
the "Profile" method
* UserManager.cs: simpler code a init time
* IContentProvider.cs: implements the new IDataProvider interface
* IDataProvider.cs: defines the new IDataProvider interface
* YavscModel.csproj: includes new classes
* UserPosts.aspx: adds a link to remove a post
* UserPost.aspx: now uses the new BlogEntryCollection object
This commit is contained in:
parent
294c54099c
commit
3355f9fed0
82 changed files with 1273 additions and 2455 deletions
|
|
@ -27,6 +27,8 @@ using System.IO;
|
|||
using System.Net.Http;
|
||||
using System.Web.Mvc;
|
||||
using System.Net;
|
||||
using MarkdownDeep;
|
||||
using Yavsc.Helpers;
|
||||
|
||||
namespace Yavsc.Formatters
|
||||
{
|
||||
|
|
@ -84,7 +86,7 @@ namespace Yavsc.Formatters
|
|||
"href=\"/Theme/style.css\" />" +
|
||||
"<link rel=\"icon\" type=\"image/png\"" +
|
||||
" href=\"/favicon.png\" />";
|
||||
p.InnerHtml = MvcHtmlString.Create (message).ToHtmlString();
|
||||
p.InnerHtml = MarkdownHelper.Markdown(message).ToHtmlString();
|
||||
h1.InnerHtml = MvcHtmlString.Create (Title).ToHtmlString();
|
||||
body.InnerHtml = h1.ToString()+p.ToString ();
|
||||
doc.InnerHtml = head.ToString()+"\n"+body.ToString ();
|
||||
|
|
|
|||
|
|
@ -50,5 +50,8 @@ namespace Yavsc.Formatters
|
|||
public FormatterException(string message,Exception innerException):base(message,innerException)
|
||||
{
|
||||
}
|
||||
|
||||
public string Output { get; set; }
|
||||
public string Error { get; set; }
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -77,38 +77,46 @@ namespace Yavsc.Formatters
|
|||
/// <param name="contentHeaders">Content headers.</param>
|
||||
public override void WriteToStream (Type type, object value, Stream stream, HttpContentHeaders contentHeaders)
|
||||
{
|
||||
|
||||
string temp = Path.GetTempPath ();
|
||||
string cntStr = value as string;
|
||||
string name = "tmpdoc-"+Guid.NewGuid().ToString();
|
||||
string fullname = Path.Combine (
|
||||
HttpRuntime.CodegenDir, name);
|
||||
string fullname = Path.Combine (temp, name);
|
||||
FileInfo fi = new FileInfo(fullname + ".tex");
|
||||
FileInfo fo = new FileInfo(fullname + ".pdf");
|
||||
using (StreamWriter sw = new StreamWriter (fi.FullName))
|
||||
FileInfo fo = null;
|
||||
using (StreamWriter sw = new StreamWriter (fi.OpenWrite()))
|
||||
{
|
||||
sw.Write (cntStr);
|
||||
}
|
||||
using (Process p = new Process ()) {
|
||||
p.StartInfo.WorkingDirectory = HttpRuntime.CodegenDir;
|
||||
p.StartInfo = new ProcessStartInfo ();
|
||||
p.StartInfo.UseShellExecute = false;
|
||||
p.StartInfo.FileName = "/usr/bin/texi2pdf";
|
||||
p.StartInfo.Arguments =
|
||||
string.Format ("--batch --build-dir={2} -o {0} {1}",
|
||||
fo.FullName,
|
||||
fi.FullName,HttpRuntime.CodegenDir);
|
||||
p.Start ();
|
||||
p.WaitForExit ();
|
||||
if (p.ExitCode != 0)
|
||||
throw new FormatterException ("Pdf generation failed with exit code:" + p.ExitCode);
|
||||
sw.Close ();
|
||||
}
|
||||
|
||||
using (StreamReader sr = new StreamReader (fo.FullName)) {
|
||||
byte[] buffer = File.ReadAllBytes (fo.FullName);
|
||||
stream.Write(buffer,0,buffer.Length);
|
||||
using (Process p = new Process ()) {
|
||||
|
||||
Directory.SetCurrentDirectory (temp);
|
||||
|
||||
p.StartInfo.WorkingDirectory = temp;
|
||||
p.StartInfo = new ProcessStartInfo ();
|
||||
p.StartInfo.UseShellExecute = false;
|
||||
p.StartInfo.FileName = "texi2pdf";
|
||||
p.StartInfo.Arguments =
|
||||
string.Format ("--batch {0}",
|
||||
fi.FullName);
|
||||
p.StartInfo.RedirectStandardOutput = true;
|
||||
p.StartInfo.RedirectStandardError = true;
|
||||
|
||||
p.Start ();
|
||||
p.WaitForExit ();
|
||||
|
||||
if (p.ExitCode != 0) {
|
||||
var ex = new FormatterException ("Pdf generation failed with exit code:" + p.ExitCode);
|
||||
ex.Output = p.StandardOutput.ReadToEnd ()+"\nCWD:"+temp;
|
||||
ex.Error = p.StandardError.ReadToEnd ();
|
||||
throw ex;
|
||||
}
|
||||
fo = new FileInfo(name + ".pdf");
|
||||
}
|
||||
fi.Delete();
|
||||
fo.Delete();
|
||||
|
||||
byte[] buffer = File.ReadAllBytes (fo.Name);
|
||||
stream.Write(buffer,0,buffer.Length);
|
||||
if (contentHeaders != null)
|
||||
SetFileName(contentHeaders, value.GetHashCode ().ToString ());
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue