Merge remote-tracking branch 'upstream/development' into perm-sys/cre…

…ate-fix
fossasia · Jun 16, 2016 · dd47abd · dd47abd
2 parents f3732ca + dee72b3
commit dd47abd
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 47 deletions.
diff --git a/open_event/api/sponsors.py b/open_event/api/sponsors.py
@@ -88,7 +88,7 @@ def post(self, event_id):
 
 @api.route('/events/<int:event_id>/sponsors/types')
 class SponsorTypesList(Resource):
-    @api.doc('list_sponsor_types')
+    @api.doc('list_sponsor_types', model=[fields.String()])
     def get(self, event_id):
         """List all sponsor types"""
         return DAO.list_types(event_id)

diff --git a/open_event/templates/gentelella/admin/profile/_form.html b/open_event/templates/gentelella/admin/profile/_form.html
@@ -13,54 +13,51 @@
         <label>Details about user:</label>
         <textarea name="details" id="summernote">{{profile.user_detail.details}}</textarea>
 
-
-        <label>Email:<span class="required">*</span>
-        </label>
-
-        <input required="required" name="email" class="form-control"
-               value="{{profile.email}}"/>
-
-
-        <label>Avatar:
-        </label>
-
-        {% if profile.user_detail.avatar %}
-        <input name="avatar" class="form-control" value="{{profile.user_detail.avatar}}"/>
-        {% else %}
-        <input name="avatar" class="form-control" placeholder="Enter Link for Avatar"/>
-        {% endif %}
-
-        <label>Contact:
-        </label>
-
-        {% if profile.user_detail.contact %}
-        <input name="contact" class="form-control" value="{{profile.user_detail.contact}}"/>
-        {% else %}
-        <input name="contact" class="form-control"/>
-        {% endif %}
-
+        <div class="row">
+            <div class="col-md-6 col-xs-6">
+                <label>Email:<span class="required">*</span>
+                </label>
+
+                <input required="required" name="email" class="form-control"
+                       value="{{profile.email}}"/>
+           </div>
+           <div class="col-md-6 col-xs-6">
+                <label>Contact:
+                </label>
+
+                {% if profile.user_detail.contact %}
+                <input name="contact" class="form-control" value="{{profile.user_detail.contact}}"/>
+                {% else %}
+                <input name="contact" class="form-control"/>
+                {% endif %}
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-6 col-xs-6">
+                <label class="control-label">Facebook:
+                </label>
+
+                {% if profile.user_detail.facebook %}
+                <input name="facebook" class="form-control"
+                       value="{{profile.user_detail.facebook}}"/>
+                {% else %}
+                <input name="facebook" class="form-control"/>
+                {% endif %}
+            </div>
+
+            <div class="col-md-6 col-xs-6">
+                <label class="control-label">Twitter:
+                </label>
+
+                {% if profile.user_detail.twitter %}
+                <input name="twitter" class="form-control" value="{{profile.user_detail.twitter}}"/>
+                {% else %}
+                <input name="twitter" class="form-control"/>
+                {% endif %}
+            </div>
+        </div>
     </div>
 
-    <label class="control-label">Facebook:
-    </label>
-
-    {% if profile.user_detail.facebook %}
-    <input name="facebook" class="form-control"
-           value="{{profile.user_detail.facebook}}"/>
-    {% else %}
-    <input name="facebook" class="form-control"/>
-    {% endif %}
-
-
-    <label class="control-label">Twitter:
-    </label>
-
-    {% if profile.user_detail.twitter %}
-    <input name="twitter" class="form-control" value="{{profile.user_detail.twitter}}"/>
-    {% else %}
-    <input name="twitter" class="form-control"/>
-    {% endif %}
-
     <p>
         <center><input class="btn btn-success" type="submit" value="Update changes"></center>
     </p>

diff --git a/open_event/templates/gentelella/admin/profile/index.html b/open_event/templates/gentelella/admin/profile/index.html
@@ -39,6 +39,14 @@ <h2>User Report
 
                         </div>
                         <!-- end of image cropping -->
+                        <div id="avatar-button" style="padding: 10px 0px;">
+                            <input type="file" id="profile-avatar" name="avatar" required="required"
+                                               class="upload-btn"/>
+                            <label class="file-label" for="profile-avatar">
+                                        <i class="fa fa-cloud-upload" aria-hidden="true"></i>
+                                        Upload New
+                            </label>
+                        </div>
 
                     </div>
                     <h3>{{profile.user_detail.fullname}}</h3>