[Hejes-devel] [922] fixes by farm
hejes-devel at nytud.hu
hejes-devel at nytud.hu
Tue Sep 3 11:33:37 CEST 2013
Revision: 922
Author: mihaltz
Date: 2013-09-03 11:33:37 +0200 (Tue, 03 Sep 2013)
Log Message:
-----------
fixes by farm
Modified Paths:
--------------
trunk/web2py/applications/helyesiras_webdev/controllers/blog.py
trunk/web2py/applications/helyesiras_webdev/databases/storage.sqlite
trunk/web2py/applications/helyesiras_webdev/models/dbblog.py
trunk/web2py/applications/helyesiras_webdev/progress.log
trunk/web2py/applications/helyesiras_webdev/static/content/widget1.html
trunk/web2py/applications/helyesiras_webdev/static/css/main.css
trunk/web2py/applications/helyesiras_webdev/static/js/main.js
trunk/web2py/applications/helyesiras_webdev/views/blog/show.html
trunk/web2py/applications/helyesiras_webdev/views/layout.html
Modified: trunk/web2py/applications/helyesiras_webdev/controllers/blog.py
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/controllers/blog.py 2013-09-03 09:15:52 UTC (rev 921)
+++ trunk/web2py/applications/helyesiras_webdev/controllers/blog.py 2013-09-03 09:33:37 UTC (rev 922)
@@ -72,5 +72,7 @@
def manage():
"""Show an SQLFORM.smartgrid to manage dbblog.posts
"""
- grid = SQLFORM.grid(dbblog.posts)
+ grid = SQLFORM.grid(dbblog.posts, orderby=~dbblog.posts.created_on)
+ #grid = SQLFORM.grid(dbblog.posts, left=dbblog.tags.on(dbblog.tags.posts.contains(dbblog.posts.id)))
+ #grid = SQLFORM.smartgrid(dbblog.posts, linked_tables=['tags'])
return dict(grid=grid)
Modified: trunk/web2py/applications/helyesiras_webdev/databases/storage.sqlite
===================================================================
(Binary files differ)
Modified: trunk/web2py/applications/helyesiras_webdev/models/dbblog.py
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/models/dbblog.py 2013-09-03 09:15:52 UTC (rev 921)
+++ trunk/web2py/applications/helyesiras_webdev/models/dbblog.py 2013-09-03 09:33:37 UTC (rev 922)
@@ -2,6 +2,7 @@
"""
Data model for dbhelyesblog (MySQL database for the blog feature)
+ at author: MM
"""
@@ -65,4 +66,3 @@
create_index_if_not_exists(dbblog, 'tags', 'idx_tags_name', 'name', True)
create_index_if_not_exists(dbblog, 'categories', 'idx_categories_name', 'name', True)
create_index_if_not_exists(dbblog, 'posts', 'idx_posts_created_on', 'created_on')
-
Modified: trunk/web2py/applications/helyesiras_webdev/progress.log
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/progress.log 2013-09-03 09:15:52 UTC (rev 921)
+++ trunk/web2py/applications/helyesiras_webdev/progress.log 2013-09-03 09:33:37 UTC (rev 922)
@@ -740,3 +740,41 @@
[2013-08-28 18:32:48] EDIT helyesiras_webdev/views/blog/index.html: 0
[2013-08-28 18:32:59] EDIT helyesiras_webdev/views/blog/index.html: 0
[2013-08-28 18:33:00] EDIT helyesiras_webdev/views/blog/index.html: 0
+[2013-08-29 09:57:28] EDIT helyesiras_webdev/static/css/main.css: 0
+[2013-08-29 09:59:27] EDIT helyesiras_webdev/static/js/main.js: 0
+[2013-08-29 10:01:09] EDIT helyesiras_webdev/static/js/main.js: 2
+[2013-08-29 10:03:36] EDIT helyesiras_webdev/static/css/main.css: -1
+[2013-08-29 10:04:01] EDIT helyesiras_webdev/static/js/main.js: -2
+[2013-08-29 10:05:24] EDIT helyesiras_webdev/static/js/main.js: 0
+[2013-08-29 10:07:09] EDIT helyesiras_webdev/static/js/main.js: 0
+[2013-08-29 10:11:59] EDIT helyesiras_webdev/static/content/widget1.html: 2
+[2013-08-29 10:12:46] EDIT helyesiras_webdev/static/content/widget1.html: 0
+[2013-08-29 10:12:47] EDIT helyesiras_webdev/static/content/widget1.html: 0
+[2013-08-29 10:22:33] EDIT helyesiras_webdev/views/layout.html: 0
+[2013-08-29 10:23:05] EDIT helyesiras_webdev/views/layout.html: 8
+[2013-08-29 10:25:28] EDIT helyesiras_webdev/views/blog/show.html: 0
+[2013-08-29 10:27:00] EDIT helyesiras_webdev/views/blog/show.html: 1
+[2013-08-29 10:28:55] EDIT helyesiras_webdev/views/blog/show.html: 0
+[2013-08-29 10:29:49] EDIT helyesiras_webdev/views/blog/show.html: 0
+[2013-08-29 10:30:05] EDIT helyesiras_webdev/views/blog/show.html: 0
+[2013-08-29 10:30:39] EDIT helyesiras_webdev/views/blog/show.html: 1
+[2013-08-29 10:30:49] EDIT helyesiras_webdev/views/blog/show.html: 0
+[2013-08-29 10:31:03] EDIT helyesiras_webdev/views/blog/show.html: 0
+[2013-08-29 10:31:11] EDIT helyesiras_webdev/views/blog/show.html: 0
+[2013-08-29 10:31:12] EDIT helyesiras_webdev/views/blog/show.html: 0
+[2013-08-29 10:31:51] EDIT helyesiras_webdev/views/blog/show.html: 0
+[2013-08-29 10:32:01] EDIT helyesiras_webdev/views/blog/show.html: 0
+[2013-08-29 10:32:16] EDIT helyesiras_webdev/views/blog/show.html: 0
+[2013-08-29 10:33:07] EDIT helyesiras_webdev/views/blog/show.html: 1
+[2013-08-29 10:33:22] EDIT helyesiras_webdev/views/blog/show.html: -1
+[2013-08-29 10:33:50] EDIT helyesiras_webdev/views/blog/show.html: -2
+[2013-08-29 10:34:06] EDIT helyesiras_webdev/views/blog/show.html: 0
+[2013-08-29 12:44:25] EDIT helyesiras_webdev/models/dbblog.py: 1
+[2013-08-29 12:46:38] EDIT helyesiras_webdev/controllers/blog.py: 1
+[2013-08-29 12:46:45] EDIT helyesiras_webdev/controllers/blog.py: 0
+[2013-08-29 12:50:00] EDIT helyesiras_webdev/controllers/blog.py: 0
+[2013-08-29 12:50:32] EDIT helyesiras_webdev/controllers/blog.py: 0
+[2013-08-29 12:52:45] EDIT helyesiras_webdev/controllers/blog.py: 1
+[2013-08-29 12:52:56] EDIT helyesiras_webdev/controllers/blog.py: 0
+[2013-08-29 12:53:58] EDIT helyesiras_webdev/controllers/blog.py: 0
+[2013-08-29 13:00:38] EDIT helyesiras_webdev/controllers/blog.py: 0
Modified: trunk/web2py/applications/helyesiras_webdev/static/content/widget1.html
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/static/content/widget1.html 2013-09-03 09:15:52 UTC (rev 921)
+++ trunk/web2py/applications/helyesiras_webdev/static/content/widget1.html 2013-09-03 09:33:37 UTC (rev 922)
@@ -84,7 +84,9 @@
$("#hw1-form").submit(function() {
if ($("#hw1-query").val() && $("#hw1-type").val()) {
$("#hw1-form").attr('action',url[$("#hw1-type").val()]);
- $("#hw1-type").val('').attr("disabled", "disabled");
+ $("#hw1-type").attr("disabled", "disabled");
+ this.submit();
+ $("#hw1-type").removeAttr("disabled");
} else {
return false;
}
Modified: trunk/web2py/applications/helyesiras_webdev/static/css/main.css
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/static/css/main.css 2013-09-03 09:15:52 UTC (rev 921)
+++ trunk/web2py/applications/helyesiras_webdev/static/css/main.css 2013-09-03 09:33:37 UTC (rev 922)
@@ -859,7 +859,7 @@
#result_xhtml,
ul.result
{
- clear: right;
+/* clear: right;*/
list-style: none;
margin: 0;
}
@@ -2161,8 +2161,7 @@
box-shadow: 0 0 0;
height: 85px;
width: 305px;
- margin-top: 10px;
- margin-bottom: 8px;
+ margin: 10px 0;
padding: 13px;
background: url('../images/m_front_bg_default.png') no-repeat left top;
background-size: 100% 100%;
Modified: trunk/web2py/applications/helyesiras_webdev/static/js/main.js
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/static/js/main.js 2013-09-03 09:15:52 UTC (rev 921)
+++ trunk/web2py/applications/helyesiras_webdev/static/js/main.js 2013-09-03 09:33:37 UTC (rev 922)
@@ -62,22 +62,21 @@
dateFormat: "yy-mm-dd"
});
+ jQuery('.front-icon a').hover(
+ function() {
+ var ta = jQuery(this);
+ jQuery('.rollover').each(function() {
+ if (ta != jQuery(this)) {
+ jQuery(this).stop(1, 1).fadeTo(200, 0);
+ }
+ });
+ jQuery(this).find('.rollover').stop().fadeTo(500, 1);
+ },
+ function() {
+ jQuery(this).find('.rollover').stop().fadeTo(500, 0);
+ }
+ )
-/* jQuery('.front-icon a').hover(
- function() {
- var ta = jQuery(this);
- jQuery('.rollover').each(function() {
- if (ta != jQuery(this)) {
- jQuery(this).stop(1, 1).fadeTo(200, 0);
- }
- });
- jQuery(this).find('.rollover').stop().fadeTo(500, 1);
- },
- function() {
- jQuery(this).find('.rollover').stop().fadeTo(500, 0);
- }
- )*/
-
setTimeout(function(){
jQuery('#front-icon1 a .rollover').fadeTo(1500, 1).fadeTo(2000, 1).fadeTo(1500, 0);
jQuery('#front-icon2 a .rollover').fadeTo(3800, 0).fadeTo(1500, 1).fadeTo(2000, 1).fadeTo(1500, 0);
Modified: trunk/web2py/applications/helyesiras_webdev/views/blog/show.html
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/views/blog/show.html 2013-09-03 09:15:52 UTC (rev 921)
+++ trunk/web2py/applications/helyesiras_webdev/views/blog/show.html 2013-09-03 09:33:37 UTC (rev 922)
@@ -30,7 +30,7 @@
<div class="blog-date">{{=pretty_hu_date(post.posts.created_on).encode('utf8')}}</div>
</div>
<div class="blog-social">
- <iframe src="//www.facebook.com/plugins/like.php?href=http%3A%2F%2Fhtp-devel.nytud.hu%2Fhelyesiras_webdev%2Fblog%2Fshow%2Fcsuklos-busz-vezeto&width=450&height=24&colorscheme=light&layout=standard&action=recommend&show_faces=false&send=false&appId=1395313737350712" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:450px; height:24px;" allowTransparency="true"></iframe>
+ <div class="fb-like" data-href="http://{{=request.env.http_host}}{{=request.url}}" data-width="450" data-action="recommend" data-show-faces="true" data-send="false"></div>
<div class="g-plusone"></div>
<script type="text/javascript">
window.___gcfg = {lang: 'hu'};
Modified: trunk/web2py/applications/helyesiras_webdev/views/layout.html
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/views/layout.html 2013-09-03 09:15:52 UTC (rev 921)
+++ trunk/web2py/applications/helyesiras_webdev/views/layout.html 2013-09-03 09:33:37 UTC (rev 922)
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html lang="{{=T.accepted_language or 'en'}}" class="no-js"><!-- no-js need it for modernzr -->
+ <html lang="{{=T.accepted_language or 'en'}}" class="no-js" xmlns:fb="http://ogp.me/ns/fb#"><!-- no-js need it for modernzr -->
<head>
<meta charset="utf-8" />
@@ -99,6 +99,14 @@
<!--[if IE 8 ]> <body class="ie8"> <![endif]-->
<!--[if IE 9 ]> <body class="ie9"> <![endif]-->
<!--[if (gt IE 9)|!(IE)]><!--> <body> <!--<![endif]-->
+ <div id="fb-root"></div>
+<script>(function(d, s, id) {
+ var js, fjs = d.getElementsByTagName(s)[0];
+ if (d.getElementById(id)) return;
+ js = d.createElement(s); js.id = id;
+ js.src = "//connect.facebook.net/hu_HU/all.js#xfbml=1&appId=1395313737350712";
+ fjs.parentNode.insertBefore(js, fjs);
+}(document, 'script', 'facebook-jssdk'));</script>
<div class="flash">{{=response.flash or ''}}</div> <!-- notification div -->
More information about the Hejes-devel
mailing list