Started note attachment changes, and text changes

Steven Verbeek
1 parent e5fa0bb1
Showing 2 changed files with 10 additions and 2 deletions Show diff stats
app/assets/javascripts/note.js
app/assets/stylesheets/common.scss
@@ -38,7 +38,9 @@ init:
     });
  
     $("#note_attachment").change(function(e){
-        alert($('input[type=file]').val());
+        var val = $('input[type=file]').val();
+        var filename = val.substr(val.lastIndexOf("/"));
+        $(".file_name").text(filename);
     });
  
   },
@@ -1110,7 +1110,13 @@ p.time {
   div.attachments {
     position:relative;
     width: 350px;
-    height: 40px;
+    height: 30px;
+    overflow:hidden;
+    margin:0 0 5px !important;
+  }
+  .file_name {
+    line-height:30px;
+    width:240px;
     overflow:hidden;
   }
 }
 \ No newline at end of file
...	...	@@ -38,7 +38,9 @@ init:
38	38	});
39	39
40	40	$("#note_attachment").change(function(e){
41		- alert($('input[type=file]').val());
	41	+ var val = $('input[type=file]').val();
	42	+ var filename = val.substr(val.lastIndexOf("/"));
	43	+ $(".file_name").text(filename);
42	44	});
43	45
44	46	},
...	...
...	...	@@ -1110,7 +1110,13 @@ p.time {
1110	1110	div.attachments {
1111	1111	position:relative;
1112	1112	width: 350px;
1113		- height: 40px;
	1113	+ height: 30px;
	1114	+ overflow:hidden;
	1115	+ margin:0 0 5px !important;
	1116	+ }
	1117	+ .file_name {
	1118	+ line-height:30px;
	1119	+ width:240px;
1114	1120	overflow:hidden;
1115	1121	}
1116	1122	}
1117	1123	\ No newline at end of file
...	...