CJ 1 vuosi sitten
vanhempi
commit
977e696e78

+ 16 - 3
templates/_common/base.html

@@ -209,10 +209,23 @@
                 url: '/search?keywords={query}'
             }
         })
+
+     let imgs = $('#article').find('p>img')
+
+
+    for (let i = 0; i < imgs.length; i++) {
+        if ($(imgs[i]).attr('alt')) {
+            let alt = $(imgs[i]).attr('alt')
+            let src = $(imgs[i]).attr('src')
+            $(imgs[i]).parent().html(`<a data-pswp-width="${alt.split(',')[0]}" data-pswp-height="${alt.split(',')[1]}" href="${src}"><img style="display: inline-block;"  width="${alt.split(',')[0]}" height="${alt.split(',')[1]}" data-magnify="gallery" data-src="${src}"  src="${src}"  data-href="${src}" "/></a>`)
+        } else {
+            let src = $(imgs[i]).attr('src')
+            $(imgs[i]).parent().html(`<img style="display: inline-block;"  src="${src}" />`)
+        }
+    }
     var lightbox = new PhotoSwipeLightbox({
-        gallery: '.extra.images',
-        children: 'a',
-        // dynamic import is not supported in UMD version
+        gallery: 'p',
+        children: 'a[data-pswp-width]',        // dynamic import is not supported in UMD version
         pswpModule: PhotoSwipe
     });
     lightbox.init();

+ 5 - 2
templates/index.html

@@ -119,8 +119,11 @@
                 type: 'image',
                 elemToHtml: function imageToHtml(elemNode) {
                     const {src, alt, href = '', style = {}, width, height} = elemNode || {}
-
-                    return `<a data-pswp-width="${alt.split(',')[0]}" data-pswp-height="${alt.split(',')[1]}" href="${src}"><img data-magnify="gallery" data-src="${src}"  src="${src}"  data-href="${href}" "/></a>`
+                    if (alt === undefined || alt === null || alt === '') {
+                        return `<img src="${src}" alt="${alt}">`
+                    } else {
+                        return `<img  alt="${alt}"   src="${src}"/>`
+                    }
                 }
             };
 

+ 9 - 4
templates/management/article/article.html

@@ -6,12 +6,13 @@
         <div style="padding: 0" class="ui input">
             <input name="search_title" type="text" style="margin-right: 5px" placeholder="标题">
             <input name='search_content' type="text" style="margin-right: 5px" placeholder="内容">
-            <select name="search_category"  class="ui dropdown">
+            <select name="search_category" class="ui dropdown">
                 {% for item in category %}
                     <option value="{{ item.id }}">{{ item.name }}</option>
                 {% endfor %}
             </select>
-            <button style="margin-left: 5px" type="submit" class="ui button primary"><i class="search icon"></i>搜索</button>
+            <button style="margin-left: 5px" type="submit" class="ui button primary"><i class="search icon"></i>搜索
+            </button>
             <a href="/management/article" type="reset" class="ui button secondary"><i class="refresh icon"></i>重置</a>
         </div>
     </form>
@@ -31,8 +32,12 @@
         <tbody>
         {% for article in articles %}
             <tr>
-                <td>{{ article.cover__file_net_path }}</td>
-                <td><a href="/management/article/to_edit/{{ article.id }}">{{ article.title }}</a></td>
+                <td>{{ article.id }}</td>
+                <td><a href="/management/article/to_edit/{{ article.id }}">{% if article.title == '' %}
+                    未命名标题
+                {% else %}
+                    {{ article.title }}
+                {% endif %} </a></td>
                 <td>{{ article.category__name }}</td>
                 <td>{{ article.created_time }}</td>
                 <td>{{ article.is_top }}</td>

+ 39 - 0
templates/management/article/edit_article.html

@@ -172,6 +172,13 @@
                                 {% endif %}
                             </select>
                         </div>
+                        <div class="field">
+                            <label>Dont Check</label>
+                            <select id="dont_check" class="ui  dropdown">
+                                <option selected value="0">检查</option>
+                                <option value="1">不检查</option>
+                            </select>
+                        </div>
                     </div>
                 </div>
                 <div class="field">
@@ -356,6 +363,37 @@
 </script>
 <script>
     function submit(flag) {
+        if ($('#dont_check').val() == 1) {
+            let formData = new FormData()
+            var data = $('#article_form').serializeArray();
+
+            data.forEach((item, i) => {
+                if (item.value === '') {
+                    isPass = false
+                }
+            })
+            data.forEach((item, i) => {
+                formData.append(item.name, item.value)
+            })
+            formData.append('html', editor.getHtml())
+            formData.append('markdown', editor.getText())
+            formData.append('type', 2)
+            formData.append('tags', $('#tags').val())
+            formData.append('status', flag)
+            formData.append('pk', {{article.id}})
+            $.ajax('/management/article/edit_article', {
+                method: 'post',
+                data: formData,
+                contentType: false,
+                processData: false,
+                success: function (res) {
+                    window.location.href = '/management/article'
+                },
+                error: function (err) {
+                }
+            })
+            return
+        }
         $(".ui.form").form({
             fields: {
                 title: {
@@ -387,6 +425,7 @@
         } else {
             let isPass = true
             var data = $('#article_form').serializeArray();
+
             data.forEach((item, i) => {
                 if (item.value === '') {
                     isPass = false