modifying merge #205

juliotoscano
1 parent 07356d24
Showing 5 changed files with 2 additions and 244 deletions Show diff stats
amadeus/staticfiles/css/base/amadeus.css
core/templates/guest.html
courses/templates/course/index.html
courses/templates/subject/form_view_teacher.html
courses/templates/subject/index.html
@@ -18,10 +18,6 @@
     padding-bottom: 1%;
     width: 15%;
 }
-<<<<<<< HEAD
-
-=======
->>>>>>> front_cards
 .breadcrumb{
     margin-bottom: 5px;
 }
@@ -77,101 +77,8 @@
                         </li>
                     </ul>
                </li>
-
-<<<<<<< HEAD
-                        <li  data-toggle="tooltip" data-placement="bottom" title data-original-title="{% trans 'messages' %}"> <a href="#"><i class="fa fa-comments" aria-hidden="true"></i></a> </li>
-                        <li > <a  class="link" href="{% url 'app:index' %}">{{ user }}</a></li>
-
-                </ul>
-                </div>
-    </div>
-    {% endblock %}
-    <div class="container-fluid">
-        <div class="row">
-
-            <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2 col-xl-2">
-                {% block sidebar %}
-                    <div class="panel panel-primary">
-                        <div class="panel-heading">
-                            <h4>Menu</h4>
-                        </div>
-                        <div class="panel-body">
-                            <ul class="nav nav-pills nav-stacked">
-                                <li><a href="{% url 'core:register' %}">{% trans 'Register' %}</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                {% endblock %}
-
-            </div>
-           <div class="col-xs-10 col-sm-10 col-md-10 col-lg-10 col-xl-10">
-                {% block breadcrumbs %}
-                    <div class="col-md-12">
-                        <form id="searchform" action="{% url 'course:manage' %}" method="get" accept-charset="utf-8">
-                            <div class="input-group">
-                              <div class="form-group is-empty">
-                              <input type="search" class="form-control" placeholder="Search Courses" name="q" id="searchbox"></div>
-                                <span class="input-group-btn input-group-sm">
-                                  <button type="button" class="btn btn-fab btn-fab-mini">
-                                    <i class="material-icons">search</i>
-                                  </button>
-                                </span>
-                            </div>
-                        </form>
-                    </div>
-
-                <div class="col-md-10">
-                    <div class="btn-group btn-group-justified btn-group-raised">
-                        <a href="?category=all" class="btn btn-raised btn-info">Todos</a>
-                        {% for category in categories %}
-                            <a href="?category={{category.name}}" class="btn btn-raised btn-primary">{{category.name}}</a>
-                        {% endfor %}
-                    </div>
-                </div>
-
-                {% endblock %}
-                {% block render_breadcrumbs %}{% endblock %}
-            <div>
-            </div>
-            <div class="col-xs-12 col-sm-12 col-md-10 col-lg-10 col-xl-12">
-                {% block content %}
-                    {% for course in courses %}
-                        <div class="panel panel-info panel_{{ course.id }}">
-                            <div class="panel-heading">
-                                <a href="{{ course.get_absolute_url }}" class="panel-title">{{course.name}}</a>
-                                {% if user|show_course_subscribe:course %}
-                                    <a onclick="subscribe($(this), '{% url 'course:subscribe' course.slug %}', {{ course.id}}, '{% trans 'Are you sure you want to subscribe to this course?' %}')" class="btn btn-sm btn-primary btn-raised pull-right" style="margin-top:-4px">{% trans 'Subscribe' %}</a>
-                                {% endif %}
-                            </div>
-
-                            <div class="panel-body">
-                                <p><b>Course Name: </b>{{course.name}}</p>
-                                <p><b>Begining: </b>{{course.init_date}}</p>
-                                <p><b>End: </b>{{course.end_date}}</p>
-                                <p><b>Professor: </b>{{course.professors.name}}</p>
-                                <p>
-                                <b>Description:</b>
-                                <i>
-                                    {{course.content}}
-                                </i>
-                                </p>
-                            </div>
-                        </div>
-                    {% endfor %}
-
-                {% endblock %}
-            </div>
-        </div>
-    </div>
-    <script src="{% static 'js/main.js' %}"></script>
-    <script type="text/javascript" src="{% static 'js/topic_editation_presentation.js' %}"></script>
-    {% block script_file %}
-
-    {% endblock script_file %}
-=======
              			<li  data-toggle="tooltip" data-placement="bottom" title data-original-title="{% trans 'messages' %}"> <a href="#"><i class="fa fa-comments" aria-hidden="true"></i></a> </li>
              			<li > <a  class="link" href="{% url 'app:index' %}">{{ user }}</a></li>
-
            		</ul>
          		</div>
    	</div>
@@ -258,7 +165,6 @@
 	{% block script_file %}
 	{% endblock script_file %}
->>>>>>> front_cards
 </body>
 </html>
 \ No newline at end of file
@@ -43,8 +43,6 @@
     </div>
         {% if user|has_role:'professor' or user|has_role:'system_admin' %}
-
-<<<<<<< HEAD
         <div class="panel panel-primary">
             <div class="panel-heading">
                 <h3 class="panel-title">Category</h3>
@@ -57,20 +55,7 @@
             </div>
         </div>
     {% endif %}
-=======
-		<div class="panel panel-primary">
-		    <div class="panel-heading">
-		        <h3 class="panel-title">Category</h3>
-		    </div>
-		    <div class="panel-body">
-		        <ul class="nav nav-pills nav-stacked">
-		            <li><a href="{% url 'course:create_cat' %}">Create Category</a></li>
-		            <li><a href="{% url 'course:manage_cat' %}">List Category</a></li>
-		        </ul>
-		    </div>
-		</div>
-	{% endif %}
->>>>>>> front_cards
+
 {% endblock %}
 {% block content %}
@@ -86,7 +71,6 @@
     {% endif %}
 <div class="col-md-12 cards-content">
-<<<<<<< HEAD
     <form id="searchform" action="{% url 'course:manage' %}" method="get" accept-charset="utf-8">
         <div class="input-group">
           <div class="form-group is-empty">
@@ -98,24 +82,10 @@
             </span>
         </div>
     </form>
-=======
-	<form id="searchform" action="{% url 'course:manage' %}" method="get" accept-charset="utf-8">
-		<div class="input-group">
-		  <div class="form-group is-empty">
-		  <input type="search" class="form-control" placeholder="Search Courses" name="q" id="searchbox"></div>
-		    <span class="input-group-btn input-group-sm">
-		      <button type="button" class="btn btn-fab btn-fab-mini">
-		        <i class="material-icons">search</i>
-		      </button>
-		    </span>
-		</div>
-	</form>
->>>>>>> front_cards
 </div>
 </fieldset>
-<<<<<<< HEAD
     <div class="col-md-12 cards-content">
         {% if courses|length > 0 %}
             {% if request.GET.category == 'all' or none or request.GET.category == '' %}
@@ -134,26 +104,5 @@
             {% trans 'No courses found' %}
         {% endif %}
     </div>
-=======
-	<div class="col-md-12 cards-content">
-		{% if courses|length > 0 %}
-			{% if request.GET.category == 'all' or none or request.GET.category == '' %}
-				{% for course in list_courses %}
-		          	{% include "course/course_card.html" %}
-				{% endfor %}
-			{% else %}
-				{% for course in courses_category %}
-    				{% if course.category.name == request.GET.category %}
-    					<!-- Put your content here! -->
-    					{% include "course/course_card.html" %}
-    				{% endif %}
-				{% endfor %}
-			{% endif %}
-		{% else %}
-			{% trans 'No courses found' %}
-		{% endif %}
-	</div>
->>>>>>> front_cards
-
     <script type="text/javascript" src="{% static 'js/course.js' %}"></script>
 {% endblock %}
@@ -40,7 +40,6 @@
           </div>
         </div>
       </div>
-<<<<<<< HEAD
       <div class="panel-collapse collapseOne collapse in" role="tabpanel" aria-labelledby="headingOne" aria-expanded="false" aria-hidden="true" tabindex="-1" aria-selected="false">
         <div class="panel-body">
           <div class="presentation">
@@ -74,43 +73,12 @@
                 <ul id="list-materials">
                     {% list_topic_file request topic %}
                     {% list_topic_link request topic%}
-                  
+
                 </ul>
               </div>
               <div class="col-xs-4 col-md-4">
                 <div class="resource_inline">
                   <h4>{% trans 'Activities' %}</h4>
-=======
-    </div>
-    <div class="panel-collapse collapseTopic-{{topic.slug}} collapse in" role="tabpanel" aria-labelledby="heading_{{topic.id}}" aria-expanded="true" aria-hidden="false">
-      <div class="panel-body">
-        <div class="presentation">
-          <p>
-            <i>
-              {{topic.description|linebreaks}}
-            </i>
-          </p>
-          <div class="row">
-            <div class="col-xs-6 col-md-6">
-              <div class="resource_inline">
-                <h4>Material</h4>
-              </div>
-              <div class="resource_inline">
-                <div class="dropdown">
-                  <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
-                  <ul class="dropdown-menu" aria-labelledby="dLabel">
-                      <li><a href=" javascript:get_modal_link('{% url 'course:links:create_link' topic.slug %}', '#createLinksModal','#divModalLink')  ">Create a Link<div class="ripple-container"><div class="ripple ripple-on ripple-out" style="left: 54.5312px; top: 22px; background-color: rgb(0, 150, 136); transform: scale(20);"></div></div></a></li>
-                      <li>
-                          <a href="javascript:get_modal_file('{% url 'course:file:create_file' topic.slug %}', '#fileModal', '#divModalFile')">
-                              {% trans "Create a file" %}
-                              <div class="ripple-container">
-                                  <div class="ripple ripple-on ripple-out" style="left: 33.5312px; top: 11px; background-color: rgb(0, 150, 136); transform: scale(20);">
-                                  </div>
-                              </div>
-                          </a>
-                      </li>
-                  </ul>
->>>>>>> front_cards
                 </div>
               </div>
               <ul id="list-materials">
@@ -142,55 +110,6 @@
             </div>
             {% list_topic_poll request topic %}
           </div>
-<<<<<<< HEAD
-          <div class="editation" style="display: none">
-            <div class="form-group">
-              <label class="control-label" for="focusedInput2">{% trans 'Name Topic' %}</label>
-              <input type="text" class="form-control" value="Topic 1">
-            </div>
-            <div class="form-group is-empty">
-              <label class="control-label" for="focusedInput2">{% trans 'Description' %}</label>
-              <textarea class="form-control" rows="3" id="textArea"></textarea>
-            </div>
-            <div class="row">
-              <div class=" col-xs-6 col-md-4">
-                <div class="resource_inline">
-                  <h4>{% trans 'Material' %}</h4>
-                </div>
-                <div class="resource_inline">
-                  <div class="dropdown">
-                    <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
-                    <ul class="dropdown-menu" aria-labelledby="dLabel">
-                      <li><a href="javascript:get_modal_link('{% url 'course:links:create_link' topic.slug %}', '#createLinksModal','#divModalLink')">{% trans 'Create a Link' %}</a></li>
-                      <li>
-                        <a href="#">
-                            {% trans "Create a file" %}
-                            <div class="ripple-container">
-                                <div class="ripple ripple-on ripple-out" style="left: 33.5312px; top: 11px; background-color: rgb(0, 150, 136); transform: scale(20);">
-                                </div>
-                            </div>
-                        </a>
-                      </li>
-                    </ul>
-                  </div>
-                </div>
-                <ul id="list-materials-edit">
-                    {% list_topic_link_edit request topic%}
-                    {% list_topic_file_edit request topic %}
-                </ul>
-              </div>
-              <div class="col-xs-4 col-md-offset-1 col-md-4">
-                <div class="resource_inline">
-                  <h4>{% trans 'Activities' %}</h4>
-                </div>
-                <div class="resource_inline">
-                  <div class="dropdown">
-                    <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
-                    <ul class="dropdown-menu" aria-labelledby="dLabel">
-                      <li>{% trans 'Anything' %}</li>
-                    </ul>
-                  </div>
-=======
         </div>
         <div class="editation" style="display: none">
           <div class="form-group">
@@ -221,7 +140,6 @@
                       </a>
                     </li>
                   </ul>
->>>>>>> front_cards
                 </div>
               </div>
               <ul id="list-materials-edit">
@@ -229,16 +147,9 @@
                   {% list_topic_file_edit request topic %}
               </ul>
             </div>
-<<<<<<< HEAD
-            <div class="form-group">
-              <div class="col-md-10">
-                <button type="button" class="btn btn-raised btn-default edit_card_end">{% trans 'Cancel' %}</button>
-                <button type="submit" class="btn btn-raised btn-primary edit_card_end">{% trans 'Submit' %}</button>
-=======
             <div class="col-xs-4 col-md-offset-1 col-md-4">
               <div class="resource_inline">
                 <h4>Activities</h4>
->>>>>>> front_cards
               </div>
               <div class="resource_inline">
                 <div class="dropdown">
@@ -15,9 +15,6 @@
 	</ol>
 {% endblock %}
-
-<<<<<<< HEAD
-=======
 {% block sidebar %}
 <div class="panel panel-primary">
     <div class="panel-heading">
@@ -52,7 +49,6 @@
 {% endblock %}
->>>>>>> front_cards
 {% block content %}
   	<div class="panel panel-info">
	@@ -77,101 +77,8 @@		@@ -77,101 +77,8 @@
77	</li>	77	</li>
78	</ul>	78	</ul>
79	</li>	79	</li>
80	-
81	-<<<<<<< HEAD
82	- <li data-toggle="tooltip" data-placement="bottom" title data-original-title="{% trans 'messages' %}"> <a href="#"><i class="fa fa-comments" aria-hidden="true"></i></a> </li>
83	- <li > <a class="link" href="{% url 'app:index' %}">{{ user }}</a></li>
84	-
85	- </ul>
86	- </div>
87	- </div>
88	- {% endblock %}
89	- <div class="container-fluid">
90	- <div class="row">
91	-
92	- <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2 col-xl-2">
93	- {% block sidebar %}
94	- <div class="panel panel-primary">
95	- <div class="panel-heading">
96	- <h4>Menu</h4>
97	- </div>
98	- <div class="panel-body">
99	- <ul class="nav nav-pills nav-stacked">
100	- <li><a href="{% url 'core:register' %}">{% trans 'Register' %}</a></li>
101	- </ul>
102	- </div>
103	- </div>
104	- {% endblock %}
105	-
106	- </div>
107	- <div class="col-xs-10 col-sm-10 col-md-10 col-lg-10 col-xl-10">
108	- {% block breadcrumbs %}
109	- <div class="col-md-12">
110	- <form id="searchform" action="{% url 'course:manage' %}" method="get" accept-charset="utf-8">
111	- <div class="input-group">
112	- <div class="form-group is-empty">
113	- <input type="search" class="form-control" placeholder="Search Courses" name="q" id="searchbox"></div>
114	- <span class="input-group-btn input-group-sm">
115	- <button type="button" class="btn btn-fab btn-fab-mini">
116	- <i class="material-icons">search</i>
117	- </button>
118	- </span>
119	- </div>
120	- </form>
121	- </div>
122	-
123	- <div class="col-md-10">
124	- <div class="btn-group btn-group-justified btn-group-raised">
125	- <a href="?category=all" class="btn btn-raised btn-info">Todos</a>
126	- {% for category in categories %}
127	- <a href="?category={{category.name}}" class="btn btn-raised btn-primary">{{category.name}}</a>
128	- {% endfor %}
129	- </div>
130	- </div>
131	-
132	- {% endblock %}
133	- {% block render_breadcrumbs %}{% endblock %}
134	- <div>
135	- </div>
136	- <div class="col-xs-12 col-sm-12 col-md-10 col-lg-10 col-xl-12">
137	- {% block content %}
138	- {% for course in courses %}
139	- <div class="panel panel-info panel_{{ course.id }}">
140	- <div class="panel-heading">
141	- <a href="{{ course.get_absolute_url }}" class="panel-title">{{course.name}}</a>
142	- {% if user\|show_course_subscribe:course %}
143	- <a onclick="subscribe($(this), '{% url 'course:subscribe' course.slug %}', {{ course.id}}, '{% trans 'Are you sure you want to subscribe to this course?' %}')" class="btn btn-sm btn-primary btn-raised pull-right" style="margin-top:-4px">{% trans 'Subscribe' %}</a>
144	- {% endif %}
145	- </div>
146	-
147	- <div class="panel-body">
148	- <p><b>Course Name: </b>{{course.name}}</p>
149	- <p><b>Begining: </b>{{course.init_date}}</p>
150	- <p><b>End: </b>{{course.end_date}}</p>
151	- <p><b>Professor: </b>{{course.professors.name}}</p>
152	- <p>
153	- <b>Description:</b>
154	- <i>
155	- {{course.content}}
156	- </i>
157	- </p>
158	- </div>
159	- </div>
160	- {% endfor %}
161	-
162	- {% endblock %}
163	- </div>
164	- </div>
165	- </div>
166	- <script src="{% static 'js/main.js' %}"></script>
167	- <script type="text/javascript" src="{% static 'js/topic_editation_presentation.js' %}"></script>
168	- {% block script_file %}
169	-
170	- {% endblock script_file %}
171	-=======
172	<li data-toggle="tooltip" data-placement="bottom" title data-original-title="{% trans 'messages' %}"> <a href="#"><i class="fa fa-comments" aria-hidden="true"></i></a> </li>	80	<li data-toggle="tooltip" data-placement="bottom" title data-original-title="{% trans 'messages' %}"> <a href="#"><i class="fa fa-comments" aria-hidden="true"></i></a> </li>
173	<li > <a class="link" href="{% url 'app:index' %}">{{ user }}</a></li>	81	<li > <a class="link" href="{% url 'app:index' %}">{{ user }}</a></li>
174	-
175	</ul>	82	</ul>
176	</div>	83	</div>
177	</div>	84	</div>
	@@ -258,7 +165,6 @@		@@ -258,7 +165,6 @@
258	{% block script_file %}	165	{% block script_file %}
259		166
260	{% endblock script_file %}	167	{% endblock script_file %}
261	->>>>>>> front_cards
262	</body>	168	</body>
263		169
264	</html>	170	</html>
265	\ No newline at end of file	171	\ No newline at end of file
	@@ -43,8 +43,6 @@		@@ -43,8 +43,6 @@
43	</div>	43	</div>
44		44
45	{% if user\|has_role:'professor' or user\|has_role:'system_admin' %}	45	{% if user\|has_role:'professor' or user\|has_role:'system_admin' %}
46	-
47	-<<<<<<< HEAD
48	<div class="panel panel-primary">	46	<div class="panel panel-primary">
49	<div class="panel-heading">	47	<div class="panel-heading">
50	<h3 class="panel-title">Category</h3>	48	<h3 class="panel-title">Category</h3>
	@@ -57,20 +55,7 @@		@@ -57,20 +55,7 @@
57	</div>	55	</div>
58	</div>	56	</div>
59	{% endif %}	57	{% endif %}
60	-=======
61	- <div class="panel panel-primary">
62	- <div class="panel-heading">
63	- <h3 class="panel-title">Category</h3>
64	- </div>
65	- <div class="panel-body">
66	- <ul class="nav nav-pills nav-stacked">
67	- <li><a href="{% url 'course:create_cat' %}">Create Category</a></li>
68	- <li><a href="{% url 'course:manage_cat' %}">List Category</a></li>
69	- </ul>
70	- </div>
71	- </div>
72	- {% endif %}
73	->>>>>>> front_cards	58	+
74	{% endblock %}	59	{% endblock %}
75		60
76	{% block content %}	61	{% block content %}
	@@ -86,7 +71,6 @@		@@ -86,7 +71,6 @@
86	{% endif %}	71	{% endif %}
87		72
88	<div class="col-md-12 cards-content">	73	<div class="col-md-12 cards-content">
89	-<<<<<<< HEAD
90	<form id="searchform" action="{% url 'course:manage' %}" method="get" accept-charset="utf-8">	74	<form id="searchform" action="{% url 'course:manage' %}" method="get" accept-charset="utf-8">
91	<div class="input-group">	75	<div class="input-group">
92	<div class="form-group is-empty">	76	<div class="form-group is-empty">
	@@ -98,24 +82,10 @@		@@ -98,24 +82,10 @@
98	</span>	82	</span>
99	</div>	83	</div>
100	</form>	84	</form>
101	-=======
102	- <form id="searchform" action="{% url 'course:manage' %}" method="get" accept-charset="utf-8">
103	- <div class="input-group">
104	- <div class="form-group is-empty">
105	- <input type="search" class="form-control" placeholder="Search Courses" name="q" id="searchbox"></div>
106	- <span class="input-group-btn input-group-sm">
107	- <button type="button" class="btn btn-fab btn-fab-mini">
108	- <i class="material-icons">search</i>
109	- </button>
110	- </span>
111	- </div>
112	- </form>
113	->>>>>>> front_cards
114	</div>	85	</div>
115		86
116		87
117	</fieldset>	88	</fieldset>
118	-<<<<<<< HEAD
119	<div class="col-md-12 cards-content">	89	<div class="col-md-12 cards-content">
120	{% if courses\|length > 0 %}	90	{% if courses\|length > 0 %}
121	{% if request.GET.category == 'all' or none or request.GET.category == '' %}	91	{% if request.GET.category == 'all' or none or request.GET.category == '' %}
	@@ -134,26 +104,5 @@		@@ -134,26 +104,5 @@
134	{% trans 'No courses found' %}	104	{% trans 'No courses found' %}
135	{% endif %}	105	{% endif %}
136	</div>	106	</div>
137	-=======
138	- <div class="col-md-12 cards-content">
139	- {% if courses\|length > 0 %}
140	- {% if request.GET.category == 'all' or none or request.GET.category == '' %}
141	- {% for course in list_courses %}
142	- {% include "course/course_card.html" %}
143	- {% endfor %}
144	- {% else %}
145	- {% for course in courses_category %}
146	- {% if course.category.name == request.GET.category %}
147	- <!-- Put your content here! -->
148	- {% include "course/course_card.html" %}
149	- {% endif %}
150	- {% endfor %}
151	- {% endif %}
152	- {% else %}
153	- {% trans 'No courses found' %}
154	- {% endif %}
155	- </div>
156	->>>>>>> front_cards
157	-
158	<script type="text/javascript" src="{% static 'js/course.js' %}"></script>	107	<script type="text/javascript" src="{% static 'js/course.js' %}"></script>
159	{% endblock %}	108	{% endblock %}
	@@ -40,7 +40,6 @@		@@ -40,7 +40,6 @@
40	</div>	40	</div>
41	</div>	41	</div>
42	</div>	42	</div>
43	-<<<<<<< HEAD
44	<div class="panel-collapse collapseOne collapse in" role="tabpanel" aria-labelledby="headingOne" aria-expanded="false" aria-hidden="true" tabindex="-1" aria-selected="false">	43	<div class="panel-collapse collapseOne collapse in" role="tabpanel" aria-labelledby="headingOne" aria-expanded="false" aria-hidden="true" tabindex="-1" aria-selected="false">
45	<div class="panel-body">	44	<div class="panel-body">
46	<div class="presentation">	45	<div class="presentation">
	@@ -74,43 +73,12 @@		@@ -74,43 +73,12 @@
74	<ul id="list-materials">	73	<ul id="list-materials">
75	{% list_topic_file request topic %}	74	{% list_topic_file request topic %}
76	{% list_topic_link request topic%}	75	{% list_topic_link request topic%}
77	-	76	+
78	</ul>	77	</ul>
79	</div>	78	</div>
80	<div class="col-xs-4 col-md-4">	79	<div class="col-xs-4 col-md-4">
81	<div class="resource_inline">	80	<div class="resource_inline">
82	<h4>{% trans 'Activities' %}</h4>	81	<h4>{% trans 'Activities' %}</h4>
83	-=======
84	- </div>
85	- <div class="panel-collapse collapseTopic-{{topic.slug}} collapse in" role="tabpanel" aria-labelledby="heading_{{topic.id}}" aria-expanded="true" aria-hidden="false">
86	- <div class="panel-body">
87	- <div class="presentation">
88	- <p>
89	- <i>
90	- {{topic.description\|linebreaks}}
91	- </i>
92	- </p>
93	- <div class="row">
94	- <div class="col-xs-6 col-md-6">
95	- <div class="resource_inline">
96	- <h4>Material</h4>
97	- </div>
98	- <div class="resource_inline">
99	- <div class="dropdown">
100	- <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
101	- <ul class="dropdown-menu" aria-labelledby="dLabel">
102	- <li><a href=" javascript:get_modal_link('{% url 'course:links:create_link' topic.slug %}', '#createLinksModal','#divModalLink') ">Create a Link<div class="ripple-container"><div class="ripple ripple-on ripple-out" style="left: 54.5312px; top: 22px; background-color: rgb(0, 150, 136); transform: scale(20);"></div></div></a></li>
103	- <li>
104	- <a href="javascript:get_modal_file('{% url 'course:file:create_file' topic.slug %}', '#fileModal', '#divModalFile')">
105	- {% trans "Create a file" %}
106	- <div class="ripple-container">
107	- <div class="ripple ripple-on ripple-out" style="left: 33.5312px; top: 11px; background-color: rgb(0, 150, 136); transform: scale(20);">
108	- </div>
109	- </div>
110	- </a>
111	- </li>
112	- </ul>
113	->>>>>>> front_cards
114	</div>	82	</div>
115	</div>	83	</div>
116	<ul id="list-materials">	84	<ul id="list-materials">
	@@ -142,55 +110,6 @@		@@ -142,55 +110,6 @@
142	</div>	110	</div>
143	{% list_topic_poll request topic %}	111	{% list_topic_poll request topic %}
144	</div>	112	</div>
145	-<<<<<<< HEAD
146	- <div class="editation" style="display: none">
147	- <div class="form-group">
148	- <label class="control-label" for="focusedInput2">{% trans 'Name Topic' %}</label>
149	- <input type="text" class="form-control" value="Topic 1">
150	- </div>
151	- <div class="form-group is-empty">
152	- <label class="control-label" for="focusedInput2">{% trans 'Description' %}</label>
153	- <textarea class="form-control" rows="3" id="textArea"></textarea>
154	- </div>
155	- <div class="row">
156	- <div class=" col-xs-6 col-md-4">
157	- <div class="resource_inline">
158	- <h4>{% trans 'Material' %}</h4>
159	- </div>
160	- <div class="resource_inline">
161	- <div class="dropdown">
162	- <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
163	- <ul class="dropdown-menu" aria-labelledby="dLabel">
164	- <li><a href="javascript:get_modal_link('{% url 'course:links:create_link' topic.slug %}', '#createLinksModal','#divModalLink')">{% trans 'Create a Link' %}</a></li>
165	- <li>
166	- <a href="#">
167	- {% trans "Create a file" %}
168	- <div class="ripple-container">
169	- <div class="ripple ripple-on ripple-out" style="left: 33.5312px; top: 11px; background-color: rgb(0, 150, 136); transform: scale(20);">
170	- </div>
171	- </div>
172	- </a>
173	- </li>
174	- </ul>
175	- </div>
176	- </div>
177	- <ul id="list-materials-edit">
178	- {% list_topic_link_edit request topic%}
179	- {% list_topic_file_edit request topic %}
180	- </ul>
181	- </div>
182	- <div class="col-xs-4 col-md-offset-1 col-md-4">
183	- <div class="resource_inline">
184	- <h4>{% trans 'Activities' %}</h4>
185	- </div>
186	- <div class="resource_inline">
187	- <div class="dropdown">
188	- <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
189	- <ul class="dropdown-menu" aria-labelledby="dLabel">
190	- <li>{% trans 'Anything' %}</li>
191	- </ul>
192	- </div>
193	-=======
194	</div>	113	</div>
195	<div class="editation" style="display: none">	114	<div class="editation" style="display: none">
196	<div class="form-group">	115	<div class="form-group">
	@@ -221,7 +140,6 @@		@@ -221,7 +140,6 @@
221	</a>	140	</a>
222	</li>	141	</li>
223	</ul>	142	</ul>
224	->>>>>>> front_cards
225	</div>	143	</div>
226	</div>	144	</div>
227	<ul id="list-materials-edit">	145	<ul id="list-materials-edit">
	@@ -229,16 +147,9 @@		@@ -229,16 +147,9 @@
229	{% list_topic_file_edit request topic %}	147	{% list_topic_file_edit request topic %}
230	</ul>	148	</ul>
231	</div>	149	</div>
232	-<<<<<<< HEAD
233	- <div class="form-group">
234	- <div class="col-md-10">
235	- <button type="button" class="btn btn-raised btn-default edit_card_end">{% trans 'Cancel' %}</button>
236	- <button type="submit" class="btn btn-raised btn-primary edit_card_end">{% trans 'Submit' %}</button>
237	-=======
238	<div class="col-xs-4 col-md-offset-1 col-md-4">	150	<div class="col-xs-4 col-md-offset-1 col-md-4">
239	<div class="resource_inline">	151	<div class="resource_inline">
240	<h4>Activities</h4>	152	<h4>Activities</h4>
241	->>>>>>> front_cards
242	</div>	153	</div>
243	<div class="resource_inline">	154	<div class="resource_inline">
244	<div class="dropdown">	155	<div class="dropdown">