Merge branch 'master' of git.c3d2.de:sic++

This commit is contained in:
john stone 2014-05-01 21:36:08 +02:00
commit 1742560b87
1 changed files with 3 additions and 3 deletions

View File

@ -10,10 +10,10 @@ std::string DynamicObjects::render_object_list(){
for (auto it : this->_themap){ for (auto it : this->_themap){
output += u8"<li>\n"; output += u8"<li>\n";
output += u8"<a href=\"" + it.second->get_loadurl() + u8"\">"; //we could include baseurl here? output += u8"<a href=\"" + m_merouterin.get_baseurl() + it.get_path() + u8"\">"; //we could include baseurl here?
output += it.second->get_fname(); output += it.get_filename();
output += u8"</a> <span class=\"size\">"; output += u8"</a> <span class=\"size\">";
output += it.second->bytesize_string(); output += it.get_pretty_sized();
output += u8"</span>\n</li>"; output += u8"</span>\n</li>";
} }
output += u8R"HUENERBLUBBE( output += u8R"HUENERBLUBBE(